From 97a11ccffa12ac3bd21a8d074f838f0ff5577d5a Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 26 Feb 2009 07:01:04 +0000
Subject: [PATCH] bug fix for new devel env

git-svn-id: https://svn.libreccm.org/ccm/trunk@88 8810af33-2d31-482b-a856-94f89814c4df
---
 tools-ng/ecdc/conf/runtime.properties     | 5 +++--
 tools-ng/ecdc/scriptlib/build-runtime.xml | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools-ng/ecdc/conf/runtime.properties b/tools-ng/ecdc/conf/runtime.properties
index 7a75007eb..3d1e96941 100644
--- a/tools-ng/ecdc/conf/runtime.properties
+++ b/tools-ng/ecdc/conf/runtime.properties
@@ -11,6 +11,7 @@
 ##
 
     app.server.type=tomcat
+    # Tomcat version 5.5 not yet supported!
     #app.server.version=5.5.27
     app.server.version=6.0.18
     app.server.vendor=apache
@@ -20,8 +21,8 @@
 ##
 
     app.server.bundles.name=${app.server.vendor}-${app.server.type}-${app.server.version}
-    app.server.bundles.dir=${app.server.parent.dir}/bundles
-    app.server.bundles.zip=${app.server.bundles.dir}/${app.server.bundles.name}.zip
+    <!-- NOT NEEDED: app.server.bundles.dir=${tools.bundles.dir}/bundles  -->
+    app.server.bundles.zip=${tools.bundles.dir}/${app.server.bundles.name}.zip
 
     app.server.parent.dir=${project.dir}/runtime
     deploy.dir=${app.server.parent.dir}/${app.server.bundles.name}
diff --git a/tools-ng/ecdc/scriptlib/build-runtime.xml b/tools-ng/ecdc/scriptlib/build-runtime.xml
index 3eb67d494..c6efc60ca 100644
--- a/tools-ng/ecdc/scriptlib/build-runtime.xml
+++ b/tools-ng/ecdc/scriptlib/build-runtime.xml
@@ -10,15 +10,19 @@
 
 	<target name="install-tomcat">
 		<echo>Installing app server into ${deploy.dir}</echo>
-		<unzip src="${app.server.bundles.zip}" dest="${app.server.parent.dir}" overwrite="true">
+		<unzip src="${app.server.bundles.zip}" dest="${app.server.parent.dir}"
+               overwrite="true">
 			<patternset>
 				<exclude name="**/webapps/**" />
 			</patternset>
 		</unzip>
+    <!-- Nolonger NEEDED! when lib files are copied to another location?
+     -->
 		<replaceregexp file="${webapp.conf.dir}/catalina.properties" match="shared.loader=(.*)" 
 			replace="shared.loader=\1,${catalina.base}/webapps/WEB-INF/classes,${catalina.base}/webapps/WEB-INF/lib/*.jar" 
 			byline="true" />
-		<copy file="ccm-core/lib/xercesImpl.jar" todir="${deploy.dir}/common/endorsed" preservelastmodified="true"/>
+		<copy file="ccm-core/lib/xercesImpl.jar"
+              todir="${deploy.dir}/common/endorsed" preservelastmodified="true"/>
 	</target>
 
 	<target name="start">