You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2004/12/15 21:12:48 UTC
svn commit: r112015 - /incubator/apollo/trunk/src/site/content/tutorial /incubator/apollo/trunk/src/site/content/tutorial/build.xml /incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml
Author: ips
Date: Wed Dec 15 12:12:47 2004
New Revision: 112015
URL: http://svn.apache.org/viewcvs?view=rev&rev=112015
Log:
Modified:
incubator/apollo/trunk/src/site/content/tutorial/ (props changed)
incubator/apollo/trunk/src/site/content/tutorial/build.xml
incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml
Modified: incubator/apollo/trunk/src/site/content/tutorial/build.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/build.xml?view=diff&rev=112015&p1=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r1=112014&p2=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r2=112015
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/build.xml Wed Dec 15 12:12:47 2004
@@ -9,7 +9,8 @@
<!-- workaround for those IDEs that dont set ant.home as per the ant script -->
<property name="ant.home" value="env.ANT_HOME"/>
- <property name="apollo.home" location="../.." />
+ <property name="dist.home" location="../.." />
+ <property name="dev.home" location="../../../.." />
<property name="generated.src.dir" location="build/src"/>
<property name="classes.dir" location="build/classes"/>
<property name="src.dir" location="src" />
@@ -19,16 +20,16 @@
<target name="init">
- <available file="${apollo.home}/webapps/wsrf" type="dir" property="internal.wsrf.webapp.dir" value="${apollo.home}/webapps/wsrf" />
- <available file="${apollo.home}/target/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="${apollo.home}/target/wsrf" />
- <condition property="wsrf.webapp.dir" value="${internal.wsrf.webapp.dir}">
- <isset property="internal.wsrf.webapp.dir"/>
- </condition>
+ <available file="${dist.home}/webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="${dist.home}/webapps/wsrf" />
<condition property="wsrf.webapp.dir" value="${dist.wsrf.webapp.dir}">
<isset property="dist.wsrf.webapp.dir"/>
+ </condition>
+ <available file="${dev.home}/target/wsrf" type="dir" property="dev.wsrf.webapp.dir" value="${dev.home}/target/wsrf" />
+ <condition property="wsrf.webapp.dir" value="${dev.wsrf.webapp.dir}">
+ <isset property="dev.wsrf.webapp.dir"/>
</condition>
- <fail unless="wsrf.webapp.dir" message="webapp dir ${apollo.home}/webapps/wsrf does not exist." />
+ <fail unless="wsrf.webapp.dir" message="webapp dir ${dist.home}/webapps/wsrf does not exist." />
<echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
<path id="apollo.classpath.id">
Modified: incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml?view=diff&rev=112015&p1=incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml&r1=112014&p2=incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml&r2=112015
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml Wed Dec 15 12:12:47 2004
@@ -9,20 +9,22 @@
<!-- workaround for those IDEs that dont set ant.home as per the ant script -->
<property name="ant.home" value="env.ANT_HOME"/>
- <property name="apollo.home" location=".." />
+ <property name="dist.home" location="../.." />
+ <property name="dev.home" location="../../../.." />
<target name="init">
-
- <available file="${apollo.home}/webapps/wsrf" type="dir" property="internal.wsrf.webapp.dir" value="${apollo.home}/webapps/wsrf" />
- <available file="${apollo.home}/target/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="${apollo.home}/target/wsrf" />
- <condition property="wsrf.webapp.dir" value="${internal.wsrf.webapp.dir}">
- <isset property="internal.wsrf.webapp.dir"/>
- </condition>
+
+ <available file="${dist.home}/webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="${dist.home}/webapps/wsrf" />
<condition property="wsrf.webapp.dir" value="${dist.wsrf.webapp.dir}">
<isset property="dist.wsrf.webapp.dir"/>
</condition>
- <fail unless="wsrf.webapp.dir" message="webapp dir ${apollo.home}/webapps/wsrf does not exist." />
+ <available file="${dev.home}/target/wsrf" type="dir" property="dev.wsrf.webapp.dir" value="${dev.home}/target/wsrf" />
+ <condition property="wsrf.webapp.dir" value="${dev.wsrf.webapp.dir}">
+ <isset property="dev.wsrf.webapp.dir"/>
+ </condition>
+ <fail unless="wsrf.webapp.dir" message="webapp dir ${dist.home}/webapps/wsrf does not exist." />
<echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
+
<path id="apollo.classpath.id">
<pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
<fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org