From 3809f03bc25a91faf627df4ffcbe87f766059cda Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 3 Aug 2011 09:52:54 +0000
Subject: [PATCH] =?UTF-8?q?Nachf=C3=BChren=20=C3=84nderungen=20in=20aplaws?=
 =?UTF-8?q?-trunk.=20HB=20repository=20jetzt=20synchron=20mit=20upstream?=
 =?UTF-8?q?=20r2230.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1051 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-ldn-aplaws/application.xml                |  2 --
 ccm-ldn-aplaws/bundles/custom/cfg/project.xml |  2 +-
 ccm-ldn-aplaws/bundles/demo/cfg/project.xml   |  1 +
 ccm-ldn-aplaws/bundles/devel/cfg/project.xml  |  4 +--
 tools-ng/ecdc/scriptlib/build-runtime.xml     | 26 +++++++++----------
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/ccm-ldn-aplaws/application.xml b/ccm-ldn-aplaws/application.xml
index 35384f00a..5f24c4600 100755
--- a/ccm-ldn-aplaws/application.xml
+++ b/ccm-ldn-aplaws/application.xml
@@ -11,9 +11,7 @@
     <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-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-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
index 9675b83f2..b580423f5 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -35,6 +35,7 @@
 
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
+        <ccm:application name="ccm-ldn-dublin"/> 
         <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
@@ -86,7 +87,6 @@
 <!--    <ccm:application name="ccm-forum"/>                           -->
 <!--    <ccm:application name="ccm-forum-categorised"/>               -->
 
-<!--    <ccm:application name="ccm-ldn-dublin"/>                      -->
 <!--    <ccm:application name="ccm-ldn-exporter"/>                    -->
 <!--    <ccm:application name="ccm-ldn-freeform"/>                    -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                    -->
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index 4da69688c..fc21b2b13 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -17,6 +17,7 @@
 
 <ccm:databases>
         <ccm:database name="postgres"/>
+        <ccm:database name="oracle-se"/>
 </ccm:databases>
 
 
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 706735b66..2cafd7d4b 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -18,7 +18,7 @@
 
 <ccm:databases>
         <ccm:database name="postgres"/>
-        <ccm:database name="oracle"/>
+        <ccm:database name="oracle-se"/>
 </ccm:databases>
 
 
@@ -62,7 +62,7 @@
 
         <ccm:application name="ccm-core"/>
 
-        <ccm:application name="ccm-docmngr"/>
+        <ccm:application name="ccm-docmgr"/>
         <ccm:application name="ccm-docrepo"/>
         <ccm:application name="ccm-faq"/>
         <ccm:application name="ccm-formbuilder-pdf"/>
diff --git a/tools-ng/ecdc/scriptlib/build-runtime.xml b/tools-ng/ecdc/scriptlib/build-runtime.xml
index 98e2048be..07aa6a278 100644
--- a/tools-ng/ecdc/scriptlib/build-runtime.xml
+++ b/tools-ng/ecdc/scriptlib/build-runtime.xml
@@ -75,25 +75,25 @@
 			<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
 			<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.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl" />
 			-->
 
-                        <!-- standard parameter to Tomcat operation  -->
-			<sysproperty key="catalina.home" 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" />
-			<jvmarg value="-Xms256m" />
-			<jvmarg value="-Xmx512m" />
-			<jvmarg value="-XX:PermSize=128m" />
-			<jvmarg value="-XX:MaxPermSize=128m" />
-			<jvmarg value="${app.server.debugger}" />
-			<classpath>
-				<pathelement path="${app.server.home.dir}/bin/bootstrap.jar" />
-			</classpath>
+		    <!-- standard parameter to Tomcat operation  -->
+		    <sysproperty key="catalina.home" 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" />
+		    <jvmarg value="-Xms256m" />
+		    <jvmarg value="-Xmx512m" />
+		    <jvmarg value="-XX:PermSize=128m" />
+		    <jvmarg value="-XX:MaxPermSize=128m" />
+		    <jvmarg value="${app.server.debugger}" />
+		    <classpath>
+		        <pathelement path="${app.server.home.dir}/bin/bootstrap.jar" />
+		    </classpath>
 		</java>
 	</target>