CCM NG: Todays results of the getting Bebop running in CCM NG

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3843 8810af33-2d31-482b-a856-94f89814c4df

ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml

@@ -11,7 +11,9 @@
         </Root>
         <Logger name="com.arsdigita.packaging.Config"
                 level="debug">
-            
+        </Logger>
+        <Logger name="com.arsdigita.templating.PatternStylesheetResolver"
+                level="debug">
         </Logger>
         <Logger name="com.arsdigita.web.CCMDispatcherServlet"
                 level="debug">

ccm-bundle-devel-wildfly-web/src/main/resources/stylesheet-paths.txt

@@ -21,7 +21,7 @@ http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
 
 # Theme with single entry point (e.g Mandalay) unmanaged default
 #http://::host::/resource/::webapp::/themes/mandalay/start.xsl
-http://::host::/::webapp::/themes/foundry-base/start.xsl
+http://::host::/::webapp::/themes/libreccm-default/start.xsl
 
 
 

ccm-bundle-devel-wildfly-web/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml

@@ -25,7 +25,7 @@
 
         <properties>
             <!-- Properties for Hibernate -->
-            <property name="hibernate.hbm2ddl.auto" value="verify"/>
+            <property name="hibernate.hbm2ddl.auto" value="validate"/>
             <property name="hibernate.connection.autocommit" value="false" />
             <property name="hibernate.id.new_generator_mappings" value="true"/>
 

ccm-core/src/main/java/com/arsdigita/templating/PatternStylesheetResolver.java

@@ -21,6 +21,9 @@ package com.arsdigita.templating;
 import com.arsdigita.util.StringUtils;
 import com.arsdigita.util.UncheckedWrapperException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.io.LineNumberReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -38,7 +41,7 @@ import java.util.LinkedList;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.log4j.Logger;
+
 
 /**
  * <p>
@@ -158,7 +161,7 @@ public class PatternStylesheetResolver implements StylesheetResolver {
      * set com.arsdigita.templating.PatternStylesheetResolver=DEBUG by
      * uncommenting or adding the line.
      */
-    private static final Logger s_log = Logger.getLogger(
+    private static final Logger s_log = LogManager.getLogger(
         PatternStylesheetResolver.class);
 
     /**
@@ -413,13 +416,15 @@ public class PatternStylesheetResolver implements StylesheetResolver {
                 // Ignore blank lines and comments.
                 line = line.trim();
                 s_log.debug("line is " + line);
-                if ("".equals(line) || line.startsWith("#")
+                if ("".equals(line)
-                        || line.startsWith("!") || line.startsWith("//")) {
+                        || line.startsWith("#")
+                        || line.startsWith("!")
+                        || line.startsWith("//")) {
                     continue;
                 }
 
                 // Split up the line.
-                List list = StringUtils.splitUp(line, "/::\\w+::/");
+                List list = StringUtils.splitUp(line, "::\\w+::");
                 // Save the split line.
                 m_paths.add(list);
             }

ccm-core/src/main/java/com/arsdigita/templating/TemplatingConfig.java

@@ -36,7 +36,7 @@ import java.util.Objects;
 public final class TemplatingConfig {
 
     @Setting
-    private String stylesheetPaths = "/WEB-INF/resources/stylesheet-paths.txt";
+    private String stylesheetPaths = "stylesheet-paths.txt";
 
     @Setting
     private String stylesheetResolverClass = PatternStylesheetResolver.class

ccm-core/src/main/java/com/arsdigita/ui/login/UserLoginForm.java

@@ -144,6 +144,7 @@ public class UserLoginForm extends Form implements LoginConstants,
         final Iterator<Bean<?>> iterator = beans.iterator();
         final ConfigurationManager confManager;
         if (iterator.hasNext()) {
+            @SuppressWarnings("unchecked")
             final Bean<ConfigurationManager> bean = (Bean<ConfigurationManager>) iterator.
                     next();
             final CreationalContext<ConfigurationManager> ctx = beanManager.

ccm-core/src/main/java/com/arsdigita/util/SystemInformation.java

@@ -59,7 +59,7 @@ public class SystemInformation {
      * Map containing all informations provided by the
      * {@code systeminformation.properties} file.
      */
-    private final Map<String, String> sysInfo = new HashMap<String, String>();
+    private final Map<String, String> sysInfo = new HashMap<>();
     /**
      * The one and only instance of this class
      */
@@ -74,7 +74,7 @@ public class SystemInformation {
         final Properties properties = new Properties();
         try {
             final InputStream stream = getClass().getResourceAsStream(
-                    "WEB-INF/systeminformation.properties");
+                    "systeminformation.properties");
             if (stream == null) {
                 properties.put("version", "");
                 properties.put("appname", "LibreCCM");

ccm-core/src/main/java/com/arsdigita/web/WebConfig.java

@@ -56,16 +56,16 @@ public final class WebConfig {
     private String defaultScheme = "http";
 
     @Setting
-    private String server;
+    private String server = "localhost:8080";
 
     @Setting
-    private String secureServer;
+    private String secureServer = "localhost:8443";
 
     @Setting
-    private String siteName;
+    private String siteName = "LibreCCM";
 
     @Setting
-    private String host;
+    private String host = "localhost:8080";
 
     @Setting
     private Set<String> secureRequiredFor = new HashSet<>();

ccm-core/src/main/java/com/arsdigita/xml/XmlConfig.java

@@ -106,7 +106,7 @@ public final class XmlConfig {
      * @return
      */
     String getDefaultXslTransformerFactoryClassname() {
-        return SAXON;
+        return SAXON_HE;
     }
 
     public void setXslTransformer(final String xslTransformer) {

ccm-core/src/test/java/com/arsdigita/util/StringUtilsTest.java

@@ -368,7 +368,27 @@ public class StringUtilsTest {
         verifySplit(".xsl", (String) list.get(4));
         assertEquals("expected array length 5, found="
                          + list.size(), list.size(), 5);
+    }
 
+    @Test
+    public void testSplitUp2() {
+        final String path
+                     = "http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl";
+        
+        @SuppressWarnings("unchecked")
+        final List<String> list = StringUtils.splitUp(path, "::\\w+::");
+        
+        assertThat(list.size(), is(9));
+        assertThat(list.get(0), is(equalTo("http://")));
+        assertThat(list.get(1), is(equalTo("::host::")));
+        assertThat(list.get(2), is(equalTo("/")));
+        assertThat(list.get(3), is(equalTo("::webapp::")));
+        assertThat(list.get(4), is(equalTo("/themes/")));
+        assertThat(list.get(5), is(equalTo("::themedir::")));
+        assertThat(list.get(6), is(equalTo("/")));
+        assertThat(list.get(7), is(equalTo("::theme::")));
+        assertThat(list.get(8), is(equalTo("/start.xsl")));
+        //assertThat(list.get(9), is(equalTo("start.xsl")));
     }
 
     @Test
@@ -615,7 +635,10 @@ public class StringUtilsTest {
         assertEquals("----", StringUtils.urlize("    "));
         assertEquals("abc-def", StringUtils.urlize("ABC DEF"));
         assertEquals("-abc-def-", StringUtils.urlize(" ABC DEF "));
-        assertEquals("0123456789abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz-_---", StringUtils.urlize("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_ &/"));
+        assertEquals(
+            "0123456789abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz-_---",
+            StringUtils.urlize(
+                "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_ &/"));
         assertEquals("helpaplawsorg", StringUtils.urlize("help@aplaws.org"));
     }
 
@@ -631,12 +654,18 @@ public class StringUtilsTest {
 
     @Test
     public void testTruncateString() {
-        assertThat(StringUtils.truncateString("Lorem ipsum dolor sit amet", 8, true), is("Lorem"));
+        assertThat(StringUtils.truncateString("Lorem ipsum dolor sit amet", 8,
-        assertThat(StringUtils.truncateString("Lorem ipsum dolor sit amet", 2, true), is("Lo"));
+                                              true), is("Lorem"));
+        assertThat(StringUtils.truncateString("Lorem ipsum dolor sit amet", 2,
+                                              true), is("Lo"));
         assertThat(StringUtils.truncateString(null, 2, true), is(""));
-        assertThat(StringUtils.truncateString("Lorem <b> ipsum </b> dolor sit amet", 12, true), is("Lorem"));
+        assertThat(StringUtils.truncateString(
-        assertThat(StringUtils.truncateString("Lorem <b> ipsum </b> dolor sit amet", 12, false), is("Lorem <b>"));
+            "Lorem <b> ipsum </b> dolor sit amet", 12, true), is("Lorem"));
-        assertThat(StringUtils.truncateString("Lorem ipsum dolor sit amet", 99, true), is("Lorem ipsum dolor sit amet"));
+        assertThat(StringUtils.truncateString(
+            "Lorem <b> ipsum </b> dolor sit amet", 12, false), is("Lorem <b>"));
+        assertThat(StringUtils.truncateString("Lorem ipsum dolor sit amet", 99,
+                                              true), is(
+                       "Lorem ipsum dolor sit amet"));
     }
 
     @Test
@@ -662,7 +691,8 @@ public class StringUtilsTest {
     public void testStripNewLines() {
 
         assertEquals(StringUtils.stripNewLines("line1\nline2"), "line1line2");
-        assertEquals(StringUtils.stripNewLines("Lorem ipsum dolor sit amet"), "Lorem ipsum dolor sit amet");
+        assertEquals(StringUtils.stripNewLines("Lorem ipsum dolor sit amet"),
+                     "Lorem ipsum dolor sit amet");
     }
 
     @Test