svn commit: r154221 - incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml

[mm...@apache.org]

Author: mmerz
Date: Thu Feb 17 17:06:06 2005
New Revision: 154221

URL: http://svn.apache.org/viewcvs?view=rev&rev=154221
Log:
Fixed dir-name (web-inf), created separate target for beehive/wsm deployment (deploy.beehive.webservice.runtime).
Todo: deploy.beehive.webservice.runtime and build.beehive.webservice need to be moved out into separate build/tool file.


Modified:
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml

Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml?view=diff&r1=154220&r2=154221
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml Thu Feb 17 17:06:06 2005
@@ -28,10 +28,10 @@
   <property name="webapp.dir" value=".." />
   <property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
   <property name="lib.dir" value="${web.inf.dir}/lib" />
-  <property name="log.dir" value="${web.inf.dir}/logs" />
   <property name="build.dir" value="${web.inf.dir}/build-client" />
-  <property name="gen.dir" value="${build.dir}/gen" />
   <property name="classes.dir" value="${build.dir}/classes" />
+  <property name="gen.dir" value="${build.dir}/gen" />
+  <property name="log.dir" value="${build.dir}/logs" />
       
   <path id="jars">
     <fileset dir="${lib.dir}">
@@ -57,7 +57,7 @@
     </junit>
   </target>
 	
-  <target name="compile" depends="genClient">
+  <target name="compile" depends="generate.client">
     <javac
         srcdir="${gen.dir}"
 	destdir="${classes.dir}"
@@ -66,7 +66,7 @@
  	source="1.4" />
   </target>	
 	
-  <target name="genClient" depends="dirs">
+  <target name="generate.client" depends="dirs">
     <deploy-wsm webappDir="${webapp.dir}" />
     <taskdef
         name="wsdl2java"
@@ -83,14 +83,13 @@
 	
   <target name="clean">
     <delete dir="${build.dir}" />
-    <delete dir="${log.dir}" />
-    <delete dir="${lib.dir}" />
   </target>
 	
   <target name="dirs">
+    <mkdir dir="${lib.dir}" />
     <mkdir dir="${build.dir}" />
-    <mkdir dir="${gen.dir}" />
     <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
     <mkdir dir="${log.dir}" />
   </target>	
 

Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml?view=diff&r1=154220&r2=154221
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml Thu Feb 17 17:06:06 2005
@@ -25,7 +25,7 @@
   <property name="service.name" value="blank" />
 
   <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" />

Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml?view=diff&r1=154220&r2=154221
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml Thu Feb 17 17:06:06 2005
@@ -25,12 +25,13 @@
   <property name="service.name" value="blank" />
   
   <property name="webapp.dir" location=".." />
-  <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="web.inf.dir" location="${webapp.dir}/WEB-INF" />
   <property name="lib.dir" location="${web.inf.dir}/lib" />
   <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="build.dir" location="${web.inf.dir}/build-server" />
+  <property name="attachments.dir" location="${build.dir}/attachments" />
+  <property name="classes.dir" location="${build.dir}/classes" />
+  <property name="gen.dir" location="${build.dir}/gen" />
   <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
   <property name="webservice.war" value="${service.name}WS.war" />
   
@@ -66,15 +67,15 @@
       </fileset>
     </jar>
   </target>
-  
+
 
   <!-- ========================================= -->
   <!-- build - build all binaries                -->
   <!-- ========================================= -->
 
   <target name="build" depends="dirs">
-    <deploy-wsm webappDir="${webapp.dir}" />
-    <build-webapp webappDir="${webapp.dir}" />
+    <antcall target="deploy.beehive.webservice.runtime" />
+    <antcall target="build.beehive.webservice" />
     <jar jarfile="${webservice.jar}">
       <fileset dir="${classes.dir}" />
     </jar>
@@ -86,8 +87,7 @@
   <!-- ========================================= -->
 
   <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${lib.dir}" />
+    <delete dir="${build.dir}" />
     <delete file="velocity.log" />
     <clean-webapp webappDir="${webapp.dir}" />
   </target>
@@ -98,8 +98,29 @@
   <!-- ========================================= -->
 
   <target name="dirs">
+    <mkdir dir="${lib.dir}" />
+    <mkdir dir="${build.dir}" />
     <mkdir dir="${attachments.dir}" />
     <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- deploy.beehive.webservice.runtime -       -->
+  <!-- ========================================= -->
+
+  <target name="deploy.beehive.webservice.runtime">
+    <deploy-wsm webappDir="${webapp.dir}" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- build.beehive.webservice -                -->
+  <!-- ========================================= -->
+
+  <target name="build.beehive.webservice">
+    <build-webapp webappDir="${webapp.dir}" />
   </target>
 
 </project>