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/14 02:52:03 UTC

svn commit: r170114 - /incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src /incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src /incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src /incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src /incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex

Author: ekoneil
Date: Fri May 13 17:52:02 2005
New Revision: 170114

URL: http://svn.apache.org/viewcvs?rev=170114&view=rev
Log:
Fixup a couple of wsm issues related to the .jws > .java move from earlier today.

BB: self
DRT: Beehive pass / build.dist pass


Added:
    incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralWrappedSample.java   (with props)
Modified:
    incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
    incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
    incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml

Modified: incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml?rev=170114&r1=170113&r2=170114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml Fri May 13 17:52:02 2005
@@ -51,9 +51,9 @@
     <target name="war">
         <jar jarfile="../../../${webservice.war}">
             <fileset dir="${webapp.dir}">
-                <exclude name="${src.dir}/**"/>
-                <exclude name="${ws-src.dir}/**"/>
-                <exclude name="${gen.dir}/**"/>
+                <exclude name="WEB-INF/src/**"/>
+                <exclude name="WEB-INF/src-ws/**"/>
+                <exclude name="WEB-INF/gen/**"/>
             </fileset>
         </jar>
     </target>

Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml?rev=170114&r1=170113&r2=170114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml Fri May 13 17:52:02 2005
@@ -51,9 +51,9 @@
   <target name="war">
     <jar jarfile="../../../${webservice.war}">
       <fileset dir="${webapp.dir}">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${ws-src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
+        <exclude name="WEB-INF/src/**" />
+        <exclude name="WEB-INF/src-ws/**" />
+        <exclude name="WEB-INF/gen/**" />
       </fileset>
     </jar>
   </target>

Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml?rev=170114&r1=170113&r2=170114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml Fri May 13 17:52:02 2005
@@ -51,9 +51,9 @@
   <target name="war">
     <jar jarfile="../../../${webservice.war}">
       <fileset dir="${webapp.dir}">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${ws-src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
+        <exclude name="WEB-INF/src/**" />
+        <exclude name="WEB-INF/src-ws/**" />
+        <exclude name="WEB-INF/gen/**" />
       </fileset>
     </jar>
   </target>

Added: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralWrappedSample.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralWrappedSample.java?rev=170114&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralWrappedSample.java (added)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralWrappedSample.java Fri May 13 17:52:02 2005
@@ -0,0 +1,133 @@
+package web.complex;
+
+/*
+ * Copyright 2004, 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$Factory
+ */
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.beehive.sample.Address;
+import org.apache.beehive.sample.AddressHolder;
+import org.apache.beehive.sample.AddressException;
+import org.apache.beehive.sample.Phone;
+import org.apache.beehive.sample.StateType;
+
+/**
+ * This class illustrates the use of complex types with style/use "DOC/LITERAL" (wrapped).
+ */
+@WebService
+@SOAPBinding(
+    style=SOAPBinding.Style.DOCUMENT,
+    use=SOAPBinding.Use.LITERAL,
+    parameterStyle=SOAPBinding.ParameterStyle.WRAPPED
+)        
+public class DocumentLiteralWrappedSample {
+
+    /**
+     * Returns a complex (address) object that was passed in as IN parameter in the message body.
+     * @param address The complex object to be returned.
+     * @return The complex object that was passed in as an IN parameter.
+     */
+    @WebMethod
+    @WebResult(name="ReturnAddressFromBodyResult")
+    public Address returnAddressFromBody(@WebParam(name="in_param_body", mode=WebParam.Mode.IN) Address address) {
+        return address;
+    }
+
+    /**
+     * Returns a complex (address) object that was passed in as IN parameter in the message header.
+     * @param object The complex object to be modified.
+     * @return The complex object that was passed in as an IN parameter.
+     */
+    @WebMethod
+    @WebResult(name="ReturnAddressFromHeaderResult")
+    public Address returnAddressFromHeader(@WebParam(name="in_param_header", header=true, mode=WebParam.Mode.IN) Address address) {
+        return address;
+    }
+
+    /**
+     * Creates a new complex (address) object and returns that object as an OUT parameter that is encoded in the message body.
+     * @param addressHolder The holder of the complex object to be returned.
+     * @return An operational result (always 0).
+     */
+    @WebMethod
+    @WebResult(name="ReturnCreateAddressInBodyResult")
+    public int createAddressInBody(@WebParam(name="out_param_body", mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
+        StateType state = new StateType("WA");
+        Phone phoneNumber = new Phone(425, "555", "1234");
+        Address address = new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
+        addressHolder.value = address;
+        return 0;
+    }
+
+    /**
+     * Creates a new complex (address) object and returns that object as an OUT parameter that is encoded in the message header.
+     * @param addressHolder The holder of the complex object to be returned.
+     * @return An operational result (always 0).
+     */
+    @WebMethod
+    @WebResult(name="ReturnCreateAddressInHeaderResult")
+    public int createAddressInHeader(@WebParam(name="out_param_header", header=true, mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
+        StateType state = new StateType("WA");
+        Phone phoneNumber = new Phone(425, "555", "1234");
+        Address address = new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
+        addressHolder.value = address;
+        return 0;
+    }
+
+    /**
+     * Modifies a complex (address) INOUT parameter that is encoded in the message body.
+     * @param addressHolder The object to be modified.
+     * @return An operational result (always 0).
+     */
+    @WebMethod
+    @WebResult(name="ChangeAddressInBodyResult")
+    public int changeAddressInBody(@WebParam(name="inout_param_body", mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
+        Address address = addressHolder.value;
+        address.setZip(address.getZip() + 1);
+        return 0;
+    }
+
+    /**
+     * Modifies a complex (address) INOUT parameter that is encoded in the message header.
+     * @param addressHolder The object to be modified.
+     * @return An operational result (always 0).
+     */
+    @WebMethod
+    @WebResult(name="ChangeAddressInHeaderResult")
+    public int changeAddressInHeader(@WebParam(name="inout_param_header", header=true, mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
+        Address address = addressHolder.value;
+        address.setZip(address.getZip() + 1);
+        return 0;
+    }
+
+    /**
+     * Throws an AddressException.
+     * @param value Ignored (only printed in message).
+     * @return An operational result (never returned).
+     * @throws AddressException Always thrown.
+     */
+    @WebMethod
+    @WebResult(name="ThrowAddressExceptionResult")
+    public int throwAddressException(@WebParam(name="in_param") int value) throws AddressException {
+        throw new AddressException("This is a sample message for:\n\tAddressException; input value=\"" + value + "\"");
+    }
+}
\ No newline at end of file

Propchange: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralWrappedSample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml?rev=170114&r1=170113&r2=170114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml Fri May 13 17:52:02 2005
@@ -52,7 +52,7 @@
   <!-- ========================================= -->
   <!-- deploy - build deployable artifact        -->
   <!-- ========================================= -->
-  <target name="deploy">
+  <target name="deploy" depends="build">
     <antcall target="deploy.war" />
   </target>
 
@@ -62,9 +62,9 @@
   <target name="deploy.war">
     <jar jarfile="../../../${webservice.war}">
       <fileset dir="../..">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${ws-src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
+        <exclude name="WEB-INF/src/**" />
+        <exclude name="WEB-INF/src-ws/**" />
+        <exclude name="WEB-INF/gen/**" />
       </fileset>
     </jar>
   </target>