Nachhalten von ccm-ldn-navigation an die Änderungen in ccm-sci-bundle.

Ab jetzt klappt das kompilieren des Trunk nur noch mit sci-bundle. Die Bundles
iaw und zes werden entfallen und in sci aufgehen. 

Bundle ccm-gen muss angepasst werden, wobei daraus dann ccm-bundle werden soll
mit demo und standard für LibreCMS.
 


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

ccm-core/bin/ccm

@@ -9,6 +9,8 @@
 # want to use this script from another directory, or include it into your 
 # PATH, you have to adjust the paths.
 CCM_LIB_DIR="../lib"
+CCM_RES_DIR="./bundle/res/"
+CCM_CLASS_DIR="../classes"
 CCM_HOME_DIR="../.."
 
 # We need CATALINA_HOME environment variable to access Tomcat's lib dir.
@@ -64,6 +66,10 @@ fi
 #Convert to absolute path:
 CCM_HOME_DIR=`cd ${CCM_HOME_DIR}; pwd`
 
+#Constructing classpath
+CCM_CLASSPATH="${CCM_LIB_DIR}/*:${CATALINA_LIB_DIR}/*:${CCM_RES_DIR}:${CCM_CLASS_DIR}/"
+echo "Classpath is: $CCM_CLASSPATH"
+
 echo "Starting CCM-Tool..."
 if [ "$1" = "prepare" ] ; then
   echo
@@ -74,7 +80,7 @@ if [ "$1" = "prepare" ] ; then
   echo =====================================
   echo
   param="load --interactive --packagekeys-file  bundle/cfg/package-key.list --parameter-file bundle/cfg/integration.properties"
-  java -cp ${CCM_LIB_DIR}/"*":${CATALINA_LIB_DIR}/"*" -Dccm.home=${CCM_HOME_DIR} "com.arsdigita.packaging.MasterTool" $param 
+  java -cp $CCM_CLASSPATH -Dccm.home=${CCM_HOME_DIR} "com.arsdigita.packaging.MasterTool" $param 
 else
-  java -cp ${CCM_LIB_DIR}/"*":${CATALINA_LIB_DIR}/"*" -Dccm.home=${CCM_HOME_DIR} "com.arsdigita.packaging.MasterTool" "$@"
+  java -cp $CCM_CLASSPATH -Dccm.home=${CCM_HOME_DIR} "com.arsdigita.packaging.MasterTool" "$@"
 fi

ccm-core/bin/ccm-run.old

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -x
-
-if [ -z "$CCM_HOME" ]
-then
-  return 1
-fi
-
-# System values
-[ -f "/etc/ccm/ccm.conf" ] && . "/etc/ccm/ccm.conf"
-
-# Optional server-specific values
-[ -f "$CCM_HOME/conf/ccm.conf" ] && . "$CCM_HOME/conf/ccm.conf"
-
-if [ -z "$CCM_CLASSPATH" ]
-then
-
-  CCM_CLASSPATH="$CCM_CLASSPATH_CUSTOM"
-
-  for dir in `ls -d $CCM_HOME/conf/*`
-  do
-    CCM_CLASSPATH=$CCM_CLASSPATH:$dir
-  done
-
-  if [ -n "$CCM_APPS" ]
-  then
-    for APP in $CCM_APPS
-    do
-      [ -f "/usr/share/java/$APP.jar" ] && CCM_CLASSPATH="$CCM_CLASSPATH:/usr/share/java/$APP.jar"
-      if [ -d "/usr/share/java/$APP" ]
-      then
-        for file in `ls /usr/share/java/$APP`
-        do
-          CCM_CLASSPATH=$CCM_CLASSPATH:/usr/share/java/$APP/$file
-        done
-      fi
-    done
-  else
-    echo foo
-  fi
-fi
-
-CCM_CLASSPATH=`echo $CCM_CLASSPATH | sed -e 's/::/:/g' | sed -e 's/:$//' | sed -e 's/^://'`
-
-echo $CCM_CLASSPATH | tr : "\n"
-
-java -cp $CCM_CLASSPATH -Dccm.home=$CCM_HOME "$@"

ccm-core/src/com/arsdigita/web/Application.java

@@ -176,7 +176,8 @@ public class Application extends Resource {
      * @param createContainerGroup
      * @return
      */
-    public static Application createApplication(final String typeName,
+    public static Application createApplication(
+                                  final String typeName,
                                   final String fragment,
                                   final String title,
                                   final Application parent,

ccm-ldn-navigation/src/WEB-INF/navigation/templates.txt

@@ -1,3 +1,4 @@
-Recent items,List of items ordered with most recent first,/packages/navigation/templates/recent.jsp
+Navigation Default Index Page,Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/nav-default.jsp
-A-Z items,List of items paginated as A-Z,/packages/navigation/templates/atoz.jsp
+Navigation Recent Items,List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/nav-recent.jsp
-Calendar items,List of items browsable through Calendar,/packages/navigation/templates/calendar.jsp
+Navigation A-Z Items,List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/nav-atoz.jsp
+Navigation Demo Items Page,Demo items page,/templates/ccm-ldn-navigation/navigation/nav-demo.jsp

ccm-ldn-navigation/src/com/arsdigita/london/navigation/Loader.java

@@ -177,10 +177,10 @@ public class Loader extends PackageLoader {
     }
 
     public void setupTemplates() throws IOException {
+        
         String templatesFile = (String)get(m_templatesFile);
         InputStream file = Thread.currentThread().getContextClassLoader()
                                  .getResourceAsStream(templatesFile);
-
         BufferedReader templates =
             new BufferedReader( new InputStreamReader( file ) );
 
@@ -219,5 +219,6 @@ public class Loader extends PackageLoader {
 
             template = templates.readLine();
         }
+        
     }
 }

ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java

@@ -57,11 +57,20 @@ public final class NavigationConfig extends AbstractConfig {
     private static final Logger s_log = Logger.getLogger(NavigationConfig.class);
 
     /** The cache lifetime for category index pages in seconds. Default 1 hour */
-    private final Parameter m_indexPageCacheLifetime;
+    private final Parameter m_indexPageCacheLifetime = new IntegerParameter
+            ("com.arsdigita.london.navigation.index_page_cache_lifetime",
+             Parameter.REQUIRED, new Integer(3600));
+    
     /** Generate full item URLs instead of going via search redirector. Default true */
-    private final Parameter m_generateItemURL;
+    private final Parameter m_generateItemURL = new BooleanParameter
-    /** The default category template. Default: /packages/navigation/templates/default.jsp */
+            ("com.arsdigita.london.navigation.generate_item_url",
-    private final Parameter m_defaultTemplate;
+             Parameter.REQUIRED, new Boolean(true));
+    
+    /** The default category template.                                        */
+    private final Parameter m_defaultTemplate = new StringParameter
+            ("com.arsdigita.london.navigation.default_template",
+             Parameter.REQUIRED, "/templates/ccm-ldn-navigation/navigation/nav-default.jsp");
+    
     /** If no template for category, should it get template from parent, or
      * fall back on default? Default: true */
     private final Parameter m_inheritTemplates;
@@ -103,15 +112,6 @@ public final class NavigationConfig extends AbstractConfig {
     private TreeCatProvider m_treeCatProvider = null;
 
     public NavigationConfig() {
-        m_indexPageCacheLifetime = new IntegerParameter
-            ("com.arsdigita.london.navigation.index_page_cache_lifetime",
-             Parameter.REQUIRED, new Integer(3600));
-        m_generateItemURL = new BooleanParameter
-            ("com.arsdigita.london.navigation.generate_item_url",
-             Parameter.REQUIRED, new Boolean(true));
-        m_defaultTemplate = new StringParameter
-            ("com.arsdigita.london.navigation.default_template",
-             Parameter.REQUIRED, "/packages/navigation/templates/default.jsp");
 	// not desirable default value (IMHO) but retains existing behaviour
         m_inheritTemplates = new BooleanParameter
             ("com.arsdigita.london.navigation.inherit_templates",

ccm-ldn-navigation/web/templates/ccm-ldn-navigation/navigation/nav-default.jsp

@@ -1,3 +1,13 @@
+<!--
+   A default item page (index page) provided by ccm-navigation package. Sites
+   will probably use a customized index page. 
+   Set the actual in dex page to be used by parameter
+      com.arsdigita.london.navigation.default_template
+
+   ##Title: Default Items Page
+   ##Descr: Default Navigation Index Page, ordering items in ascending order
+   ##Path : /templates/ccm-ldn-navigation/navigation/nav-default.jsp
+-->
 <jsp:root 
   xmlns:jsp="http://java.sun.com/JSP/Page" 
   xmlns:define="/WEB-INF/bebop-define.tld"