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 sc...@apache.org on 2004/12/22 22:24:47 UTC
svn commit: r123140 - /incubator/apollo/trunk/src/site/content/tutorial/build.xml /incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml
Author: scamp
Date: Wed Dec 22 13:24:45 2004
New Revision: 123140
URL: http://svn.apache.org/viewcvs?view=rev&rev=123140
Log:
removed stuff for running from within our dev structure due to possible Ant bug and relative paths which don't exist causing Ant to barf
Modified:
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=123140&p1=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r1=123139&p2=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r2=123140
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/build.xml Wed Dec 22 13:24:45 2004
@@ -8,9 +8,7 @@
<!-- workaround for those IDEs that dont set ant.home as per the ant script -->
<property name="ant.home" value="env.ANT_HOME"/>
-
- <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" />
@@ -21,16 +19,13 @@
<target name="init">
- <available file="${dist.home}/webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="${dist.home}/webapps/wsrf" />
+ <available file="../../webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="../../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 ${dist.home}/webapps/wsrf does not exist." />
+
+ <fail unless="wsrf.webapp.dir" message="webapp dir ../../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=123140&p1=incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml&r1=123139&p2=incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml&r2=123140
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/soapclient.xml Wed Dec 22 13:24:45 2004
@@ -8,21 +8,15 @@
<!-- workaround for those IDEs that dont set ant.home as per the ant script -->
<property name="ant.home" value="env.ANT_HOME"/>
-
- <property name="dist.home" location="../.." />
- <property name="dev.home" location="../../../.." />
+
<target name="init">
- <available file="${dist.home}/webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="${dist.home}/webapps/wsrf" />
+ <available file="../../webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="../../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 ${dist.home}/webapps/wsrf does not exist." />
+ </condition>
+ <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." />
<echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
<path id="apollo.classpath.id">
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org