You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/03/04 17:34:36 UTC
svn commit: r156179 - in lenya/branches/BRANCH_1_2_X: build.properties
src/targets/message-build.xml src/targets/properties-build.xml
src/targets/webapp-build.xml
Author: michi
Date: Fri Mar 4 08:34:35 2005
New Revision: 156179
URL: http://svn.apache.org/viewcvs?view=rev&rev=156179
Log:
WLS build implemented
Modified:
lenya/branches/BRANCH_1_2_X/build.properties
lenya/branches/BRANCH_1_2_X/src/targets/message-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
Modified: lenya/branches/BRANCH_1_2_X/build.properties
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/build.properties?view=diff&r1=156178&r2=156179
==============================================================================
--- lenya/branches/BRANCH_1_2_X/build.properties (original)
+++ lenya/branches/BRANCH_1_2_X/build.properties Fri Mar 4 08:34:35 2005
@@ -21,7 +21,7 @@
# NOTE for Devs: Update this number if this file is being updated.
# Also update the version number within src/targets/properties-build.xml
-build.properties.version=155803
+build.properties.version=156052
#------------------------------------------------------------------------------------
@@ -86,6 +86,14 @@
# NOTE: This path is not necessarily relative to tomcat.home.dir
tomcat.endorsed.dir=${tomcat.home.dir}/common/endorsed
+
+
+#------------------------------------------------------------------------------------
+# Where the 'install' build target should local WLS
+
+wls.domain.dir=/usr/local/bea81/user_projects/domains/my-domain
+wls.webapps.dir=${wls.domain.dir}/applications/lenya
+
#------------------------------------------------------------------------------------
# Files and directories which should be excluded during 'install' and 'reset'
Modified: lenya/branches/BRANCH_1_2_X/src/targets/message-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/message-build.xml?view=diff&r1=156178&r2=156179
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/message-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/message-build.xml Fri Mar 4 08:34:35 2005
@@ -61,4 +61,22 @@
<echo message="*****************************************************************"/>
</target>
+ <target name="successfully-built-message-wls" if="servlet.engine.wls">
+ <echo message="*****************************************************************"/>
+ <echo message="*"/>
+ <echo message="* You have successfully built ${Name} ${version} based on"/>
+ <echo message="*"/>
+ <echo message="* Cocoon (${cocoon.src.dir})"/>
+ <echo message="*"/>
+ <echo message="* Start using ${Name} with WLS by typing"/>
+ <echo message="* Linux/UNIX: ${wls.domain.dir}/startWebLogic.sh"/>
+ <echo message="*"/>
+ <echo message="* and browse to "/>
+ <echo message="* http://127.0.0.1:8080/lenya/"/>
+ <echo message="*"/>
+ <echo message="* Thanks for using ${Name}"/>
+ <echo message="*"/>
+ <echo message="*****************************************************************"/>
+ </target>
+
</project>
Modified: lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml?view=diff&r1=156178&r2=156179
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml Fri Mar 4 08:34:35 2005
@@ -35,7 +35,7 @@
<property file="build.properties"/>
<condition property="local.properties.in.sync">
- <equals arg1="${build.properties.version}" arg2="155803"/>
+ <equals arg1="${build.properties.version}" arg2="156052"/>
</condition>
<fail unless="local.properties.in.sync" message="It seems that your local.build.properties is NOT in sync with build.properties! The file build.properties has probably been modified by some Apache Lenya developer. Re-copy build.properties to local.build.properties and re-set your local properties to get the two files back in sync. Please apologoize the inconvenience."/>
Modified: lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?view=diff&r1=156178&r2=156179
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Fri Mar 4 08:34:35 2005
@@ -154,6 +154,12 @@
</fileset>
</copy>
+ <condition property="servlet.engine.wls">
+ <equals arg1="${web.app.server}" arg2="WLS"/>
+ </condition>
+ <antcall target="install-wls"/>
+ <antcall target="successfully-built-message-wls"/>
+
<condition property="servlet.engine.tomcat">
<equals arg1="${web.app.server}" arg2="Tomcat"/>
</condition>
@@ -215,6 +221,32 @@
<copy file="${build.webapp}/WEB-INF/lib/xml-apis.jar" todir="${tomcat.endorsed.dir}"/>
</target>
+
+ <!-- ============================================================ -->
+ <!-- Install webapp into WLS -->
+ <!-- ============================================================ -->
+ <target name="install-wls" description="Install the webapp into WLS servlet engine context" if="servlet.engine.wls">
+ <echo>INFO: Copy webapp to WLS</echo>
+
+ <echo>INFO: Copy From build.webapp=${build.webapp} To wls.webapps.dir=${wls.webapps.dir}</echo>
+ <copy todir="${wls.webapps.dir}" filtering="off">
+ <fileset dir="${build.webapp}" excludes="${target.install.excludes}"/>
+ </copy>
+
+ <echo>INFO: The following libraries need to be treated as endorsed: jakarta-bcel-20040329.jar rhino1.5r4-continuations-20040629T1232.jar xercesImpl-2.6.2.jar jakarta-regexp-1.3.jar xalan-2.6.1-dev-20041008T0304.jar xml-apis.jar</echo>
+<!--
+ <echo>INFO: Copy endorsed libraries</echo>
+ <copy todir="${tomcat.endorsed.dir}">
+ <fileset dir="${build.webapp}/WEB-INF/lib/">
+ <include name="xercesImpl-*.jar"/>
+ <include name="xalan-*.jar"/>
+ <include name="jakarta-regexp-*.jar"/>
+ <include name="jakarta-bcel-*.jar"/>
+ </fileset>
+ </copy>
+ <copy file="${build.webapp}/WEB-INF/lib/xml-apis.jar" todir="${tomcat.endorsed.dir}"/>
+-->
+ </target>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org