You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/12 16:47:03 UTC
svn commit: r169829 - /incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml /incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml

Author: ekoneil
Date: Thu May 12 07:47:02 2005
New Revision: 169829

URL: http://svn.apache.org/viewcvs?rev=169829&view=rev
Log:
Fixup two WSM samples builds that used "web-inf" instead of "WEB-INF".  

Failed the build on Linux.

BB: self
DRT: none


Modified:
    incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml

Modified: incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml?rev=169829&r1=169828&r2=169829&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml Thu May 12 07:47:02 2005
@@ -25,25 +25,20 @@
   <property name="service.name" value="EnhancedAddressBook" />
   
   <property name="webapp.dir" location="../.." />
-  <property name="web.inf.dir" location="${webapp.dir}/web-inf" />
+  <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
   <property name="attachments.dir" location="${web.inf.dir}/attachments" />
   <property name="classes.dir" location="${web.inf.dir}/classes" />
   <property name="gen.dir" location="${web.inf.dir}/gen" />
   <property name="lib.dir" location="${web.inf.dir}/lib" />
   <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
-  <property name="webservice.war" value="${service.name}WS.war" />
+  <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" />
+  <property name="webservice.war" location="${service.name}WS.war" />
   
-  <condition property="isJDK15">
-    <equals arg1="${ant.java.version}" arg2="1.5" />
-  </condition>
-
   <path id="jars">
     <fileset dir="${lib.dir}" >
       <include name="**/*.jar" />
     </fileset>
   </path>
-
   
   <!-- ========================================= -->
   <!-- deploy - build deployable artifact        -->
@@ -66,7 +61,6 @@
       </fileset>
     </jar>
   </target>
-  
 
   <!-- ========================================= -->
   <!-- build - build all binaries                -->
@@ -79,7 +73,6 @@
       <fileset dir="${classes.dir}" />
     </jar>
   </target>
-
   
   <!-- ========================================= -->
   <!-- clean - remove binary files               -->

Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml?rev=169829&r1=169828&r2=169829&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml Thu May 12 07:47:02 2005
@@ -28,14 +28,14 @@
   <property name="service.name" value="Employee" />
 
   <property name="webapp.dir" location="../.." />
-  <property name="web.inf.dir" location="${webapp.dir}/web-inf" />
+  <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
   <property name="attachments.dir" location="${web.inf.dir}/attachments" />
   <property name="classes.dir" location="${web.inf.dir}/classes" />
   <property name="gen.dir" location="${web.inf.dir}/gen" />
   <property name="lib.dir" location="${web.inf.dir}/lib" />
   <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/EmployeeWS.jar" />
-  <property name="webservice.war" value="EmployeeWS.war" />
+  <property name="webservice.jar" location="${lib.dir}/EmployeeWS.jar" />
+  <property name="webservice.war" location="EmployeeWS.war" />
 
   <path id="lib.path">
     <fileset dir="${lib.dir}">