hammant 2002/10/15 15:33:11
Modified: . Tag: RELEASE_402-branch ant.properties.sample
build.xml
Log:
Unix and Windows wrappers please.
Revision Changes Path
No revision
No revision
1.14.2.1 +9 -8 jakarta-avalon-phoenix/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/ant.properties.sample,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- ant.properties.sample 3 Aug 2002 19:17:44 -0000 1.14
+++ ant.properties.sample 15 Oct 2002 22:33:11 -0000 1.14.2.1
@@ -25,17 +25,18 @@
#xerces.lib=${xerces.home}
#xerces.jar=${xerces.lib}/xerces.jar
-# ----- Java Service Wrapper, version 2.2.3 or later -----
-#wrapper.home=${base.path}/wrapper_linux_2.2.3
-#wrapper.jar=${wrapper.home}/lib/wrapper.jar
+# ----- Java Service Wrapper, version 2.2.8 or later -----
+#wrapper.windows.home=../wrapper_win32_2.2.8
+#wrapper.unix.home=../wrapper_linux_2.2.8
+#wrapper.windows.jar=${wrapper.windows.home}/lib/wrapper.jar
# Linux/Solaris
-#wrapper.exe=${wrapper.home}/bin/wrapper
-#wrapper.dll=${wrapper.home}/lib/libwrapper.so
+#wrapper.unix.exe=${wrapper.unix.home}/bin/wrapper
+#wrapper.unix.so=${wrapper.unix.home}/lib/libwrapper.so
# Windows
-#wrapper.exe=${wrapper.home}/bin/Wrapper.exe
-#wrapper.dll=${wrapper.home}/lib/Wrapper.dll
+#wrapper.windows.exe=${wrapper.windows.home}/bin/Wrapper.exe
+#wrapper.windows.dll=${wrapper.windows.home}/lib/Wrapper.dll
# ----- Javac tools.jar -----
# The path to tools.jar, required for building the docs. Most people won't need
1.164.2.10 +14 -6 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.164.2.9
retrieving revision 1.164.2.10
diff -u -r1.164.2.9 -r1.164.2.10
--- build.xml 14 Oct 2002 12:35:26 -0000 1.164.2.9
+++ build.xml 15 Oct 2002 22:33:11 -0000 1.164.2.10
@@ -70,7 +70,7 @@
<pathelement location="${xerces.jar}"/>
<pathelement location="${framework.jar}"/>
<pathelement location="${logkit.jar}"/>
- <pathelement location="${wrapper.jar}"/>
+ <pathelement location="${wrapper.windows.jar}"/>
<pathelement path="${mx4j.jar}"/>
<pathelement path="${mx4j-tools.jar}"/>
<pathelement path="${java.class.path}" />
@@ -406,8 +406,7 @@
<copy file="src/logos/phoenix.gif"
todir="mx4j-tools-temp/mx4j/adaptor/http/xsl"/>
<zip destfile="${build.lib}/mx4j-tools.jar" basedir="mx4j-tools-temp"/>
-
-
+
<copy file="${mx4j.jar}" todir="${bin.dist.bin}/lib"/>
<copy file="${build.lib}/mx4j-tools.jar" todir="${bin.dist.bin}/lib"/>
@@ -433,9 +432,14 @@
<filter token="app.name" value="phoenix"/>
<filter token="app.long.name" value="Phoenix Application Server"/>
- <copy file="${wrapper.jar}" todir="${bin.dist.bin}"/>
- <copy file="${wrapper.exe}" todir="${bin.dist.bin}"/>
- <copy file="${wrapper.dll}" todir="${bin.dist.bin}"/>
+ <!-- Ant.properties.sample has changed folks. You'll need both the linux
and windows wrapper
+ downloads to get this working completely now.
-->
+
+ <copy file="${wrapper.windows.jar}" todir="${bin.dist.bin}"/>
+ <copy file="${wrapper.windows.exe}" todir="${bin.dist.bin}"/>
+ <copy file="${wrapper.windows.dll}" todir="${bin.dist.bin}"/>
+ <copy file="${wrapper.unix.exe}" todir="${bin.dist.bin}"/>
+ <copy file="${wrapper.unix.so}" todir="${bin.dist.bin}"/>
<chmod file="${bin.dist.bin}/wrapper" perm="u+x"/>
<copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.conf}"/>
@@ -600,6 +604,8 @@
<fileset dir="${dist.name}/..">
<include name="${dist.name}/**"/>
<exclude name="${dist.name}/lib/bsh*.jar"/>
+ <exclude name="${dist.name}/bin/wrapper"/>
+ <exclude name="${dist.name}/bin/libwrapper.so"/>
</fileset>
</zip>
@@ -611,6 +617,8 @@
<include name="${dist.name}/**"/>
<exclude name="${dist.name}/bin/*.sh"/>
<exclude name="${dist.name}/lib/bsh*.jar"/>
+ <exclude name="${dist.name}/bin/Wrapper.exe"/>
+ <exclude name="${dist.name}/bin/Wrapper.dll"/>
</tarfileset>
</tar>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
