Fixed verschiedene ldn spezifische Module, APLAWS compiliert und funktioniert, Beta kann erstellt werden.

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

ccm-core/src/com/arsdigita/packaging/Loader.java

@@ -35,6 +35,7 @@ import com.arsdigita.runtime.Startup;
 import com.arsdigita.util.Classes;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.util.parameter.ParameterReader;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Connection;
@@ -43,6 +44,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
 import org.apache.log4j.Logger;
 
 /**
@@ -131,8 +133,6 @@ class Loader {
         }
     }
 
-    // deprecated:
-    // public void loadData(Session ssn, ParameterLoader loader) {
     public void loadData(Session ssn, ParameterReader prd) {
         final List inits = m_info.getProvidedInitializers();
         CompoundInitializer ini = new CompoundInitializer();

ccm-core/src/com/arsdigita/packaging/Unload.java

@@ -20,15 +20,18 @@ package com.arsdigita.packaging;
 
 import com.arsdigita.runtime.CCMResourceManager;
 import com.arsdigita.util.Files;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
+
 import org.apache.log4j.Logger;
 
 /**
@@ -43,7 +46,6 @@ class Unload extends Command {
     private static final Logger logger = Logger.getLogger(Unload.class);
 
     private static final Options OPTIONS = new Options();
-
     static {
         logger.debug("Static initalizer starting...");
         OPTIONS.addOption
@@ -56,7 +58,6 @@ class Unload extends Command {
     }
 
     private static final Set EXCLUDE = new HashSet();
-
     static {
         logger.debug("Static initalizer starting...");
         EXCLUDE.add("resin.conf");

ccm-ldn-dublin/application.xml

@@ -8,8 +8,8 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

ccm-ldn-types-esdservice/application.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-cms-types-esdservice"
+  name="ccm-ldn-types-esdservice"
   prettyName="Red Hat CCM Content Types"
   version="6.6.0"
   release="1"
@@ -8,7 +8,7 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-cms-types-contact" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-ldn-types-contact" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

ccm-ldn-types-esdservice/src/WEB-INF/content-types/com/arsdigita/london/contenttypes/ESDService.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ctd:content-types 
+<ctd:content-types  xmlns:ctd="http://xmlns.redhat.com/cms/content-types" 
-     xmlns:ctd="http://xmlns.redhat.com/cms/content-types" 
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+           xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
-     xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
          
   <ctd:content-type
     label="ESDService"

ccm-ldn-types-esdservice/src/com/arsdigita/london/contenttypes/ESDServiceInitializer.java

@@ -36,9 +36,9 @@ public class ESDServiceInitializer extends ContentTypeInitializer {
     /**
      * Constructor, sets the PDL manifest file and object type string.
      */
-  public ESDServiceInitializer() {
+    public ESDServiceInitializer() {
-    super("ccm-cms-types-esdservice.pdl.mf", ESDService.BASE_DATA_OBJECT_TYPE);
+        super("ccm-ldn-types-esdservice.pdl.mf", ESDService.BASE_DATA_OBJECT_TYPE);
-  }
+    }
 
     /**
      * Retrieve location of this content type's internal default theme 

ccm-ldn-userpreferences/application.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-user-preferences"
+  name="ccm-ldn-userpreferences"
   prettyName="User Preferences"
   version="6.6.0"
   release="1"

ccm-ldn-userpreferences/src/ccm-ldn-userpreferences.load

@@ -10,7 +10,7 @@
     <initializer class="com.arsdigita.london.userprefs.Initializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-user-preferences"/>
+    <schema directory="ccm-ldn-userpreferences"/>
     <!--
     <data class="com.arsdigita.london.userprefs.Loader"/>
     -->

ccm-ldn-userpreferences/src/com/arsdigita/london/userprefs/Initializer.java

@@ -35,10 +35,11 @@ public class Initializer extends CompoundInitializer {
 
         add(new PDLInitializer
             (new ManifestSource
-             ("ccm-user-preferences.pdl.mf",
+             ("ccm-ldn-userpreferences.pdl.mf",
               new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
     }
 
+    @Override
     public void init( DomainInitEvent evt ) {
         PersistentUserPrefs.domainInit();
         Pref.domainInit();

ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql

@@ -18,8 +18,6 @@
 -- $Id: postgres-6.6.1-6.6.2.sql  $
 
 -- Navigation is now initialized as a legacy free type of application
--- NavigationDirectoryPortlet) to ccm-ldn-navigation because it depends on
--- navigation and was misplaced there (generating horizontal dependencies).
 
 
 begin;

ccm-sci-bundle/bundles/devel/cfg/integration.properties

@@ -121,7 +121,6 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 themedirector.default_theme_context=
 # themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
 themedirector.default_theme_path=themes/static/aplaws-generic
-themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 # ccm-auth-http application
 auth.http.admin_email=webmaster@scientificcms.org

ccm-sci-bundle/bundles/devel/cfg/project.xml

@@ -31,23 +31,16 @@
         <ccm:application name="ccm-cms"/>
 
 <!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-imagestep"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
         <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
-
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
@@ -62,36 +55,40 @@
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS  OPTIONAL packages                                    -->
-<!--    Various combinations of these packages make up specific editions     -->
+<!--    Various combinations of these packages make up specific bundles      -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-<!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
 
-<!--   Content Types   -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--   Standard Bundle                                                       -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--   Standard Bundle's Content Assets                                      -->
+        <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
+
+<!--   Standard Bundle's Content Types                                       -->
         <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
         <ccm:application name="ccm-cms-types-contact"/>
         <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-person"/>
 
-<!--   Applications   -->
+<!--   Standard Bundle's Applications   -->
+        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-cms-publicpersonalprofile"/>
 
-<!--   LDN extension  -->
+<!--   Standard Bundle's SCI extension  -->
-<!--    temporarily excluded because configuration issues have to be resolved
+        <!--
-        <ccm:application name="ccm-ldn-rss"/>                        
-        <ccm:application name="ccm-rssfeed"/>                        
--->
-
-<!--   SCI extension  -->
-<!--
         <ccm:application name="ccm-sci-personalprojects"/>
--->
+        -->
         <ccm:application name="ccm-sci-personalpublications"/>
         <ccm:application name="ccm-sci-publications"/>
 
@@ -101,6 +98,17 @@
         <ccm:application name="ccm-sci-types-project"/>
 
 
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--   Extended Bundle                                                       -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+<!--   Extended Bundle's Content Assets   -->
+
+<!--   Extended Bundle's Applications   -->
+
+<!--   Extended Bundle's SCI extensions  -->
+
+
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS   potential ADD-ONS packages                          -->
@@ -121,9 +129,9 @@
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
-<!--    package survey is currently broken
+        <!-- package survey is currently broken
         <ccm:application name="ccm-cms-types-survey"/>
--->
+        -->
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
 <!--   Portlets       -->
@@ -165,13 +173,13 @@
 <!--    Scientific CMS   list of OBSOLETE modules                            -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-<!--   Content Types   -->
+<!--   OBSOLETE Content Types   -->
 <!--    <ccm:application name="ccm-cms-types-motditem"/> 
         Current code does not include any xsl templates, content type does not
         appear in the list of types in content center. 
         For the moment no longer supported (2012-02-06)                      -->
 
-<!--   Applications   -->
+<!--   OBSOLETE Applications   -->
 
 <!--    currently doesn't work for unknown reason
         <ccm:application name="ccm-simplesurvey"/>                   -->
@@ -180,7 +188,7 @@
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-user-preferences"/>               -->
 
-<!--   LDN extension  -->
+<!--   OBSOLETE LDN extension  -->
 
 <!--    Conflicts with ccm-sci-bundle (this package)                 -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
@@ -192,10 +200,6 @@
         <ccm:application name="ccm-ldn-types-esdservice"/>                     -->
 
 
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
-
   </ccm:build>
 
 </ccm:project>