svn commit: r154335 - in incubator/beehive/trunk/samples/wsm-blank/WEB-INF: build-svn.xml src/web/Blank.jws

[mm...@apache.org]

Author: mmerz
Date: Fri Feb 18 10:46:26 2005
New Revision: 154335

URL: http://svn.apache.org/viewcvs?view=rev&rev=154335
Log:
Cleaned up sample/SVN build.

Modified:
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws

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=154334&r2=154335
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml Fri Feb 18 10:46:26 2005
@@ -25,13 +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="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <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="web.inf.dir" value="${webapp.dir}/WEB-INF" />
+  <property name="lib.dir" value="${web.inf.dir}/lib" />
+  <property name="src.dir" value="${web.inf.dir}/src" />
+  <property name="build.dir" value="${web.inf.dir}/build-server" />
+  <property name="attachments.dir" value="${web.inf.dir}/attachments" />
+  <property name="classes.dir" value="${web.inf.dir}/classes" />
+  <property name="gen.dir" value="${web.inf.dir}/.tmpbeansrc" />
   <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
   <property name="webservice.war" value="${service.name}WS.war" />
   
@@ -60,17 +60,19 @@
   <!-- ========================================= -->
   
   <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
+    <jar destfile="${to.dir}/${webservice.war}">
       <fileset dir="${webapp.dir}">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
+        <exclude name="WEB-INF/classes/**" />
+        <exclude name="WEB-INF/.tmpbeansrc/**" />
+        <exclude name="WEB-INF/src/**" />
+        <exclude name="**/*build*.xml" />
       </fileset>
     </jar>
   </target>
 
 
   <!-- ========================================= -->
-  <!-- build - build all binaries                -->
+  <!-- build - create jar in ${lib.dir}          -->
   <!-- ========================================= -->
 
   <target name="build" depends="dirs">
@@ -87,6 +89,7 @@
   <!-- ========================================= -->
 
   <target name="clean">
+    <delete dir="${attachments.dir}" />
     <delete dir="${build.dir}" />
     <delete file="velocity.log" />
     <clean-webapp webappDir="${webapp.dir}" />

Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws?view=diff&r1=154334&r2=154335
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws Fri Feb 18 10:46:26 2005
@@ -17,15 +17,13 @@
  */
 
 import javax.jws.WebMethod;
-import javax.jws.WebParam;
 import javax.jws.WebService;
 
 @WebService
-public class Blank
-{
+public class Blank {
+
     @WebMethod
-    public String sayHelloWorld(@WebParam(name="name",header=true) String s)
-    {
+    public String sayHelloWorld(String s) {
         return "Hello world, " + s + "!";
     }
 }