perfsonar development work

Author: mac
Date: 2007-03-13 10:28:23 -0400 (Tue, 13 Mar 2007)
New Revision: 2224

Removed:
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-axis-deploy-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-client-run-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-configure-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-exist-xmldb-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-java-compile-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-junit-test-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-libs-download-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-release-targets.xml
   branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-test-run-targets.xml
Modified:
   branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml
Log:
merging from trunk
still removing the same old files



Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml    2007-03-13 
14:24:01 UTC (rev 2223)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml    2007-03-13 
14:28:23 UTC (rev 2224)
@@ -88,7 +88,7 @@
         <echo>inside existing xml tag 'Host':</echo>
         <echo/>
        <echo>(You may copy XML part (without [echo]): </echo>
-        <echo message="    &lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;"/>
+        <echo>&lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;"</echo>
         <!-- echo message="        
docBase='${service.home}/${service.name}'&gt;"/ -->
         <!-- echo message="    &lt;/Context&gt;"/ -->
         <echo></echo>
@@ -119,11 +119,10 @@
         <echo>into Tomcat configuration file server.xml</echo>
         <echo>(${tomcat.home}/conf/server.xml)</echo>
         <echo>inside existing xml tag 'Host':</echo>
-        <echo></echo>
-        <echo message="${newline}    &lt;Context path='/${deploy.root}'"/>
-        <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
-        <echo message="    &lt;/Context&gt;"/>
-        <echo></echo>
+        <echo/>
+       <echo>(You may copy XML part (without [echo]): </echo>
+        <echo>&lt;Context path='/${deploy.root}' 
docBase='${service.home}/${service.name}'&gt; &lt;/Context&gt;"</echo>
+        <echo/>
         <echo>Please, do it now. I will wait for you.</echo>
         <input message="Press Return key ..."/>
 

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-axis-deploy-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-client-run-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-configure-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-exist-xmldb-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-java-compile-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-junit-test-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-libs-download-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-release-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/xmlls/xmlls-test-run-targets.xml