From 35d083f2b31bfa3caaecef82534c5a45b1e56bee Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 3 Mar 2014 18:37:51 +0000
Subject: [PATCH] =?UTF-8?q?Einige=20gesammelte=20=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2550 8810af33-2d31-482b-a856-94f89814c4df
---
 .../arsdigita/cms/contenttypes/Address.xml    |  2 +-
 .../arsdigita/cms/contenttypes/Contact.xml    | 95 ++++++++++---------
 ccm-sci-bundle/bundles/devel/cfg/project.xml  |  2 +-
 tools-ng/ecdc/scriptlib/build-runtime.xml     |  4 +-
 4 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml b/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml
index 14208b3ec..bec93b05a 100644
--- a/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml
+++ b/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml
@@ -11,7 +11,7 @@
         classname="com.arsdigita.cms.contenttypes.Address">
 
         <ctd:authoring-kit
-            createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
+            createComponent="com.arsdigita.cms.contenttypes.ui.GenericAddressCreate">
 
             <ctd:authoring-step
                 labelKey="address.authoring.basic_properties.title"
diff --git a/ccm-cms-types-contact/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.xml b/ccm-cms-types-contact/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.xml
index 6b4dbb319..a9f808657 100644
--- a/ccm-cms-types-contact/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.xml
+++ b/ccm-cms-types-contact/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Contact.xml
@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xrd:adapters 
-  xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
-  <!-- 
-    Extend adapter for ContentItemPanel to also output the associated objects.
-    The default properties for BaseContact are left as is and are inherited from ContentPage
-  -->
-  <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
-    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Contact" extends="com.arsdigita.cms.ContentPage">
-      <xrd:attributes rule="exclude">
-        <xrd:property name="/object/person/id"/>
-        <xrd:property name="/object/person/defaultDomainClass"/>
-        <xrd:property name="/object/person/objectType"/>
-        <xrd:property name="/object/person/displayName"/>
-        <xrd:property name="/object/person/ancestors"/>
-        <xrd:property name="/object/person/version"/>
-        <xrd:property name="/object/person/name"/>
-        <xrd:property name="/object/person/language"/>
-        <xrd:property name="/object/person/isDeleted"/>
-        <xrd:property name="/object/address/id"/>
-        <xrd:property name="/object/address/defaultDomainClass"/>
-        <xrd:property name="/object/address/objectType"/>
-        <xrd:property name="/object/address/displayName"/>
-        <xrd:property name="/object/address/ancestors"/>
-        <xrd:property name="/object/address/version"/>
-        <xrd:property name="/object/address/name"/>
-        <xrd:property name="/object/address/language"/>
-        <xrd:property name="/object/address/isDeleted"/>
-        <xrd:property name="/object/contactentries/id"/>
-        <xrd:property name="/object/contactentries/defaultDomainClass"/>
-        <xrd:property name="/object/contactentries/objectType"/>
-        <xrd:property name="/object/contactentries/displayName"/>
-        <xrd:property name="/object/contactentries/ancestors"/>
-        <xrd:property name="/object/contactentries/version"/>
-        <xrd:property name="/object/contactentries/name"/>
-        <xrd:property name="/object/contactentries/language"/>
-        <xrd:property name="/object/contactentries/isDeleted"/>
-        <xrd:property name="/object/contactentries/description"/>        
-      </xrd:attributes>
-      <xrd:associations rule="include">
-        <xrd:property name="/object/person"/>
-        <xrd:property name="/object/address"/>
-        <xrd:property name="/object/contactentries"/>
-        <xrd:property name="/object/organizationalunit"/>        
-      </xrd:associations>
-    </xrd:adapter>
-  </xrd:context>
+    xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
+    <!-- 
+      Extend adapter for ContentItemPanel to also output the associated objects.
+      The default properties for BaseContact are left as is and are inherited from ContentPage
+    -->
+    <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
+        <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Contact" extends="com.arsdigita.cms.ContentPage">
+            <xrd:attributes rule="exclude">
+                <xrd:property name="/object/person/id"/>
+                <xrd:property name="/object/person/defaultDomainClass"/>
+                <xrd:property name="/object/person/objectType"/>
+                <xrd:property name="/object/person/displayName"/>
+                <xrd:property name="/object/person/ancestors"/>
+                <xrd:property name="/object/person/version"/>
+                <xrd:property name="/object/person/name"/>
+                <xrd:property name="/object/person/language"/>
+                <xrd:property name="/object/person/isDeleted"/>
+                <!-- Assoication changed, this does not work longer. Instead an extra xml generator is required
+                <xrd:property name="/object/address/id"/>
+                <xrd:property name="/object/address/defaultDomainClass"/>
+                <xrd:property name="/object/address/objectType"/>
+                <xrd:property name="/object/address/displayName"/>
+                <xrd:property name="/object/address/ancestors"/>
+                <xrd:property name="/object/address/version"/>
+                <xrd:property name="/object/address/name"/>
+                <xrd:property name="/object/address/language"/>
+                <xrd:property name="/object/address/isDeleted"/>-->
+                <xrd:property name="/object/contactentries/id"/>
+                <xrd:property name="/object/contactentries/defaultDomainClass"/>
+                <xrd:property name="/object/contactentries/objectType"/>
+                <xrd:property name="/object/contactentries/displayName"/>
+                <xrd:property name="/object/contactentries/ancestors"/>
+                <xrd:property name="/object/contactentries/version"/>
+                <xrd:property name="/object/contactentries/name"/>
+                <xrd:property name="/object/contactentries/language"/>
+                <xrd:property name="/object/contactentries/isDeleted"/>
+                <xrd:property name="/object/contactentries/description"/>        
+            </xrd:attributes>
+            <xrd:associations rule="include">
+                <xrd:property name="/object/person"/>
+                <xrd:property name="/object/address"/>
+                <xrd:property name="/object/contactentries"/>
+                <xrd:property name="/object/organizationalunit"/>        
+            </xrd:associations>
+        </xrd:adapter>
+    </xrd:context>
 </xrd:adapters>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index aa9885547..70864c41d 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.2.0" 
-                 release="devel-SNAPSHOT-r2540" 
+                 release="devel-SNAPSHOT-r2548" 
                   webxml="web-sci.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/tools-ng/ecdc/scriptlib/build-runtime.xml b/tools-ng/ecdc/scriptlib/build-runtime.xml
index 879da02ae..c2d2cf4d3 100644
--- a/tools-ng/ecdc/scriptlib/build-runtime.xml
+++ b/tools-ng/ecdc/scriptlib/build-runtime.xml
@@ -71,9 +71,9 @@
 		<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
 
 			<!--  nolonger needed ? (if anything works as expected)   
-			      seems to be needed if sysproperty javax....xerces...SAYParser ....  below is set.
+			      seems to be needed if sysproperty javax....xerces...SAYParser ....  below is set.-->
 			<sysproperty key="java.endorsed.dirs" value="${app.server.shared.dir}/endorsed" />
-			-->
+			<!-- -->
 
             <!-- Previously required to prevent Tomcat from using AElfred to check web.xml / taglibs  -->
 			<!-- seems to work now without, please comment in if something goes wrong with XML processing