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

bug fix for new devel env 

git-svn-id: https://svn.libreccm.org/ccm/trunk@88 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2009-02-26 07:01:04 +00:00
parent adf49ebaa2
commit 97a11ccffa
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools-ng/ecdc/conf/runtime.properties
View File

@ -11,6 +11,7 @@
## ##
app.server.type=tomcat app.server.type=tomcat
# Tomcat version 5.5 not yet supported!
#app.server.version=5.5.27 #app.server.version=5.5.27
app.server.version=6.0.18 app.server.version=6.0.18
app.server.vendor=apache app.server.vendor=apache
@ -20,8 +21,8 @@
## ##
app.server.bundles.name=${app.server.vendor}-${app.server.type}-${app.server.version} app.server.bundles.name=${app.server.vendor}-${app.server.type}-${app.server.version}
app.server.bundles.dir=${app.server.parent.dir}/bundles <!-- NOT NEEDED: app.server.bundles.dir=${tools.bundles.dir}/bundles -->
app.server.bundles.zip=${app.server.bundles.dir}/${app.server.bundles.name}.zip app.server.bundles.zip=${tools.bundles.dir}/${app.server.bundles.name}.zip
app.server.parent.dir=${project.dir}/runtime app.server.parent.dir=${project.dir}/runtime
deploy.dir=${app.server.parent.dir}/${app.server.bundles.name} deploy.dir=${app.server.parent.dir}/${app.server.bundles.name}

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

@ -10,15 +10,19 @@
<target name="install-tomcat"> <target name="install-tomcat">
<echo>Installing app server into ${deploy.dir}</echo> <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> <patternset>
<exclude name="**/webapps/**" /> <exclude name="**/webapps/**" />
</patternset> </patternset>
</unzip> </unzip>
<!-- Nolonger NEEDED! when lib files are copied to another location?
-->
<replaceregexp file="${webapp.conf.dir}/catalina.properties" match="shared.loader=(.*)" <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" replace="shared.loader=\1,${catalina.base}/webapps/WEB-INF/classes,${catalina.base}/webapps/WEB-INF/lib/*.jar"
byline="true" /> 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>
<target name="start"> <target name="start">