Einige gesammelte Änderungen

git-svn-id: https://svn.libreccm.org/ccm/trunk@2550 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-03-03 18:37:51 +00:00
parent 670920e070
commit 35d083f2b3
4 changed files with 52 additions and 51 deletions

View File

@ -11,7 +11,7 @@
classname="com.arsdigita.cms.contenttypes.Address"> classname="com.arsdigita.cms.contenttypes.Address">
<ctd:authoring-kit <ctd:authoring-kit
createComponent="com.arsdigita.cms.ui.authoring.PageCreate"> createComponent="com.arsdigita.cms.contenttypes.ui.GenericAddressCreate">
<ctd:authoring-step <ctd:authoring-step
labelKey="address.authoring.basic_properties.title" labelKey="address.authoring.basic_properties.title"

View File

@ -19,6 +19,7 @@
<xrd:property name="/object/person/name"/> <xrd:property name="/object/person/name"/>
<xrd:property name="/object/person/language"/> <xrd:property name="/object/person/language"/>
<xrd:property name="/object/person/isDeleted"/> <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/id"/>
<xrd:property name="/object/address/defaultDomainClass"/> <xrd:property name="/object/address/defaultDomainClass"/>
<xrd:property name="/object/address/objectType"/> <xrd:property name="/object/address/objectType"/>
@ -27,7 +28,7 @@
<xrd:property name="/object/address/version"/> <xrd:property name="/object/address/version"/>
<xrd:property name="/object/address/name"/> <xrd:property name="/object/address/name"/>
<xrd:property name="/object/address/language"/> <xrd:property name="/object/address/language"/>
<xrd:property name="/object/address/isDeleted"/> <xrd:property name="/object/address/isDeleted"/>-->
<xrd:property name="/object/contactentries/id"/> <xrd:property name="/object/contactentries/id"/>
<xrd:property name="/object/contactentries/defaultDomainClass"/> <xrd:property name="/object/contactentries/defaultDomainClass"/>
<xrd:property name="/object/contactentries/objectType"/> <xrd:property name="/object/contactentries/objectType"/>

View File

@ -9,7 +9,7 @@
name="ScientificCMS" name="ScientificCMS"
prettyName="Scientific CMS" prettyName="Scientific CMS"
version="2.2.0" version="2.2.0"
release="devel-SNAPSHOT-r2540" release="devel-SNAPSHOT-r2548"
webxml="web-sci.xml" webxml="web-sci.xml"
webapp="ROOT" webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">

View File

@ -71,9 +71,9 @@
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes"> <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
<!-- nolonger needed ? (if anything works as expected) <!-- 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" /> <sysproperty key="java.endorsed.dirs" value="${app.server.shared.dir}/endorsed" />
--> <!-- -->
<!-- Previously required to prevent Tomcat from using AElfred to check web.xml / taglibs --> <!-- 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 <!-- seems to work now without, please comment in if something goes wrong with XML processing