Neue application.cfg für ZeS, Formatierungen.

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

ccm-cms-types-researchnetwork/application.xml

@@ -7,7 +7,6 @@
   <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-person" version="6.6.0" relation="ge"/>        
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>
@@ -20,4 +19,4 @@
   <ccm:description>
     Content type for representing a research network.
   </ccm:description>
-</ccm:application>
+</ccm:application>

ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java

@@ -107,7 +107,7 @@ public class PrivilegeDescriptor {
         priv.set("privilege", name);
         priv.save();
         addChildPrivilege(ADMIN_NAME, name);
-        s_log.warn(String.format("Creating privilege %s...", name));
+        s_log.debug(String.format("Creating privilege %s...", name));
         // Constructor PrivilegeDescriptor is deprecated and should be
         // replaced by the class method get(name),
 	// but this does not work under all circumstances. Further

ccm-zes-aplaws/bundles/devel/cfg/applications.cfg

@@ -7,7 +7,6 @@ ccm-cms-assets-fileattachment
 ccm-cms-assets-imagestep
 ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
-ccm-cms-assets-imagestep
 
 # Content types
 ccm-cms-types-address
@@ -32,17 +31,20 @@ ccm-cms-types-formsectionitem
 # -- ccm-cms-types-inlinesite
 # -- ccm-cms-types-job
 # -- ccm-cms-types-legalnotice
+ccm-cms-types-member
 # -- ccm-cms-types-minutes
 # -- ccm-cms-types-motditem
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 # -- ccm-cms-types-organization
 # -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-researchnetwork
 # -- ccm-cms-types-service
 ccm-cms-types-siteproxy
 #  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
 ccm-cms-types-xmlfeed
 
+ccm-sci-types-organization
 
 # Applications
 # ------------
@@ -75,6 +77,9 @@ ccm-ldn-terms
 ccm-ldn-theme
 ccm-ldn-util
 
+# sci extensions
+# --------------
+ccm-sci-publications
 # integration layer
 ccm-zes-aplaws
 

ccm-zes-aplaws/bundles/devel/cfg/integration.properties

@@ -95,7 +95,7 @@ com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl x
 
 ; =============================================================================================
 ; devel specific configurations
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes?user\=zes&password\=zes47web
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-test?user\=zes&password\=zes47web
 waf.runtime.jdbc_pool_size=80
 
 waf.web.server=localhost\:8080
@@ -107,6 +107,6 @@ waf.admin.password=nge2015
 waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-;  waf.debug=true
+waf.debug=true
-;  waf.bebop.fancy_xsl_errors=true
+waf.bebop.fancy_xsl_errors=true
 

environment/project.xml.zes

@@ -7,8 +7,8 @@
               ccmVersion="6.1" 
                     name="aplaws-zes" 
               prettyName="APLAWS plus" 
-                 version="1-0-9" 
+                 version="1-1-0" 
-                 release="rc-3" 
+                 release="beta-1" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -49,25 +49,24 @@
 <!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
 <!--    <ccm:application name="ccm-cms-types-job"/>                  -->
 <!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
+
+        <ccm:application name="ccm-cms-types-member"/>      
+
 <!--    <ccm:application name="ccm-cms-types-minutes"/>              -->
 <!--    <ccm:application name="ccm-cms-types-motditem"/>             -->
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
+
 <!--    <ccm:application name="ccm-cms-types-organization"/>         -->
+
 <!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
+<!--    <ccm:application name="ccm-cms-types-researchnetwork"/>      -->
 <!--    <ccm:application name="ccm-cms-types-service"/>              -->
         <ccm:application name="ccm-cms-types-siteproxy"/>               
 <!--         xmlfeed may not be needed by ZeS, too                   -->
         <ccm:application name="ccm-cms-types-xmlfeed"/>                       
 
-        <ccm:application name="ccm-cms-types-baseAddress"/>
+        <ccm:application name="ccm-sci-types-organization"/>                       
-        <ccm:application name="ccm-cms-types-baseContact"/>
-        <ccm:application name="ccm-cms-types-genericorganization"/>
-        <ccm:application name="ccm-cms-types-healthCareFacility"/>
-        <ccm:application name="ccm-cms-types-person"/>
-        <ccm:application name="ccm-cms-types-organization"/>
-        <ccm:application name="ccm-cms-types-organizationalunit"/>
-
 
 <!--  Applications   -->
 <!--  - - - - -  -   -->
@@ -103,6 +102,7 @@
 
 <!--  ZeS extension  -->
 <!--  - - - - - - -  -->
+        <ccm:application name="ccm-sci-publications"/>
         <ccm:application name="ccm-zes-aplaws"/>