From 3e7bfa33aaaa6ac36cf4459323468c700582e0b1 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 30 Jan 2017 18:51:18 +0000
Subject: [PATCH] CCM NG: Some fixes

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4543 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle-devel-wildfly-web/pom.xml          | 13 +++---
 .../src/main/resources/log4j2.xml             |  6 +++
 .../WEB-INF/classes/META-INF/persistence.xml  |  3 +-
 .../main/java/org/librecms/CmsConstants.java  | 12 ++++--
 .../contentsection/ContentSectionServlet.java | 40 ++++++++++---------
 .../contentsection/ContentSectionSetup.java   | 34 +++++++++++-----
 .../content-section/admin/image_select.jsp    |  0
 .../ccm-cms/content-section/admin/index.jsp   |  0
 .../ccm-cms/content-section/admin/item.jsp    |  0
 .../ccm-cms/content-section/admin/search.jsp  |  0
 .../arsdigita/web/CCMDispatcherServlet.java   |  3 ++
 pom.xml                                       |  2 +-
 12 files changed, 74 insertions(+), 39 deletions(-)
 rename ccm-cms/src/main/resources/{web => }/templates/ccm-cms/content-section/admin/image_select.jsp (100%)
 rename ccm-cms/src/main/resources/{web => }/templates/ccm-cms/content-section/admin/index.jsp (100%)
 rename ccm-cms/src/main/resources/{web => }/templates/ccm-cms/content-section/admin/item.jsp (100%)
 rename ccm-cms/src/main/resources/{web => }/templates/ccm-cms/content-section/admin/search.jsp (100%)

diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index 3c5e35032..99ce7943b 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -93,17 +93,20 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <!--<webResources>
-                        <resource>
-                            <directory>../ccm-theme-foundry/src/main/resources/themes</directory>
-                        </resource>
-                    </webResources>-->
                     <overlays>
                         <overlay>
                             <groupId>org.libreccm</groupId>
                             <artifactId>ccm-theme-foundry</artifactId>
                             <type>jar</type>
                         </overlay>
+                        <overlay>
+                            <groupId>org.librecms</groupId>
+                            <artifactId>ccm-cms</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>templates/</include>
+                            </includes>
+                        </overlay>
                     </overlays>
                 </configuration>
             </plugin>
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml b/ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml
index fb01e7b0f..78408e294 100644
--- a/ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml
+++ b/ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml
@@ -51,5 +51,11 @@
         <Logger name="org.librecms.contentsection.ContentSectionSetup"
                 level="debug">
         </Logger>
+        <Logger name="org.librecms.contentsection.ContentSectionServlet"
+                    level="debug">
+        </Logger>
+        <Logger name="com.arsdigita.web.DefaultApplicationFileResolver"
+                    level="debug">
+        </Logger>
     </Loggers>
 </Configuration>
\ No newline at end of file
diff --git a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
index 1a1bfce51..67adce4c2 100644
--- a/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
+++ b/ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
@@ -31,7 +31,8 @@
             <property name="hibernate.hbm2ddl.auto" value="validate"/>
             <property name="hibernate.connection.autocommit" value="false" />
             <property name="hibernate.id.new_generator_mappings" value="true"/>
-
+            <property name="wildfly.jpa.hibernate.search.module" 
+                      value="org.hibernate.search.orm:main"/>
             
             
             <!-- 
diff --git a/ccm-cms/src/main/java/org/librecms/CmsConstants.java b/ccm-cms/src/main/java/org/librecms/CmsConstants.java
index 715c86692..47faa26c3 100644
--- a/ccm-cms/src/main/java/org/librecms/CmsConstants.java
+++ b/ccm-cms/src/main/java/org/librecms/CmsConstants.java
@@ -30,18 +30,22 @@ public class CmsConstants {
 
     public static final String CMS_BUNDLE = "org.librecms.CmsResources";
     public static final String CMS_FOLDER_BUNDLE
-                               = "com.arsdigita.cms.ui.folder.CMSFolderResources";
+                                   = "com.arsdigita.cms.ui.folder.CMSFolderResources";
 
     public static final String CONTENT_CENTER_APP_TYPE
-                               = "com.arsdigita.cms.ContentCenter";
+                                   = "com.arsdigita.cms.ContentCenter";
     public static final String CONTENT_CENTER_URL = "/content-center/";
     public static final String CONTENT_CENTER_DESC_BUNDLE
-                               = "org.librecms.contentcenter.ContentCenterResources";
+                                   = "org.librecms.contentcenter.ContentCenterResources";
 
     public static final String CONTENT_SECTION_APP_TYPE
                                    = "org.librecms.contentsection.ContentSection";
     public static final String CONTENT_SECTION_SERVLET_PATH
                                    = "/templates/servlet/content-section/*";
+    public static final String CMS_SERVICE_SERVLET_PATH
+                                   = "/templates/servlet/cms-service/*";
+    public static final String CONTENT_ITEM_SERVLET_PATH
+                                   = "/templates/servlet/content-item/*";
     public static final String CONTENT_SECTION_DESC_BUNDLE
                                    = "org.librecms.contentsection.ContentSectionResources";
 
@@ -59,7 +63,7 @@ public class CmsConstants {
 
     public static final String ASSET_ID = "asset_id";
     public static final String IMAGE_ID = "image_id";
-    
+
     public final static String SCHEDULE_PUBLICATION = "schedule_publication";
 
     private CmsConstants() {
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionServlet.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionServlet.java
index 4c6596ad6..3896b86c4 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionServlet.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionServlet.java
@@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.arsdigita.cms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.security.PermissionChecker;
@@ -100,7 +101,11 @@ import javax.servlet.RequestDispatcher;
  * @author <a href="mailto:pboy@barkhof.uni-bremen.de">Peter Boy</a>
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@WebServlet(urlPatterns = {CmsConstants.CONTENT_SECTION_SERVLET_PATH})
+@WebServlet(urlPatterns = {CmsConstants.CONTENT_SECTION_SERVLET_PATH,
+                           "/templates/servlet/content-section/",
+                           "/templates/servlet/content-section",
+                           CmsConstants.CMS_SERVICE_SERVLET_PATH,
+                           CmsConstants.CONTENT_ITEM_SERVLET_PATH})
 public class ContentSectionServlet extends BaseApplicationServlet {
 
     private static final long serialVersionUID = 8061725145564728637L;
@@ -173,17 +178,15 @@ public class ContentSectionServlet extends BaseApplicationServlet {
         // optional init-param named template-path from ~/WEB-INF/web.xml
         // may overwrite configuration parameters
         String templatePath = config.getInitParameter("template-path");
-        //ToDo
-        /*if (templatePath == null) {
-            m_templatePath = ContentSection.getConfig().getTemplateRoot();
+        if (templatePath == null) {
+            m_templatePath = CMSConfig.getConfig().getTemplateRootPath();
         } else {
             m_templatePath = config.getInitParameter("template-path");
-        }*/
+        }
 
         // optional init-param named file-resolver from ~/WEB-INF/web.xml
         String resolverName = config.getInitParameter("file-resolver");
 
-        //ToDo
         if (resolverName == null) {
             m_resolver = WebConfig.getConfig().getResolver();
         } else {
@@ -196,7 +199,7 @@ public class ContentSectionServlet extends BaseApplicationServlet {
 
         //  NEW STUFF here will be used to process the pages in this servlet
         //  Currently NOT working
-        //   addPage("/admin", new MainPage());     // index page at address ~/cs
+//        addPage("/admin", new MainPage());     // index page at address ~/cs
         //   addPage("/admin/index.jsp", new MainPage());     
         //   addPage("/admin/item.jsp", new MainPage());     
     }
@@ -242,20 +245,23 @@ public class ContentSectionServlet extends BaseApplicationServlet {
 
         final RequestContext ctx = DispatcherHelper.getRequestContext();
         final String url = ctx.getRemainingURLPart();
-        
+
         //Only for testing PageModel
         if (url != null && url.endsWith("page-model/")) {
             getServletContext()
-                    .getRequestDispatcher("/page-model.bebop")
-                    .include(request, response);
+                .getRequestDispatcher("/page-model.bebop")
+                .include(request, response);
             return;
         }
         //End Test PageModel
-        
-        LOGGER.info("Resolving URL {} and trying as item first.");
+
+        LOGGER.info("Resolving URL {} and trying as item first.", url);
         final ItemResolver itemResolver = getItemResolver(section);
 
         String pathInfo = request.getPathInfo();
+        if (pathInfo == null) {
+            pathInfo = "/";
+        }
 
         final ContentItem item = getItem(section, pathInfo, itemResolver);
 
@@ -314,7 +320,9 @@ public class ContentSectionServlet extends BaseApplicationServlet {
             request.setAttribute(CONTENT_SECTION, section);
 
             RequestDispatcher rd = m_resolver.resolve(m_templatePath,
-                                                      request, response, app);
+                                                      request, 
+                                                      response, 
+                                                      app);
             if (rd != null) {
                 if (LOGGER.isDebugEnabled()) {
                     LOGGER.debug("Got dispatcher " + rd);
@@ -323,7 +331,7 @@ public class ContentSectionServlet extends BaseApplicationServlet {
                            response);
             } else {
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("No dispatcher found for" + rd);
+                    LOGGER.debug("No dispatcher found for " + rd);
                 }
                 String requestUri = request.getRequestURI(); // same as ctx.getRemainingURLPart()
                 response.sendError(404, requestUri
@@ -370,7 +378,6 @@ public class ContentSectionServlet extends BaseApplicationServlet {
 //
 //        templateResolver.setTemplateContext(sTemplateContext, request);
 //        ToDo End
-
         // Work out how long to cache for....
         // We take minimum(default timeout, lifecycle expiry)
         Lifecycle cycle = item.getLifecycle();
@@ -444,9 +451,6 @@ public class ContentSectionServlet extends BaseApplicationServlet {
         if (url.endsWith(XML_SUFFIX)) {
             request.setAttribute(XML_MODE, Boolean.TRUE);
             LOGGER.debug("StraightXML Requested");
-            itemUrl = String.format(
-                "/%s",
-                url.substring(0, url.length() - XML_SUFFIX.length()));
             itemUrl = "/" + url.substring(0, url.length() - XML_SUFFIX.length());
         } else {
             request.setAttribute(XML_MODE, Boolean.FALSE);
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java
index dcb425c2e..fdf0bb751 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java
@@ -18,6 +18,8 @@
  */
 package org.librecms.contentsection;
 
+import com.arsdigita.cms.dispatcher.MultilingualItemResolver;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.libreccm.modules.InstallEvent;
@@ -44,6 +46,8 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
 
     private static final String INITIAL_CONTENT_SECTIONS
                                     = "org.librecms.initial_content_sections";
+    private static final String DEFAULT_ITEM_RESOLVER
+                                    = "org.librecms.default_item_resolver";
 
     public ContentSectionSetup(final InstallEvent event) {
         super(event);
@@ -79,6 +83,16 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
         section.setDisplayName(sectionName);
         section.setLabel(sectionName);
 
+        if (getIntegrationProps().getProperty(DEFAULT_ITEM_RESOLVER) == null
+                || getIntegrationProps().getProperty(DEFAULT_ITEM_RESOLVER)
+                .trim().isEmpty()) {
+            section.setItemResolverClass(getIntegrationProps().getProperty(
+                DEFAULT_ITEM_RESOLVER));
+        } else {
+            section.setItemResolverClass(MultilingualItemResolver.class
+                .getName());
+        }
+
         LOGGER.debug("New content section properties: "
                          + "uuid = {}; "
                          + "applicationType = \"{}\"; "
@@ -132,8 +146,8 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
                          ItemPrivileges.EDIT,
                          ItemPrivileges.VIEW_PUBLISHED,
                          ItemPrivileges.PREVIEW);
-        
-        grantPermissions(author, 
+
+        grantPermissions(author,
                          rootAssetFolder,
                          AssetPrivileges.USE,
                          AssetPrivileges.CREATE_NEW,
@@ -150,8 +164,8 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
                          ItemPrivileges.DELETE,
                          ItemPrivileges.VIEW_PUBLISHED,
                          ItemPrivileges.PREVIEW);
-        
-        grantPermissions(editor, 
+
+        grantPermissions(editor,
                          rootAssetFolder,
                          AssetPrivileges.USE,
                          AssetPrivileges.CREATE_NEW,
@@ -166,7 +180,7 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
                          AdminPrivileges.ADMINISTER_LIFECYLES,
                          AdminPrivileges.ADMINISTER_CATEGORIES,
                          AdminPrivileges.ADMINISTER_CONTENT_TYPES);
-        
+
         grantPermissions(manager,
                          rootFolder,
                          ItemPrivileges.ADMINISTER,
@@ -178,8 +192,8 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
                          ItemPrivileges.DELETE,
                          ItemPrivileges.VIEW_PUBLISHED,
                          ItemPrivileges.PREVIEW);
-        
-        grantPermissions(manager, 
+
+        grantPermissions(manager,
                          rootAssetFolder,
                          AssetPrivileges.USE,
                          AssetPrivileges.CREATE_NEW,
@@ -197,8 +211,8 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
                          ItemPrivileges.DELETE,
                          ItemPrivileges.VIEW_PUBLISHED,
                          ItemPrivileges.PREVIEW);
-        
-        grantPermissions(publisher, 
+
+        grantPermissions(publisher,
                          rootAssetFolder,
                          AssetPrivileges.USE,
                          AssetPrivileges.CREATE_NEW,
@@ -209,7 +223,7 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
         grantPermissions(contentReader,
                          rootFolder,
                          ItemPrivileges.VIEW_PUBLISHED);
-        
+
         grantPermissions(contentReader,
                          rootAssetFolder,
                          AssetPrivileges.VIEW);
diff --git a/ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/image_select.jsp b/ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/image_select.jsp
similarity index 100%
rename from ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/image_select.jsp
rename to ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/image_select.jsp
diff --git a/ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/index.jsp b/ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/index.jsp
similarity index 100%
rename from ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/index.jsp
rename to ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/index.jsp
diff --git a/ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/item.jsp b/ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/item.jsp
similarity index 100%
rename from ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/item.jsp
rename to ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/item.jsp
diff --git a/ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/search.jsp b/ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/search.jsp
similarity index 100%
rename from ccm-cms/src/main/resources/web/templates/ccm-cms/content-section/admin/search.jsp
rename to ccm-cms/src/main/resources/templates/ccm-cms/content-section/admin/search.jsp
diff --git a/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java b/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java
index 7b2fb3fbf..acc5cfa1e 100644
--- a/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java
+++ b/ccm-core/src/main/java/com/arsdigita/web/CCMDispatcherServlet.java
@@ -499,6 +499,9 @@ public class CCMDispatcherServlet extends BaseServlet {
             if (path.length() > (m_instanceURI.length() + 1)) {
                 target.append(path.substring(m_instanceURI.length() + 1));
             }
+            if (target.charAt(target.length() - 1) != '/') {
+                target.append('/');
+            }
             target.append("?");
             target.append(BaseApplicationServlet.APPLICATION_ID_PARAMETER);
             target.append("=");
diff --git a/pom.xml b/pom.xml
index 8a1bd7b47..785a604cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,7 +277,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search-orm</artifactId>
-                <version>5.5.5.Final</version>
+                <version>5.5.4.Final</version>
             </dependency>
             
             <!--