You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/02/16 10:23:24 UTC
svn commit: r154011 -
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3
Author: chathura
Date: Wed Feb 16 01:23:21 2005
New Revision: 154011
URL: http://svn.apache.org/viewcvs?view=rev&rev=154011
Log:
Buil file update for the Axis2 relative path in the server.
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml?view=diff&r1=154010&r2=154011
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample1/build.xml Wed Feb 16 01:23:21 2005
@@ -16,13 +16,14 @@
<property name="lib.dir" value="./lib" />
<property name="conf.dir" value="./conf"/>
<property name="jardrop.dir" value="services"/>
- <property name="server.jardrop.relative.dir" value="webapps/axis2/WEB-INF/services"/>
+ <property name="axis.relativeserver.dir" value="webapps/axis2"/>
+ <property name="server.jardrop.relative.dir" value="${axis.relativeserver.dir}/WEB-INF/services"/>
<property environment="env"/>
<path id="classpath.library">
- <fileset dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib">
+ <fileset dir="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
</path>
@@ -49,15 +50,15 @@
</target>
<target name="validateTomcatHome">
- <available file="${env.CATALINA_HOME}/webapps/axis2" type="dir" property="axis2.deployed"/>
+ <available file="${env.CATALINA_HOME}/${axis.relativeserver.dir}" type="dir" property="axis2.deployed"/>
</target>
<target name="validateSevices.dir">
- <available file="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services" type="dir" property="axis2.services"/>
+ <available file="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/services" type="dir" property="axis2.services"/>
</target>
<target name="validateDeploymentSettings" depends="validateTomcatHome" unless="validateSevices.dir">
- <mkdir dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services"/>
+ <mkdir dir="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/services"/>
</target>
@@ -68,13 +69,16 @@
<mkdir dir="${build.dir}/${jardrop.dir}"/>
</target>
- <target name="compile" depends="createDir">
+ <target name="compile" depends="clean,createDir">
<javac srcdir="${src.dir}" destdir="${classes.dir}" >
<classpath refid="classpath.library"/>
</javac>
+ <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
+ <fileset dir="${classes.dir}"/>
+ </jar>
</target>
- <target name="jar" depends="clean,compile">
+ <target name="jar" depends="compile">
<jar destfile="${build.dir}/${jardrop.dir}/${ant.project.name}.jar">
<fileset dir="${classes.dir}">
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml?view=diff&r1=154010&r2=154011
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample2/build.xml Wed Feb 16 01:23:21 2005
@@ -16,14 +16,15 @@
<property name="lib.dir" value="./lib" />
<property name="conf.dir" value="./conf"/>
<property name="jardrop.dir" value="services"/>
- <property name="server.jardrop.relative.dir" value="webapps/axis2/WEB-INF/services"/>
+ <property name="axis.relativeserver.dir" value="webapps/axis2"/>
+ <property name="server.jardrop.relative.dir" value="${axis.relativeserver.dir}/WEB-INF/services"/>
<property environment="env"/>
<path id="classpath.library">
- <fileset dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib">
+ <fileset dir="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
</path>
@@ -50,15 +51,15 @@
</target>
<target name="validateTomcatHome">
- <available file="${env.CATALINA_HOME}/webapps/axis2" type="dir" property="axis2.deployed"/>
+ <available file="${env.CATALINA_HOME}/${axis.relativeserver.dir}" type="dir" property="axis2.deployed"/>
</target>
<target name="validateSevices.dir">
- <available file="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services" type="dir" property="axis2.services"/>
+ <available file="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/services" type="dir" property="axis2.services"/>
</target>
<target name="validateDeploymentSettings" depends="validateTomcatHome" unless="validateSevices.dir">
- <mkdir dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services"/>
+ <mkdir dir="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/services"/>
</target>
@@ -69,13 +70,16 @@
<mkdir dir="${build.dir}/${jardrop.dir}"/>
</target>
- <target name="compile" depends="createDir">
+ <target name="compile" depends="clean,createDir">
<javac srcdir="${src.dir}" destdir="${classes.dir}" >
<classpath refid="classpath.library"/>
</javac>
+ <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
+ <fileset dir="${classes.dir}"/>
+ </jar>
</target>
- <target name="jar" depends="clean,compile">
+ <target name="jar" depends="compile">
<jar destfile="${build.dir}/${jardrop.dir}/${ant.project.name}.jar">
<fileset dir="${classes.dir}">
@@ -86,9 +90,7 @@
<include name="META-INF/service.xml"/>
</fileset>
</jar>
- <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
- <fileset dir="${classes.dir}"/>
- </jar>
+
</target>
<target name="deploy" depends="jar,validateDeploymentSettings">
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml?view=diff&r1=154010&r2=154011
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/userguide/sample3/build.xml Wed Feb 16 01:23:21 2005
@@ -16,14 +16,15 @@
<property name="lib.dir" value="./lib" />
<property name="conf.dir" value="./conf"/>
<property name="jardrop.dir" value="services"/>
- <property name="server.jardrop.relative.dir" value="webapps/axis2/WEB-INF/services"/>
+ <property name="axis.relativeserver.dir" value="webapps/axis2"/>
+ <property name="server.jardrop.relative.dir" value="${axis.relativeserver.dir}/WEB-INF/services"/>
<property environment="env"/>
<path id="classpath.library">
- <fileset dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/lib">
+ <fileset dir="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
</path>
@@ -49,15 +50,15 @@
</target>
<target name="validateTomcatHome">
- <available file="${env.CATALINA_HOME}/webapps/axis2" type="dir" property="axis2.deployed"/>
+ <available file="${env.CATALINA_HOME}/${axis.relativeserver.dir}" type="dir" property="axis2.deployed"/>
</target>
<target name="validateSevices.dir">
- <available file="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services" type="dir" property="axis2.services"/>
+ <available file="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/services" type="dir" property="axis2.services"/>
</target>
<target name="validateDeploymentSettings" depends="validateTomcatHome" unless="validateSevices.dir">
- <mkdir dir="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services"/>
+ <mkdir dir="${env.CATALINA_HOME}/${axis.relativeserver.dir}/WEB-INF/services"/>
</target>
@@ -68,13 +69,16 @@
<mkdir dir="${build.dir}/${jardrop.dir}"/>
</target>
- <target name="compile" depends="createDir">
+ <target name="compile" depends="clean,createDir">
<javac srcdir="${src.dir}" destdir="${classes.dir}" >
<classpath refid="classpath.library"/>
</javac>
+ <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
+ <fileset dir="${classes.dir}"/>
+ </jar>
</target>
- <target name="jar" depends="clean,compile">
+ <target name="jar" depends="compile">
<jar destfile="${build.dir}/${jardrop.dir}/${ant.project.name}.jar">
<fileset dir="${classes.dir}">
@@ -85,9 +89,7 @@
<include name="META-INF/service.xml"/>
</fileset>
</jar>
- <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
- <fileset dir="${classes.dir}"/>
- </jar>
+
</target>
<target name="deploy" depends="jar,validateDeploymentSettings">