Author: mmerz
Date: Thu Mar 3 15:19:57 2005
New Revision: 156101
URL: http://svn.apache.org/viewcvs?view=rev&rev=156101
Log:
- Upgrade to Axis 1.2RC3
New release candidate contains several bug fixes including fixes for message
handlers that are used by @SOAPMessageHandlers, @HandlerChain.
- Added Javadoc
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws
incubator/beehive/trunk/wsm/external/axis-ant.jar
incubator/beehive/trunk/wsm/external/axis.jar
incubator/beehive/trunk/wsm/external/jaxrpc.jar
incubator/beehive/trunk/wsm/external/saaj.jar
incubator/beehive/trunk/wsm/external/wsdl4j.jar
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ObjectModelStore.java
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java?view=diff&r1=156100&r2=156101
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
Thu Mar 3 15:19:57 2005
@@ -55,6 +55,7 @@
}
public void tearDown() {
+ // empty
}
public void testInvokeSOAPService() throws Exception {
@@ -80,4 +81,4 @@
assertEquals("true", n.getNodeValue());
}
}
-}
+}
\ No newline at end of file
Modified:
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws?view=diff&r1=156100&r2=156101
==============================================================================
---
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws
(original)
+++
incubator/beehive/trunk/wsm/drt/webapp/WEB-INF/src/org/apache/beehive/wsm/axis/FakeWebService.jws
Thu Mar 3 15:19:57 2005
@@ -1,3 +1,5 @@
+package org.apache.beehive.wsm.axis;
+
/*
* FakeWebService.java
*
@@ -17,7 +19,6 @@
* limitations under the License.
*
*/
-package org.apache.beehive.wsm.axis;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -34,22 +35,25 @@
*
* @author Jonathan Colwell
*/
[EMAIL PROTECTED](name = "FakeName",
- serviceName = "FakeServiceName",
- targetNamespace = "http://fake.target.namespace/";)
[EMAIL PROTECTED](
+ name = "FakeName",
+ serviceName = "FakeServiceName",
+ targetNamespace = "http://fake.target.namespace/";)
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class FakeWebService {
@WebMethod(action = "invocationAction")
- @WebResult(name = "invocationSucceeded",
- targetNamespace = "http://result.target.namespace/";)
- public boolean doInvocation() {
- return true;
+ @WebResult(
+ name = "invocationSucceeded",
+ targetNamespace = "http://result.target.namespace/";)
+ public String doInvocation() {
+ return "true";
}
@WebMethod(operationName = "processThingy")
@Oneway
- public void processModeratelyComplexObject(@WebParam(name = "thingy")
- ModeratelyComplexObject mco) {
+ public void processModeratelyComplexObject(@WebParam(name = "thingy")
ModeratelyComplexObject mco)
+ {
+ // empty
}
-}
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/wsm/external/axis-ant.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/external/axis-ant.jar?view=diff&r1=156100&r2=156101
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/wsm/external/axis.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/external/axis.jar?view=diff&r1=156100&r2=156101
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/wsm/external/jaxrpc.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/external/jaxrpc.jar?view=diff&r1=156100&r2=156101
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/wsm/external/saaj.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/external/saaj.jar?view=diff&r1=156100&r2=156101
==============================================================================
Binary files - no diff available.
Modified: incubator/beehive/trunk/wsm/external/wsdl4j.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/external/wsdl4j.jar?view=diff&r1=156100&r2=156101
==============================================================================
Binary files - no diff available.
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ObjectModelStore.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ObjectModelStore.java?view=diff&r1=156100&r2=156101
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ObjectModelStore.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181ObjectModelStore.java
Thu Mar 3 15:19:57 2005
@@ -48,6 +48,8 @@
/**
* Constructor.
+ * @param env A context that is required to access the filer.
+ * TODO needs to be abstracted further.
*/
public Jsr181ObjectModelStore(AnnotationProcessorEnvironment env) {
if (null == env) {
@@ -67,6 +69,8 @@
/**
* @param clazz
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
public static BeehiveWsTypeMetadata load(Class clazz)
throws IOException, ClassNotFoundException
@@ -78,6 +82,8 @@
/**
* @param is
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
public static BeehiveWsTypeMetadata load(InputStream is)
throws IOException, ClassNotFoundException
@@ -100,42 +106,11 @@
return objectModel;
}
-
-
- /**
- * @param os
- * @param objectModel
- public static void store(OutputStream os, BeehiveWsTypeMetadata
objectModel)
- throws IOException
- {
- ObjectOutputStream oos = null;
- try {
- if (null == os) {
- throw new IOException("cannot persist object model without
output stream");
- }
- if (null == objectModel) {
- throw new IOException("cannot persist empty object model ");
- }
- oos = new ObjectOutputStream(os);
- oos.writeObject(objectModel);
-
- if (! isMarked) {
-
- isMarked = true;
- }
- }
- finally {
- if (null != oos) {
- oos.flush();
- oos.close();
- }
- }
- }
- */
/**
- * @param os
- * @param objectModel
+ * Persists a given <code>objectModel</code>.
+ * @param objectModel The object mode to be persisted.
+ * @throws IOException If the object model cannot be persisted.
*/
public void store(BeehiveWsTypeMetadata objectModel)
throws IOException
@@ -153,7 +128,7 @@
oos.writeObject(objectModel);
if (! isMarked) {
- env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE, "",
new java.io.File(".webservices"));
+ env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE, "",
new java.io.File(LOCATOR));
isMarked = true;
}
}
@@ -164,9 +139,19 @@
}
}
}
-
- public static Class loadWebServiceClass(String className) throws
ClassNotFoundException {
+ /**
+ * Tries to find the class with a given <code>className</code>. If
+ * <code>className</code> is a simple name, the method tries to find a
+ * matching fully qualified class name. The respective class is then
+ * loaded and returned.
+ * @param className A class name; may be a fully qualified or a simple
class
+ * name.
+ * @return A class with a matching name.
+ */
+ public static Class loadWebServiceClass(String className)
+ throws ClassNotFoundException
+ {
Class clazz = null;
ClassLoader cl = Jsr181ObjectModelStore.class.getClassLoader();
@@ -188,8 +173,21 @@
return clazz;
}
- private static String getFullyQualifiedClassName(final File wsDirectory,
final String simpleName) throws ClassNotFoundException {
-
+ /**
+ * Implements the algorithm for finding a class given a <code>simpleName
+ * </code>: searches the directory used for persisting object models for
+ * matching names.
+ * TODO currently returns the first match; would an exception be the better
+ * approach?
+ * @param wsDirectory The directory to be searched.
+ * @param simpleName A simple name for the class.
+ * @return The fully qualified class name if it can be found.
+ * @throws ClassNotFoundException If a matching fully qualified class name
+ * cannot be found.
+ */
+ private static String getFullyQualifiedClassName(final File wsDirectory,
final String simpleName)
+ throws ClassNotFoundException
+ {
FilenameFilter filenameFilter = new FilenameFilter() {
public boolean accept(File dir, String name) {
return (wsDirectory.equals(dir) && (name.endsWith(simpleName +
EXTENSION)));
