LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nachführen Änderungen in aplaws-trunk. HB repository jetzt synchron mit upstream r2230. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1051 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-08-03 09:52:54 +00:00
parent e228b13cf9
commit 3809f03bc2
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-ldn-aplaws/application.xml
View File

@ -11,9 +11,7 @@
<ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/> <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
<ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
<!-- not required anymore (2007-06-09)
<ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
-->
<ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
</ccm:dependencies> </ccm:dependencies>

2
ccm-ldn-aplaws/bundles/custom/cfg/project.xml
View File

@ -35,6 +35,7 @@
<ccm:application name="ccm-ldn-aplaws"/> <ccm:application name="ccm-ldn-aplaws"/>
<ccm:application name="ccm-ldn-atoz"/> <ccm:application name="ccm-ldn-atoz"/>
<ccm:application name="ccm-ldn-dublin"/>
<ccm:application name="ccm-ldn-navigation"/> <ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-search"/> <ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/> <ccm:application name="ccm-ldn-shortcuts"/>
@ -86,7 +87,6 @@
<!-- <ccm:application name="ccm-forum"/> --> <!-- <ccm:application name="ccm-forum"/> -->
<!-- <ccm:application name="ccm-forum-categorised"/> --> <!-- <ccm:application name="ccm-forum-categorised"/> -->
<!-- <ccm:application name="ccm-ldn-dublin"/> -->
<!-- <ccm:application name="ccm-ldn-exporter"/> --> <!-- <ccm:application name="ccm-ldn-exporter"/> -->
<!-- <ccm:application name="ccm-ldn-freeform"/> --> <!-- <ccm:application name="ccm-ldn-freeform"/> -->
<!-- <ccm:application name="ccm-ldn-importer"/> --> <!-- <ccm:application name="ccm-ldn-importer"/> -->

1
ccm-ldn-aplaws/bundles/demo/cfg/project.xml
View File

@ -17,6 +17,7 @@
<ccm:databases> <ccm:databases>
<ccm:database name="postgres"/> <ccm:database name="postgres"/>
<ccm:database name="oracle-se"/>
</ccm:databases> </ccm:databases>

4
ccm-ldn-aplaws/bundles/devel/cfg/project.xml
View File

@ -18,7 +18,7 @@
<ccm:databases> <ccm:databases>
<ccm:database name="postgres"/> <ccm:database name="postgres"/>
<ccm:database name="oracle"/> <ccm:database name="oracle-se"/>
</ccm:databases> </ccm:databases>
@ -62,7 +62,7 @@
<ccm:application name="ccm-core"/> <ccm:application name="ccm-core"/>
<ccm:application name="ccm-docmngr"/> <ccm:application name="ccm-docmgr"/>
<ccm:application name="ccm-docrepo"/> <ccm:application name="ccm-docrepo"/>
<ccm:application name="ccm-faq"/> <ccm:application name="ccm-faq"/>
<ccm:application name="ccm-formbuilder-pdf"/> <ccm:application name="ccm-formbuilder-pdf"/>

26
tools-ng/ecdc/scriptlib/build-runtime.xml
View File

@ -75,25 +75,25 @@
<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
<sysproperty key="javax.xml.transform.TransformerFactory" value="com.icl.saxon.TransformerFactoryImpl" /> <sysproperty key="javax.xml.transform.TransformerFactory" value="com.icl.saxon.TransformerFactoryImpl" />
<sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl" /> <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl" />
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl" /> <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl" />
--> -->
<!-- standard parameter to Tomcat operation --> <!-- standard parameter to Tomcat operation -->
<sysproperty key="catalina.home" value="${app.server.home.dir}" /> <sysproperty key="catalina.home" value="${app.server.home.dir}" />
<sysproperty key="catalina.base" value="${app.server.home.dir}" /> <sysproperty key="catalina.base" value="${app.server.home.dir}" />
<sysproperty key="catalina.config" value="file:///${app.server.conf.dir}/catalina.properties" /> <sysproperty key="catalina.config" value="file:///${app.server.conf.dir}/catalina.properties" />
<jvmarg value="-Xms256m" /> <jvmarg value="-Xms256m" />
<jvmarg value="-Xmx512m" /> <jvmarg value="-Xmx512m" />
<jvmarg value="-XX:PermSize=128m" /> <jvmarg value="-XX:PermSize=128m" />
<jvmarg value="-XX:MaxPermSize=128m" /> <jvmarg value="-XX:MaxPermSize=128m" />
<jvmarg value="${app.server.debugger}" /> <jvmarg value="${app.server.debugger}" />
<classpath> <classpath>
<pathelement path="${app.server.home.dir}/bin/bootstrap.jar" /> <pathelement path="${app.server.home.dir}/bin/bootstrap.jar" />
</classpath> </classpath>
</java> </java>
</target> </target>