You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by di...@apache.org on 2004/10/29 22:13:20 UTC
svn commit: rev 55992 - in incubator/beehive/trunk/wsm: . drt drt/tests drt/tests/org/apache/beehive/wsm/axis drt/tests/org/apache/beehive/wsm/jsr181/model drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations drt/tests/org/apache/beehive/wsm/jsr181/processor/apt drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection drt/tests/org/apache/beehive/wsm/jsr181/wsdl samples/dropInDeployment/AddressBook samples/dropInDeployment/AddressBook/client samples/dropInDeployment/AddressBook/server samples/dropInDeployment/AddressBook/server/src/org/beehive/demo samples/dropInDeployment/AddressBook/server/tests/org/beehive/demo samples/dropInDeployment/AddressBook/server/web src/api/javax/jws src/api/javax/jws/security src/api/javax/jws/soap src/runtime/org/apache/beehive/wsm/axis src/runtime/org/apache/beehive/wsm/axis/util src/runtime/org/apache/beehive/wsm/axis/util/encoding src/runtime/org/apache/beehive/wsm/jsr181/model src/runtime/org/apache/beehive/wsm/jsr181/processor src/runtime/org/apache/beehive/wsm/jsr181/processor/apt src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection src/runtime/org/apache/beehive/wsm/jsr181/wsdl test/webapps/AnnotatedAxis test/webapps/AnnotatedAxis/WEB-INF test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment
Author: dims
Date: Fri Oct 29 13:13:18 2004
New Revision: 55992
Modified:
incubator/beehive/trunk/wsm/build.xml
incubator/beehive/trunk/wsm/drt/build.xml
incubator/beehive/trunk/wsm/drt/tests/Bar.java
incubator/beehive/trunk/wsm/drt/tests/Bar2.java
incubator/beehive/trunk/wsm/drt/tests/Bar3.java
incubator/beehive/trunk/wsm/drt/tests/Cheetorama.java
incubator/beehive/trunk/wsm/drt/tests/Foo.java
incubator/beehive/trunk/wsm/drt/tests/FooWSDL.xml
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeHandlerChainAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeInitParamAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeOneWayAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPBindingAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlerAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlersAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityIdentityAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityRoleAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebMethodAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebResultAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebServiceAnnotation.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/handlerChainConfig.xml
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/build.xml
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/readme.html
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Address.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBook.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookImpl.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookService.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Phone.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/StateType.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/tests/org/beehive/demo/AddressBookTest.java
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/web/AddressBookWebService.jws
incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java
incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityIdentity.java
incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityRoles.java
incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java
incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java
incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java
incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/JavaArchiveFilter.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InvalidFileType.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/Foo.jws
incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Bar.java
incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Foo.java
incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/server-config.wsdd
incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/web.xml
incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/index.html
Log:
Code reformatting ONLY (javadoc's still need work)
Modified: incubator/beehive/trunk/wsm/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Fri Oct 29 13:13:18 2004
@@ -232,12 +232,12 @@
<copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
<fileset dir="${jars.dir}" includes="**/*.jar"/>
</copy>
- <copy file="${controls.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib" />
- <copy file="${velocity14.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib" />
- <copy file="${velocitydep14.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib" />
+ <copy file="${controls.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
+ <copy file="${velocity14.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
+ <copy file="${velocitydep14.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
<copy file="${log4j.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
<copy file="${xbean.jar}" todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
- <echo message="--------------------------------------------------"/>
+ <echo message="--------------------------------------------------"/>
<echo message="| WSM deploy ending |"/>
<echo message="--------------------------------------------------"/>
</target>
@@ -264,7 +264,7 @@
<!-- ==================================================================== -->
<target name="docs" if="isJDKOver5">
<javadoc destdir="${docs.dir}/reference/classref_wsm" maxmemory="256M" windowtitle="WSM Documentation" doctitle="Web Services Metadata" version="true" author="false" use="true" additionalparam="-breakiterator -noqualifier all -notimestamp " useexternalfile="true" classpathref="axis.classpath">
- <packageset dir="${api.dir}" defaultexcludes="yes" />
+ <packageset dir="${api.dir}" defaultexcludes="yes"/>
<packageset dir="${runtime.dir}" defaultexcludes="yes"/>
</javadoc>
<fixcrlf srcDir="${docs.dir}/reference/classref_wsm" includes="**/*.html"/>
Modified: incubator/beehive/trunk/wsm/drt/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Fri Oct 29 13:13:18 2004
@@ -1,7 +1,5 @@
<?xml version="1.0" ?>
-
<project name="wsmdrt" default="usage">
-
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
@@ -14,13 +12,12 @@
<property name="build.tests" location="${build.dir}/classes/tests"/>
<property name="build.jars" location="${build.dir}/jars"/>
<property name="drt.logs" location="${test.root}/logs"/>
- <condition property="drt.os" value="windows" >
- <os family="windows" />
+ <condition property="drt.os" value="windows">
+ <os family="windows"/>
</condition>
- <condition property="drt.os" value="unix" >
- <os family="unix" />
+ <condition property="drt.os" value="unix">
+ <os family="unix"/>
</condition>
-
<property name="lib.dir" value="../lib"/>
<property name="ext.lib.dir" value="../external"/>
@@ -41,8 +38,6 @@
<echo message="build - build the junit classes."/>
<echo message="----------------------------------------------------------------"/>
</target>
-
-
<fileset id="axis.jars" dir="${ext.lib.dir}">
<include name="wsdl4j.jar"/>
<include name="saaj.jar"/>
@@ -52,12 +47,11 @@
<include name="axis-ant.jar"/>
<include name="axis.jar"/>
</fileset>
-
<path id="drt.classpath">
<pathelement location="${junit.jar}"/>
<pathelement location="${tools.jar}"/>
- <pathelement location="${xbean.jar}" />
- <pathelement location="${jsr173.jar}" />
+ <pathelement location="${xbean.jar}"/>
+ <pathelement location="${jsr173.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${lib.dir}/wsdltypes.jar"/>
<pathelement location="${lib.dir}/schematypes.jar"/>
@@ -65,26 +59,22 @@
<pathelement location="../build/jars/wsm-axis.jar"/>
<fileset refid="axis.jars"/>
</path>
-
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${drt.logs}"/>
<delete>
- <fileset dir="${tests.src}" includes="*.class" />
+ <fileset dir="${tests.src}" includes="*.class"/>
</delete>
</target>
-
<target name="dirs">
- <mkdir dir="${build.classes}" />
- <mkdir dir="${build.tests}" />
- <mkdir dir="${build.jars}" />
- <mkdir dir="${drt.logs}" />
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.tests}"/>
+ <mkdir dir="${build.jars}"/>
+ <mkdir dir="${drt.logs}"/>
</target>
-
<target name="build" depends="dirs">
- <ant target="build-tests" />
+ <ant target="build-tests"/>
</target>
-
<target name="build-tests" depends="dirs">
<!-- Build the test source directory -->
<javac srcdir="${tests.src}"
@@ -95,22 +85,21 @@
verbose="false"
failonerror="true"
/>
- <copy todir="${build.tests}" >
- <fileset dir="${tests.src}" includes="**/*.xml" />
+ <copy todir="${build.tests}">
+ <fileset dir="${tests.src}" includes="**/*.xml"/>
</copy>
</target>
-
<target name="run-drt">
- <echo message="** junit logfiles written to ${drt.logs} **" />
+ <echo message="** junit logfiles written to ${drt.logs} **"/>
<junit failureproperty="wsmdrtfailed" printsummary="on" tempdir="${build.dir}" fork="yes">
<classpath>
- <pathelement location= "${build.tests}"/>
+ <pathelement location="${build.tests}"/>
<path refid="drt.classpath"/>
</classpath>
- <formatter type="plain" />
- <batchtest filtertrace="off" todir="${drt.logs}" >
+ <formatter type="plain"/>
+ <batchtest filtertrace="off" todir="${drt.logs}">
<fileset dir="tests">
- <include name="**/*Test.java" />
+ <include name="**/*Test.java"/>
<!-- exclude name="**/util/**.class" / -->
<!-- exclude name="**/AllTests.class" / -->
</fileset>
@@ -118,19 +107,15 @@
</junit>
<fail if="wsmdrtfailed">One or more tests in the WSM DRT failed.</fail>
</target>
-
- <target name="drt" >
- <echo message="--------------------------------------------------" />
- <echo message="| WSM drt starting |" />
- <echo message="--------------------------------------------------" />
-
- <antcall target="clean" />
- <antcall target="build-tests" />
- <antcall target="run-drt" />
-
- <echo message="--------------------------------------------------" />
- <echo message="| WSM drt ending |" />
- <echo message="--------------------------------------------------" />
+ <target name="drt">
+ <echo message="--------------------------------------------------"/>
+ <echo message="| WSM drt starting |"/>
+ <echo message="--------------------------------------------------"/>
+ <antcall target="clean"/>
+ <antcall target="build-tests"/>
+ <antcall target="run-drt"/>
+ <echo message="--------------------------------------------------"/>
+ <echo message="| WSM drt ending |"/>
+ <echo message="--------------------------------------------------"/>
</target>
-
</project>
Modified: incubator/beehive/trunk/wsm/drt/tests/Bar.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Bar.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/Bar.java Fri Oct 29 13:13:18 2004
@@ -16,26 +16,22 @@
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@WebService(serviceName = "Bar1Service", endpointInterface = "Cheetorama")
-public class Bar
-{
- public boolean getNutty(int level, String detail)
- {
+public class Bar {
+ public boolean getNutty(int level, String detail) {
return (level > 5);
}
- public void goHome(long time)
- {
+ public void goHome(long time) {
return;
}
- public int dropMoney(int amount)
- {
+ public int dropMoney(int amount) {
return amount;
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/Bar2.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Bar2.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/Bar2.java Fri Oct 29 13:13:18 2004
@@ -17,26 +17,21 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
* This class is for a failure test case.
- *
* this class doesn't implement the dropMoney method in
* the endpoint interface (cheetorama).
- *
*/
@WebService(serviceName = "Bar2Service", endpointInterface = "Cheetorama")
-public class Bar2
-{
+public class Bar2 {
@WebMethod
- public boolean getNutty(int level, String detail)
- {
+ public boolean getNutty(int level, String detail) {
return (level > 5);
}
@WebMethod
- public void goHome(long time)
- {
+ public void goHome(long time) {
return;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/Bar3.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Bar3.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/Bar3.java Fri Oct 29 13:13:18 2004
@@ -17,30 +17,25 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
* Although this class implements the dropMoney method in
* the endpoint interface (cheetorama), the method is not
* annotated with @WebMethod.
- *
*/
@WebService(serviceName = "Bar3Service", endpointInterface = "Cheetorama")
-public class Bar3
-{
+public class Bar3 {
@WebMethod
- public boolean getNutty(int level, String detail)
- {
+ public boolean getNutty(int level, String detail) {
return (level > 5);
}
@WebMethod
- public void goHome(long time)
- {
+ public void goHome(long time) {
return;
}
- public int dropMoney(int amount)
- {
+ public int dropMoney(int amount) {
return amount;
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/Cheetorama.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Cheetorama.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/Cheetorama.java Fri Oct 29 13:13:18 2004
@@ -20,27 +20,24 @@
* limitations under the License.
*/
-
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-/*******************************************************************************
- *
- *
+/**
+ * ****************************************************************************
*/
-@WebService(name="Abacus", targetNamespace = "http://www.superflaco.com/AnnotationEndpointInterfaceTest")
-public interface Cheetorama
-{
- @WebMethod(operationName = "GoLocoCheetorama", action="LocoActionCheetorama")
+@WebService(name = "Abacus", targetNamespace = "http://www.superflaco.com/AnnotationEndpointInterfaceTest")
+public interface Cheetorama {
+ @WebMethod(operationName = "GoLocoCheetorama", action = "LocoActionCheetorama")
@WebResult
- public boolean getNutty(@WebParam int level, @WebParam(name="detailCheetorama") String detail);
+ public boolean getNutty(@WebParam int level, @WebParam(name = "detailCheetorama") String detail);
@WebMethod
@Oneway
- public void goHome(@WebParam(name="whenCheetorama") long time);
-
+ public void goHome(@WebParam(name = "whenCheetorama") long time);
+
public int dropMoney(int amount);
}
Modified: incubator/beehive/trunk/wsm/drt/tests/Foo.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Foo.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/Foo.java Fri Oct 29 13:13:18 2004
@@ -14,32 +14,28 @@
* limitations under the License.
*/
-
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@WebService(name = "Abacus", targetNamespace = "http://www.superflaco.com/AnnotationTest")
-public class Foo
-{
- @WebMethod(operationName = "GoLoco", action="LocoAction")
+public class Foo {
+ @WebMethod(operationName = "GoLoco", action = "LocoAction")
@WebResult
- public boolean getNutty(@WebParam int level, @WebParam(name="detail") String detail)
- {
+ public boolean getNutty(@WebParam int level, @WebParam(name = "detail") String detail) {
return (level > 5);
}
@WebMethod
@Oneway
- public void goHome(@WebParam(name="when") long time)
- {
+ public void goHome(@WebParam(name = "when") long time) {
return;
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/FooWSDL.xml
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/FooWSDL.xml (original)
+++ incubator/beehive/trunk/wsm/drt/tests/FooWSDL.xml Fri Oct 29 13:13:18 2004
@@ -1,102 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions targetNamespace="http://www.superflaco.com/AnnotationTest" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://www.superflaco.com/AnnotationTest" xmlns:intf="http://www.superflaco.com/AnnotationTest" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.2beta3
-Built on Aug 15, 2004 (04:32:00 PDT)-->
-
- <wsdl:message name="goHomeResponse">
-
- <wsdl:part name="howdy" type="soapenc:string"/>
-
- </wsdl:message>
-
- <wsdl:message name="goHomeRequest">
-
- </wsdl:message>
-
- <wsdl:message name="GoLocoResponse">
-
- <wsdl:part name="result" type="xsd:boolean"/>
-
- </wsdl:message>
-
- <wsdl:message name="GoLocoRequest">
-
- <wsdl:part name="in0" type="xsd:int"/>
-
- <wsdl:part name="detail" type="soapenc:string"/>
-
- </wsdl:message>
-
- <wsdl:portType name="Abacus">
-
- <wsdl:operation name="GoLoco" parameterOrder="in0 detail">
-
- <wsdl:input message="impl:GoLocoRequest" name="GoLocoRequest"/>
-
- <wsdl:output message="impl:GoLocoResponse" name="GoLocoResponse"/>
-
- </wsdl:operation>
-
- <wsdl:operation name="goHome">
-
- <wsdl:input message="impl:goHomeRequest" name="goHomeRequest"/>
-
- <wsdl:output message="impl:goHomeResponse" name="goHomeResponse"/>
-
- </wsdl:operation>
-
- </wsdl:portType>
-
- <wsdl:binding name="FooSoapBinding" type="impl:Abacus">
-
- <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="GoLoco">
-
- <wsdlsoap:operation soapAction="LocoAction"/>
-
- <wsdl:input name="GoLocoRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="GoLocoResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- <wsdl:operation name="goHome">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="goHomeRequest">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
-
- </wsdl:input>
-
- <wsdl:output name="goHomeResponse">
-
- <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="Cheetorama">
-
- <wsdl:port binding="impl:FooSoapBinding" name="Foo">
-
- <wsdlsoap:address location="http://localhost:8080/AnnotatedAxis/Foo.jws"/>
-
- </wsdl:port>
-
- </wsdl:service>
-
+ <!--WSDL created by Apache Axis version: 1.2beta3
+ Built on Aug 15, 2004 (04:32:00 PDT)-->
+ <wsdl:message name="goHomeResponse">
+ <wsdl:part name="howdy" type="soapenc:string"/>
+ </wsdl:message>
+ <wsdl:message name="goHomeRequest">
+
+ </wsdl:message>
+ <wsdl:message name="GoLocoResponse">
+ <wsdl:part name="result" type="xsd:boolean"/>
+ </wsdl:message>
+ <wsdl:message name="GoLocoRequest">
+ <wsdl:part name="in0" type="xsd:int"/>
+ <wsdl:part name="detail" type="soapenc:string"/>
+ </wsdl:message>
+ <wsdl:portType name="Abacus">
+ <wsdl:operation name="GoLoco" parameterOrder="in0 detail">
+ <wsdl:input message="impl:GoLocoRequest" name="GoLocoRequest"/>
+ <wsdl:output message="impl:GoLocoResponse" name="GoLocoResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="goHome">
+ <wsdl:input message="impl:goHomeRequest" name="goHomeRequest"/>
+ <wsdl:output message="impl:goHomeResponse" name="goHomeResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="FooSoapBinding" type="impl:Abacus">
+ <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="GoLoco">
+ <wsdlsoap:operation soapAction="LocoAction"/>
+ <wsdl:input name="GoLocoRequest">
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
+ </wsdl:input>
+ <wsdl:output name="GoLocoResponse">
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="goHome">
+ <wsdlsoap:operation soapAction=""/>
+ <wsdl:input name="goHomeRequest">
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
+ </wsdl:input>
+ <wsdl:output name="goHomeResponse">
+ <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.superflaco.com/AnnotationTest" use="encoded"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="Cheetorama">
+ <wsdl:port binding="impl:FooSoapBinding" name="Foo">
+ <wsdlsoap:address location="http://localhost:8080/AnnotatedAxis/Foo.jws"/>
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java Fri Oct 29 13:13:18 2004
@@ -34,14 +34,13 @@
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
public class AxisHookTest extends TestCase {
-
public static final Class WS_CLASS = FakeWebService.class;
public static final String WM_JAVAMETHODNAME = "fakeWebMethod";
public static final String WM_JAVAONEWAYMETHODNAME = "fakeOneWayWebMethod";
@@ -55,37 +54,29 @@
public static final String WM_TWOWAYPARAM = "number";
public static final String WM_ONEWAYPARAM = "text";
-
ServiceDesc sd;
public void setUp() throws Exception {
-
WebServiceTYPEMetadata wsm = makeFakeMetadata();
- sd = AxisHook.createServiceDesc(wsm, null);
+ sd = AxisHook.createServiceDesc(wsm, null);
}
-
+
public void tearDown() {
}
- public void testName() throws Exception
- {
+ public void testName() throws Exception {
assertEquals(WS_NAME, sd.getName());
}
-
- public void testNamespace() throws Exception
- {
+ public void testNamespace() throws Exception {
assertEquals(WS_NAMESPACE, sd.getDefaultNamespace());
}
-
- public void testUse() throws Exception
- {
+ public void testUse() throws Exception {
assertEquals(Use.LITERAL, sd.getUse());
}
- public void testStyle() throws Exception
- {
+ public void testStyle() throws Exception {
/*
* NOTE jcolwell@bea.com 2004-Sep-13 --
* in AXIS, WRAPPED is considered a Style and overrides DOCUMENT
@@ -95,9 +86,7 @@
assertEquals(Style.WRAPPED, sd.getStyle());
}
-
- public void testTwoWayOperation() throws Exception
- {
+ public void testTwoWayOperation() throws Exception {
OperationDesc twoWayOp = sd.getOperationByName(WM_OPERATION);
assertNotNull(twoWayOp);
if (twoWayOp != null) {
@@ -114,9 +103,8 @@
}
}
}
-
- public void testOneWayOperation() throws Exception
- {
+
+ public void testOneWayOperation() throws Exception {
OperationDesc oneWayOp = sd.getOperationByName(WM_ONEWAY + WM_OPERATION);
assertNotNull(oneWayOp);
if (oneWayOp != null) {
@@ -133,11 +121,10 @@
}
}
}
-
- protected WebServiceTYPEMetadata makeFakeMetadata()
- {
+
+ protected WebServiceTYPEMetadata makeFakeMetadata() {
WebServiceTYPEMetadata wstm =
- new WebServiceTYPEMetadata(WS_CLASS.getName());
+ new WebServiceTYPEMetadata(WS_CLASS.getName());
wstm.setWsName(WS_NAME);
/*
* NOTE jcolwell@bea.com 2004-Sep-13 --
@@ -148,48 +135,39 @@
wstm.setSoapBinding(makeFakeSoapBinding());
wstm.addMethod(makeFakeMethod());
wstm.addMethod(makeFakeOnewayMethod());
-
return wstm;
}
- protected WebServiceMETHODMetadata makeFakeOnewayMethod()
- {
- WebServiceMETHODMetadata wsmm =
- new WebServiceMETHODMetadata(WM_JAVAONEWAYMETHODNAME, Void.TYPE);
+ protected WebServiceMETHODMetadata makeFakeOnewayMethod() {
+ WebServiceMETHODMetadata wsmm =
+ new WebServiceMETHODMetadata(WM_JAVAONEWAYMETHODNAME, Void.TYPE);
wsmm.setWmOperationName(WM_ONEWAY + WM_OPERATION);
wsmm.setWmAction(WM_ONEWAY + WM_ACTION);
wsmm.setOneWay(true);
-
WebServicePARAMETERMetadata wspm = new WebServicePARAMETERMetadata();
wspm.setJavaType(String.class);
wspm.setWpName(WM_ONEWAYPARAM);
wspm.setWpMode(WebParam.Mode.IN);
wsmm.addParam(wspm);
-
return wsmm;
}
-
- protected WebServiceMETHODMetadata makeFakeMethod()
- {
+ protected WebServiceMETHODMetadata makeFakeMethod() {
WebServiceMETHODMetadata wsmm =
- new WebServiceMETHODMetadata(WM_JAVAMETHODNAME, String.class);
+ new WebServiceMETHODMetadata(WM_JAVAMETHODNAME, String.class);
wsmm.setWmOperationName(WM_OPERATION);
wsmm.setWmAction(WM_ACTION);
wsmm.setWrName(WM_RESULT);
wsmm.setOneWay(false);
-
WebServicePARAMETERMetadata wspm = new WebServicePARAMETERMetadata();
wspm.setJavaType(Integer.TYPE);
wspm.setWpName(WM_TWOWAYPARAM);
wspm.setWpMode(WebParam.Mode.INOUT);
wsmm.addParam(wspm);
-
return wsmm;
}
- protected SOAPBindingInfo makeFakeSoapBinding()
- {
+ protected SOAPBindingInfo makeFakeSoapBinding() {
SOAPBindingInfo sbi = new SOAPBindingInfo();
sbi.setStyle(SOAPBinding.Style.DOCUMENT);
sbi.setUse(SOAPBinding.Use.LITERAL);
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java Fri Oct 29 13:13:18 2004
@@ -36,10 +36,10 @@
import org.xmlsoap.schemas.wsdl.soap.TOperation;
import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
-
-/*******************************************************************************
- * NOTE jcolwell@bea.com 2004-Sep-21 --
- * The FakeWebService and this class should be expanded to test most of the
+/**
+ * ****************************************************************************
+ * NOTE jcolwell@bea.com 2004-Sep-21 --
+ * The FakeWebService and this class should be expanded to test most of the
* JSR-181 annotations.
*
* @author Jonathan Colwell
@@ -49,31 +49,25 @@
SOAPService fakeSOAPService;
public void setUp() throws Exception {
-
DropInDeploymentHandler didh = new DropInDeploymentHandler();
-
fakeSOAPService = didh
- .createSOAPServiceFromAnnotatedClass(FakeWebService.class);
-
+ .createSOAPServiceFromAnnotatedClass(FakeWebService.class);
}
-
+
public void tearDown() {
}
-
-
/*
* FIXME jcolwell@bea.com 2004-Sep-21 --
* examine the generated WSDL to see that it matches the settings in
* FakeWebService. For the moment, just having at least one
* operation and the correct name is sufficient.
*/
- public void testGenerateWSDL() throws Exception
- {
+ public void testGenerateWSDL() throws Exception {
MessageContext mc = new MessageContext(null);
mc.setService(fakeSOAPService);
fakeSOAPService.generateWSDL(mc);
- Node doc = (Node)mc.getProperty("WSDL");
+ Node doc = (Node) mc.getProperty("WSDL");
assertNotNull(doc);
if (doc != null) {
DefinitionsDocument defDoc = DefinitionsDocument.Factory.parse(doc);
@@ -83,34 +77,28 @@
assertNotNull(tDefs);
if (tDefs != null) {
assertEquals("http://fake.target.namespace/",
- tDefs.getTargetNamespace());
+ tDefs.getTargetNamespace());
TService tSrv = tDefs.getServiceArray(0);
assertNotNull(tSrv);
if (tSrv != null) {
assertEquals("FakeServiceName", tSrv.getName());
-
}
TBinding tBind = tDefs.getBindingArray(0);
assertNotNull(tBind);
if (tBind != null) {
-
org.xmlsoap.schemas.wsdl.soap.TBinding[] tSoapBinding =
- WSDLProcessor.getSOAPBinding(tBind);
-
+ WSDLProcessor.getSOAPBinding(tBind);
assertEquals(TStyleChoice.RPC, tSoapBinding[0]
- .getStyle());
-
+ .getStyle());
TBindingOperation[] tBops = tBind.getOperationArray();
assertTrue(tBind.sizeOfOperationArray() == 2);
-
assertEquals("doInvocation", tBops[0].getName());
assertNotNull(tBops[0].getOutput());
TOperation[] soapOps = WSDLProcessor
- .getSOAPOperations(tBops[0]);
+ .getSOAPOperations(tBops[0]);
assertTrue(soapOps.length > 0);
assertEquals("invocationAction",
- soapOps[0].getSoapAction());
-
+ soapOps[0].getSoapAction());
assertEquals("processThingy", tBops[1].getName());
assertNull(tBops[1].getOutput());
}
@@ -119,9 +107,7 @@
}
}
-
- public void testInvokeSOAPService() throws Exception
- {
+ public void testInvokeSOAPService() throws Exception {
MessageContext mc = new MessageContext(new AxisServer());
SOAPEnvelope env = new SOAPEnvelope();
env.addBodyElement(new RPCElement("doInvocation"));
@@ -133,7 +119,7 @@
assertNotNull(msg);
if (msg != null) {
Node n = msg.getSOAPBody().getFirstChild();
- System.out.println(n);
+ System.out.println(n);
assertEquals("doInvocationResponse", n.getLocalName());
n = n.getFirstChild();
assertEquals("invocationSucceeded", n.getLocalName());
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java Fri Oct 29 13:13:18 2004
@@ -26,32 +26,30 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-
-/*******************************************************************************
- * NOTE jcolwell@bea.com 2004-Sep-21 --
- * Add more methods and annotations to provide a thorough test of the
+/**
+ * ****************************************************************************
+ * NOTE jcolwell@bea.com 2004-Sep-21 --
+ * Add more methods and annotations to provide a thorough test of the
* AXIS JSR-181 implementation.
*
* @author Jonathan Colwell
*/
@WebService(name = "FakeName",
- serviceName = "FakeServiceName",
- targetNamespace = "http://fake.target.namespace/")
+ 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/")
+ targetNamespace = "http://result.target.namespace/")
public boolean doInvocation() {
return true;
}
@WebMethod(operationName = "processThingy")
@Oneway
- public void processModeratelyComplexObject(@WebParam(name = "thingy")
- ModeratelyComplexObject mco)
- {
-
+ public void processModeratelyComplexObject(@WebParam(name = "thingy")
+ ModeratelyComplexObject mco) {
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java Fri Oct 29 13:13:18 2004
@@ -24,8 +24,8 @@
import java.util.Date;
import java.util.Map;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@@ -38,63 +38,51 @@
private byte[] mBinary;
private Collection mCollection;
- public void setDate(Date d)
- {
+ public void setDate(Date d) {
mDate = d;
}
- public void setMap(Map m)
- {
+ public void setMap(Map m) {
mMap = m;
}
- public void setString(String s)
- {
+ public void setString(String s) {
mString = s;
}
- public void setNumber(double n)
- {
+ public void setNumber(double n) {
mNumber = n;
}
- public void setBinary(byte[] b)
- {
+ public void setBinary(byte[] b) {
mBinary = b;
}
- public void setCollection(Collection c)
- {
+ public void setCollection(Collection c) {
mCollection = c;
}
- public Date getDate()
- {
+ public Date getDate() {
return mDate;
}
- public Map getMap()
- {
+ public Map getMap() {
return mMap;
}
- public String getString()
- {
+ public String getString() {
return mString;
}
- public double getNumber()
- {
+ public double getNumber() {
return mNumber;
}
- public byte[] getBinary()
- {
+ public byte[] getBinary() {
return mBinary;
}
- public Collection getCollection()
- {
+ public Collection getCollection() {
return mCollection;
- }
+ }
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java Fri Oct 29 13:13:18 2004
@@ -30,48 +30,35 @@
* with JSR-181 (e.g. if it can't fill in all default values) it needs to
* override the respective tests.
*/
-public class Bar2TestCase extends TestCase
-{
+public class Bar2TestCase extends TestCase {
protected static final String CLASSNAME = "Bar2";
protected static final String SRCFILENAME = "Bar2.java";
protected AnnotationModel objectModel;
- protected WebServiceMETHODMetadata getMethod(String methodName)
- {
- if ((null == methodName) || (null == objectModel))
- {
+ protected WebServiceMETHODMetadata getMethod(String methodName) {
+ if ((null == methodName) || (null == objectModel)) {
return null;
}
-
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods())
- {
- if (methodName.equals(method.getWmOperationName()))
- {
+ for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ if (methodName.equals(method.getWmOperationName())) {
return method;
}
}
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos)
- {
- if ((null == methodName) || (null == objectModel))
- {
+ protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ if ((null == methodName) || (null == objectModel)) {
return null;
}
-
Collection<WebServiceMETHODMetadata> webMethods =
- ((WebServiceTYPEMetadata) objectModel).getMethods();
- for (WebServiceMETHODMetadata method : webMethods)
- {
- if (methodName.equals(method.getWmOperationName()))
- {
+ ((WebServiceTYPEMetadata) objectModel).getMethods();
+ for (WebServiceMETHODMetadata method : webMethods) {
+ if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams())
- {
- if (i == pos)
- {
+ for (WebServicePARAMETERMetadata param : method.getParams()) {
+ if (i == pos) {
return param;
}
i++;
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java Fri Oct 29 13:13:18 2004
@@ -30,48 +30,35 @@
* with JSR-181 (e.g. if it can't fill in all default values) it needs to
* override the respective tests.
*/
-public class Bar3TestCase extends TestCase
-{
+public class Bar3TestCase extends TestCase {
protected static final String CLASSNAME = "Bar3";
protected static final String SRCFILENAME = "Bar3.java";
protected AnnotationModel objectModel;
- protected WebServiceMETHODMetadata getMethod(String methodName)
- {
- if ((null == methodName) || (null == objectModel))
- {
+ protected WebServiceMETHODMetadata getMethod(String methodName) {
+ if ((null == methodName) || (null == objectModel)) {
return null;
}
-
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods())
- {
- if (methodName.equals(method.getWmOperationName()))
- {
+ for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ if (methodName.equals(method.getWmOperationName())) {
return method;
}
}
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos)
- {
- if ((null == methodName) || (null == objectModel))
- {
+ protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ if ((null == methodName) || (null == objectModel)) {
return null;
}
-
Collection<WebServiceMETHODMetadata> webMethods =
- ((WebServiceTYPEMetadata) objectModel).getMethods();
- for (WebServiceMETHODMetadata method : webMethods)
- {
- if (methodName.equals(method.getWmOperationName()))
- {
+ ((WebServiceTYPEMetadata) objectModel).getMethods();
+ for (WebServiceMETHODMetadata method : webMethods) {
+ if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams())
- {
- if (i == pos)
- {
+ for (WebServicePARAMETERMetadata param : method.getParams()) {
+ if (i == pos) {
return param;
}
i++;
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java Fri Oct 29 13:13:18 2004
@@ -30,156 +30,122 @@
* with JSR-181 (e.g. if it can't fill in all default values) it needs to
* override the respective tests.
*/
-public class BarTestCase extends TestCase
-{
+public class BarTestCase extends TestCase {
protected static final String CLASSNAME = "Bar";
- protected static final String[] SRCFILENAMES = { "Bar.java", "Bar2.java", "Bar3.java", "Cheetorama.java" };
+ protected static final String[] SRCFILENAMES = {"Bar.java", "Bar2.java", "Bar3.java", "Cheetorama.java"};
protected AnnotationModel objectModel;
- public void testObjectModel() throws Exception
- {
+ public void testObjectModel() throws Exception {
assertNotNull("Failed to retrieve object model;", objectModel);
}
- public void testWebServiceAbacus() throws Exception
- {
+ public void testWebServiceAbacus() throws Exception {
assertEquals("Invalid wsName;", "Abacus",
- ((WebServiceTYPEMetadata) objectModel).getWsName()
- );
-
+ ((WebServiceTYPEMetadata) objectModel).getWsName());
assertEquals("Invalid wsTargetNamespace;",
- "http://www.superflaco.com/AnnotationEndpointInterfaceTest",
- ((WebServiceTYPEMetadata) objectModel).getWsTargetNamespace()
- );
+ "http://www.superflaco.com/AnnotationEndpointInterfaceTest",
+ ((WebServiceTYPEMetadata) objectModel).getWsTargetNamespace());
}
-
- public void testWebMethodGoLoco() throws Exception
- {
+ public void testWebMethodGoLoco() throws Exception {
WebServiceMETHODMetadata method = getMethod("GoLoco");
assertNull("WebMethod GoLoco() must be null", method);
-
method = getMethod("GoLocoCheetorama");
assertNotNull("Cannot find WebMethod GoLocoCheetorama();", method);
assertEquals("Invalid wmAction;", "LocoActionCheetorama", method.getWmAction());
assertFalse("Unexpected @Oneway;", method.isOneWay());
assertEquals("Invalid wrName;", "result", method.getWrName());
assertEquals("Invalid return type;",
- boolean.class,
- method.getJavaReturnType()
- );
+ boolean.class,
+ method.getJavaReturnType());
}
- public void testWebMethodGoHome() throws Exception
- {
+ public void testWebMethodGoHome() throws Exception {
WebServiceMETHODMetadata method = getMethod("goHome");
assertNotNull("Cannot find WebMethod goHome();", method);
assertEquals("Invalid wmAction;", "", method.getWmAction());
assertTrue("Cannot find @Oneway;", method.isOneWay());
assertEquals("Unexpected @WebResult;", "result", method.getWrName());
assertEquals("Unexpected return type;",
- void.class,
- method.getJavaReturnType()
- );
+ void.class,
+ method.getJavaReturnType());
}
- public void testWebMethodDropMoney() throws Exception
- {
+ public void testWebMethodDropMoney() throws Exception {
WebServiceMETHODMetadata method = getMethod("dropMoney");
assertNotNull("Cannot find WebMethod dropMoney();", method);
assertEquals("Invalid wmAction;", "", method.getWmAction());
assertFalse("Unexpected @Oneway;", method.isOneWay());
assertEquals("Unexpected @WebResult;", "result", method.getWrName());
assertEquals("Unexpected return type;",
- int.class,
- method.getJavaReturnType()
- );
+ int.class,
+ method.getJavaReturnType());
}
- public void testWebParamGoLocoFirst() throws Exception
- {
+ public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
assertNotNull("Cannot find first param for WebMethod GoLoco();", param);
assertEquals("Invalid wpName;", "level", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
- public void testWebParamGoLocoSecond() throws Exception
- {
+ public void testWebParamGoLocoSecond() throws Exception {
final int paramNo = 1;
WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
assertNotNull("Cannot find second param for WebMethod GoLoco();", param);
assertEquals("Invalid wpName;", "detailCheetorama", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- String.class,
- param.getJavaType()
- );
+ String.class,
+ param.getJavaType());
}
- public void testWebParamGoHomeFirst() throws Exception
- {
+ public void testWebParamGoHomeFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("goHome", paramNo);
assertNotNull("Cannot find first param for method goHome();", param);
assertEquals("Invalid wpName;", "whenCheetorama", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- long.class,
- param.getJavaType()
- );
+ long.class,
+ param.getJavaType());
}
- public void testWebParamDropMoneyFirst() throws Exception
- {
+ public void testWebParamDropMoneyFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("dropMoney", paramNo);
assertNotNull("Cannot find first param for method dropMoney();", param);
assertEquals("Invalid wpName;", "amount", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
- protected WebServiceMETHODMetadata getMethod(String methodName)
- {
- if ((null == methodName) || (null == objectModel))
- {
+ protected WebServiceMETHODMetadata getMethod(String methodName) {
+ if ((null == methodName) || (null == objectModel)) {
return null;
}
-
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods())
- {
- if (methodName.equals(method.getWmOperationName()))
- {
+ for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ if (methodName.equals(method.getWmOperationName())) {
return method;
}
}
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos)
- {
- if ((null == methodName) || (null == objectModel))
- {
+ protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ if ((null == methodName) || (null == objectModel)) {
return null;
}
-
Collection<WebServiceMETHODMetadata> webMethods =
- ((WebServiceTYPEMetadata) objectModel).getMethods();
- for (WebServiceMETHODMetadata method : webMethods)
- {
- if (methodName.equals(method.getWmOperationName()))
- {
+ ((WebServiceTYPEMetadata) objectModel).getMethods();
+ for (WebServiceMETHODMetadata method : webMethods) {
+ if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams())
- {
- if (i == pos)
- {
+ for (WebServicePARAMETERMetadata param : method.getParams()) {
+ if (i == pos) {
return param;
}
i++;
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java Fri Oct 29 13:13:18 2004
@@ -21,123 +21,100 @@
import junit.framework.TestCase;
/**
- * This class serves as the base class for all TestCases based on Foo.java. It
+ * This class serves as the base class for all TestCases based on Foo.java. It
* verifies the values of all parameters in the object model defined in Foo.java.
* Default values are expected to be filled in. If a subclass can't fully comply
- * with JSR-181 (e.g. if it can't fill in all default values) it needs to
+ * with JSR-181 (e.g. if it can't fill in all default values) it needs to
* override the respective tests.
*/
-public class FooTestCase extends TestCase
-{
+public class FooTestCase extends TestCase {
protected static final String CLASSNAME = "Foo";
protected static final String SRCFILENAME = "Foo.java";
-
+
protected AnnotationModel objectModel;
-
- public void testObjectModel() throws Exception
- {
+
+ public void testObjectModel() throws Exception {
assertNotNull("Failed to retrieve object model;", objectModel);
}
-
- public void testWebServiceAbacus() throws Exception
- {
+
+ public void testWebServiceAbacus() throws Exception {
assertEquals("Invalid wsName;", "Abacus",
- ((WebServiceTYPEMetadata) objectModel).getWsName()
- );
+ ((WebServiceTYPEMetadata) objectModel).getWsName());
// todo test endpointInterface
assertEquals("Invalid wsTargetNamespace;",
- "http://www.superflaco.com/AnnotationTest",
- ((WebServiceTYPEMetadata) objectModel).getWsTargetNamespace()
- );
- }
-
- public void testWebMethodGoLoco() throws Exception
- {
+ "http://www.superflaco.com/AnnotationTest",
+ ((WebServiceTYPEMetadata) objectModel).getWsTargetNamespace());
+ }
+
+ public void testWebMethodGoLoco() throws Exception {
WebServiceMETHODMetadata method = getMethod("GoLoco");
assertNotNull("Cannot find WebMethod GoLoco();", method);
assertEquals("Invalid wmAction;", "LocoAction", method.getWmAction());
assertFalse("Unexpected @Oneway;", method.isOneWay());
assertEquals("Invalid wrName;", "result", method.getWrName());
assertEquals("Invalid return type;",
- boolean.class,
- method.getJavaReturnType()
- );
- }
-
- public void testWebMethodGoHome() throws Exception
- {
+ boolean.class,
+ method.getJavaReturnType());
+ }
+
+ public void testWebMethodGoHome() throws Exception {
WebServiceMETHODMetadata method = getMethod("goHome");
assertNotNull("Cannot find WebMethod goHome();", method);
assertEquals("Invalid wmAction;", "", method.getWmAction());
assertTrue("Cannot find @Oneway;", method.isOneWay());
assertEquals("Unexpected @WebResult;", "result", method.getWrName());
assertEquals("Unexpected return type;",
- void.class,
- method.getJavaReturnType()
- );
- }
-
- public void testWebParamGoLocoFirst() throws Exception
- {
+ void.class,
+ method.getJavaReturnType());
+ }
+
+ public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
assertNotNull("Cannot find first param for WebMethod GoLoco();", param);
assertEquals("Invalid wpName;", "level", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
- public void testWebParamGoLocoSecond() throws Exception
- {
+ public void testWebParamGoLocoSecond() throws Exception {
final int paramNo = 1;
WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
assertNotNull("Cannot find second param for WebMethod GoLoco();", param);
assertEquals("Invalid wpName;", "detail", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- String.class,
- param.getJavaType()
- );
+ String.class,
+ param.getJavaType());
}
- public void testWebParamGoHomeFirst() throws Exception
- {
+ public void testWebParamGoHomeFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("goHome", paramNo);
assertNotNull("Cannot find first param for method goHome();", param);
assertEquals("Invalid wpName;", "when", param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- long.class,
- param.getJavaType()
- );
- }
-
- protected WebServiceMETHODMetadata getMethod(String methodName)
- {
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods())
- {
- if (method.getWmOperationName().equals(methodName))
- {
+ long.class,
+ param.getJavaType());
+ }
+
+ protected WebServiceMETHODMetadata getMethod(String methodName) {
+ for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ if (method.getWmOperationName().equals(methodName)) {
return method;
}
}
return null;
}
-
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos)
- {
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods())
- {
- if (method.getWmOperationName().equals(methodName))
- {
+
+ protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ if (method.getWmOperationName().equals(methodName)) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams())
- {
- if (i == pos)
- {
+ for (WebServicePARAMETERMetadata param : method.getParams()) {
+ if (i == pos) {
return param;
}
i++;
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java Fri Oct 29 13:13:18 2004
@@ -48,17 +48,15 @@
//
// TODO: test combination of type, method, annotation
//
-public class Jsr181ModelTest extends TestCase
-{
+
+public class Jsr181ModelTest extends TestCase {
@Override
- public void setUp()
- {
+ public void setUp() {
// empty
}
@Override
- public void tearDown()
- {
+ public void tearDown() {
// empty
}
@@ -70,53 +68,43 @@
//
// todo test constructor properly
//
- public void testTYPEConstructor() throws Exception
- {
+ public void testTYPEConstructor() throws Exception {
FakeWebServiceAnnotation fakeWebServiceAnnotation =
- new FakeWebServiceAnnotation("name", "svcName", null, null, null);
+ new FakeWebServiceAnnotation("name", "svcName", null, null, null);
FakeSOAPBindingAnnotation fakeSOAPBindingAnnotation =
- new FakeSOAPBindingAnnotation(
- SOAPBinding.Style.RPC,
- SOAPBinding.Use.ENCODED,
- SOAPBinding.ParameterStyle.WRAPPED
- );
-
+ new FakeSOAPBindingAnnotation(SOAPBinding.Style.RPC,
+ SOAPBinding.Use.ENCODED,
+ SOAPBinding.ParameterStyle.WRAPPED);
String fqClassname = "a.b.c.testclass";
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
typeAnnotations.add(fakeSOAPBindingAnnotation);
Collection<WebServiceMETHODMetadata> webMethods =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
// does missing @WebService throw an error?
try {
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(null, fqClassname, typeAnnotations, webMethods);
+ new WebServiceTYPEMetadata(null, fqClassname, typeAnnotations, webMethods);
fail("Failed to generate error for TYPE without @WebService annotation");
- }
- catch (IllegalArgumentException e)
- {
+ } catch (IllegalArgumentException e) {
// good case
}
// does missing fqClassname throw an error?
try {
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(fakeWebServiceAnnotation, null, typeAnnotations, webMethods);
+ new WebServiceTYPEMetadata(fakeWebServiceAnnotation, null, typeAnnotations, webMethods);
fail("Failed to generate error for TYPE without TYPE name");
- }
- catch (IllegalArgumentException e)
- {
+ } catch (IllegalArgumentException e) {
// good case
}
// does missing annotations throw an error?
try {
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(fakeWebServiceAnnotation, fqClassname, null, webMethods);
+ new WebServiceTYPEMetadata(fakeWebServiceAnnotation, fqClassname, null, webMethods);
fail("Failed to generate error for TYPE without TYPE annotations");
- }
- catch (IllegalArgumentException e)
- {
+ } catch (IllegalArgumentException e) {
// good case
}
}
@@ -129,8 +117,7 @@
//
// todo test constructor properly
//
- public void testMETHODConstructor() throws Exception
- {
+ public void testMETHODConstructor() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
/*
@@ -159,20 +146,16 @@
methodAnnotations.add(new FakeWebMethodAnnotation("", ""));
try {
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata(null, void.class, false, methodAnnotations, null);
+ new WebServiceMETHODMetadata(null, void.class, false, methodAnnotations, null);
fail("Error, the METHOD annotation should fail without method name");
- }
- catch (IllegalArgumentException e)
- {
+ } catch (IllegalArgumentException e) {
// good case
}
try {
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodName", null, false, methodAnnotations,null);
+ new WebServiceMETHODMetadata("methodName", null, false, methodAnnotations, null);
fail("Error, the METHOD annotation should fail without return type class");
- }
- catch (IllegalArgumentException e)
- {
+ } catch (IllegalArgumentException e) {
// good case
}
}
@@ -185,15 +168,12 @@
//
// todo test constructor properly
//
- public void testPARAMETERConstructor() throws Exception
- {
+ public void testPARAMETERConstructor() throws Exception {
try {
WebServicePARAMETERMetadata param =
- new WebServicePARAMETERMetadata(null, "paramname", null);
+ new WebServicePARAMETERMetadata(null, "paramname", null);
fail("Java type is required in for constructor");
- }
- catch (IllegalArgumentException e)
- {
+ } catch (IllegalArgumentException e) {
// good case
}
}
@@ -204,18 +184,15 @@
//
/////////////////////////
- public void testTYPEWebServiceDefaults() throws Exception
- {
+ public void testTYPEWebServiceDefaults() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation =
- new FakeWebServiceAnnotation("", "", "", "", "");
+ new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertEquals("testclass", type.getWsName());
assertEquals("http://c.b.a", type.getWsTargetNamespace());
assertEquals("testclassService", type.getWsServiceName());
@@ -223,18 +200,15 @@
assertEquals("", type.getWsEndpointInterface());
}
- public void testTYPEWebService() throws Exception
- {
+ public void testTYPEWebService() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation =
- new FakeWebServiceAnnotation("testname", "testserviceName", "testwsdllocation", "testtargetnamespace", "");
+ new FakeWebServiceAnnotation("testname", "testserviceName", "testwsdllocation", "testtargetnamespace", "");
typeAnnotations.add(wsAnnotation);
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertEquals("testname", type.getWsName());
assertEquals("testtargetnamespace", type.getWsTargetNamespace());
assertEquals("testserviceName", type.getWsServiceName());
@@ -248,28 +222,22 @@
//
/////////////////////////
- public void testMETHODWebMethodDefaults() throws Exception
- {
+ public void testMETHODWebMethodDefaults() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
methodAnnotations.add(new FakeWebMethodAnnotation("", ""));
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
assertEquals("methodname", method.getWmOperationName());
assertEquals("", method.getWmAction());
}
- public void testMETHODWebMethod() throws Exception
- {
+ public void testMETHODWebMethod() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
WebMethod mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
assertEquals("operationname", method.getWmOperationName());
assertEquals("action", method.getWmAction());
}
@@ -280,27 +248,21 @@
//
/////////////////////////
- public void testMETHODOneWayDefaults() throws Exception
- {
+ public void testMETHODOneWayDefaults() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
methodAnnotations.add(new FakeWebMethodAnnotation("", ""));
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
assertFalse(method.isOneWay());
}
-
- public void testMETHODOneWay() throws Exception
- {
+
+ public void testMETHODOneWay() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
methodAnnotations.add(new FakeWebMethodAnnotation("", ""));
methodAnnotations.add(new FakeOneWayAnnotation());
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
- assertTrue(method.isOneWay());
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
+ assertTrue(method.isOneWay());
}
/////////////////////////
@@ -309,35 +271,29 @@
//
/////////////////////////
- public void testPARAMETERWebParamDefaults() throws Exception
- {
+ public void testPARAMETERWebParamDefaults() throws Exception {
Collection<Annotation> paramAnnotations = new ArrayList<Annotation>();
WebParam wpAnnotation = new FakeWebParamAnnotation("", "", WebParam.Mode.IN, false);
paramAnnotations.add(wpAnnotation);
-
WebServicePARAMETERMetadata param =
- new WebServicePARAMETERMetadata (String.class, "paramname", paramAnnotations);
+ new WebServicePARAMETERMetadata(String.class, "paramname", paramAnnotations);
-/*** *** ***/
+ /*** *** ***/
// create param list
List<WebServicePARAMETERMetadata> params =
- new ArrayList<WebServicePARAMETERMetadata>();
+ new ArrayList<WebServicePARAMETERMetadata>();
// create methods
Collection<WebServiceMETHODMetadata> methods =
- new ArrayList<WebServiceMETHODMetadata>();
-
+ new ArrayList<WebServiceMETHODMetadata>();
params.add(param);
-
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
WebMethod methodAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(methodAnnotation);
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, params);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, params);
methods.add(method);
// create annotations
@@ -347,26 +303,23 @@
// create type
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methods);
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methods);
-/*** *** ***/
+ /*** *** ***/
assertEquals("paramname", param.getWpName());
assertEquals(type.getWsTargetNamespace(), param.getWpTargetNamespace());
assertEquals(WebParam.Mode.IN, param.getWpMode());
assertFalse(param.isWpHeader());
}
-
- public void testPARAMETERWebParam() throws Exception
- {
+
+ public void testPARAMETERWebParam() throws Exception {
Collection<Annotation> paramAnnotations = new ArrayList<Annotation>();
WebParam wpAnnotation =
- new FakeWebParamAnnotation("paramname", "targetNamespace", WebParam.Mode.INOUT, true);
+ new FakeWebParamAnnotation("paramname", "targetNamespace", WebParam.Mode.INOUT, true);
paramAnnotations.add(wpAnnotation);
-
WebServicePARAMETERMetadata param =
- new WebServicePARAMETERMetadata(String.class, "paramname", paramAnnotations);
-
+ new WebServicePARAMETERMetadata(String.class, "paramname", paramAnnotations);
assertEquals("paramname", param.getWpName());
assertEquals("targetNamespace", param.getWpTargetNamespace());
assertEquals(WebParam.Mode.INOUT, param.getWpMode());
@@ -379,23 +332,20 @@
//
/////////////////////////
- public void testMETHODWebResultDefaults() throws Exception
- {
+ public void testMETHODWebResultDefaults() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
WebMethod mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeWebResultAnnotation("result", ""));
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-/*** *** ***/
+ /*** *** ***/
// create methods
Collection<WebServiceMETHODMetadata> methods =
- new ArrayList<WebServiceMETHODMetadata>();
-
+ new ArrayList<WebServiceMETHODMetadata>();
methods.add(method);
// create annotations
@@ -405,25 +355,22 @@
// create type
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methods);
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methods);
-/*** *** ***/
+ /*** *** ***/
assertEquals("result", method.getWrName());
assertEquals(type.getWsTargetNamespace(), method.getWrTargetNamespace());
}
-
- public void testMETHODWebResult() throws Exception
- {
+
+ public void testMETHODWebResult() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
WebMethod mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeWebResultAnnotation("result", "targetNamespace"));
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
assertEquals("result", method.getWrName());
assertEquals("targetNamespace", method.getWrTargetNamespace());
}
@@ -436,21 +383,17 @@
// no default values to check
- public void testTYPEHandlerChain() throws Exception
- {
+ public void testTYPEHandlerChain() throws Exception {
String hcFileName = "org/apache/beehive/wsm/jsr181/model/fakeAnnotations/handlerChainConfig.xml";
String hcName = "testname";
-
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
typeAnnotations.add(new FakeHandlerChainAnnotation(hcFileName, hcName));
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertEquals(hcFileName, type.getHcFileName());
assertEquals(hcName, type.getHcName());
}
@@ -463,23 +406,18 @@
// no default values to check
- public void testTYPESOAPBinding() throws Exception
- {
+ public void testTYPESOAPBinding() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation =
- new FakeWebServiceAnnotation("", "", "", "", "");
+ new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
- typeAnnotations.add(
- new FakeSOAPBindingAnnotation(
- SOAPBinding.Style.RPC,
+ typeAnnotations.add(new FakeSOAPBindingAnnotation(SOAPBinding.Style.RPC,
SOAPBinding.Use.ENCODED,
SOAPBinding.ParameterStyle.BARE));
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertEquals(SOAPBinding.Style.RPC, type.getSoapBinding().getStyle());
assertEquals(SOAPBinding.Use.ENCODED, type.getSoapBinding().getUse());
assertEquals(SOAPBinding.ParameterStyle.BARE, type.getSoapBinding().getParameterStyle());
@@ -492,45 +430,35 @@
/////////////////////////
// test empty handler list
- public void testTYPESoapMessageHandlersDefaults1() throws Exception
- {
+ public void testTYPESoapMessageHandlersDefaults1() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
FakeSOAPMessageHandlerAnnotation[] emptyHandlers =
- new FakeSOAPMessageHandlerAnnotation[0];
+ new FakeSOAPMessageHandlerAnnotation[0];
typeAnnotations.add(new FakeSOAPMessageHandlersAnnotation(emptyHandlers));
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertTrue(type.getSoapHandlers().isEmpty());
}
// test single default handler in handlers list
- public void testTYPESoapMessageHandlersDefaults2() throws Exception
- {
+ public void testTYPESoapMessageHandlersDefaults2() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
SOAPMessageHandler[] defaultHandlers = {
new FakeSOAPMessageHandlerAnnotation("", "soaphandlerclass", new FakeInitParamAnnotation[0], new String[0], new String[0])
};
- typeAnnotations.add(
- new FakeSOAPMessageHandlersAnnotation(defaultHandlers)
- );
-
+ typeAnnotations.add(new FakeSOAPMessageHandlersAnnotation(defaultHandlers));
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
- assertEquals(
- "number of handlers returned: " + type.getSoapHandlers().size(),
- 1, type.getSoapHandlers().size()
- );
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
+ assertEquals("number of handlers returned: " + type.getSoapHandlers().size(),
+ 1, type.getSoapHandlers().size());
SOAPMessageHandlerInfo handler = type.getSoapHandlers().get(0);
assertEquals("soaphandlerclass", handler.getName());
assertEquals("soaphandlerclass", handler.getClassName());
@@ -539,31 +467,28 @@
assertEquals(0, handler.getHeaders().size());
}
- public void testTYPESoapMessageHandlers() throws Exception
- {
+ public void testTYPESoapMessageHandlers() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
InitParam[] params = {
new FakeInitParamAnnotation("paramname", "paramvalue")
};
- String[] roles = { "roles" };
- String[] headers = { "namespace.localname" };
+ String[] roles = {"roles"};
+ String[] headers = {"namespace.localname"};
SOAPMessageHandler[] defaultHandlers = {
new FakeSOAPMessageHandlerAnnotation("", "soaphandlerclass", params, roles, headers)
};
typeAnnotations.add(new FakeSOAPMessageHandlersAnnotation(defaultHandlers));
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
// handlers
List<SOAPMessageHandlerInfo> soapHandlers = type.getSoapHandlers();
- assertEquals(
- "number of handlers returned: " + soapHandlers.size(),
- 1, soapHandlers.size());
+ assertEquals("number of handlers returned: " + soapHandlers.size(),
+ 1, soapHandlers.size());
SOAPMessageHandlerInfo handler = soapHandlers.get(0);
assertEquals("soaphandlerclass", handler.getName());
assertEquals("soaphandlerclass", handler.getClassName());
@@ -572,8 +497,8 @@
assertEquals(1, handler.getHeaders().size());
// params
- Map.Entry<String,String> me =
- handler.getParameterMap().entrySet().iterator().next();
+ Map.Entry<String, String> me =
+ handler.getParameterMap().entrySet().iterator().next();
assertEquals("paramname", me.getKey());
assertEquals("paramvalue", me.getValue());
@@ -591,36 +516,30 @@
//
/////////////////////////
- public void testTYPESecurityRolesDefaults() throws Exception
- {
+ public void testTYPESecurityRolesDefaults() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
typeAnnotations.add(new FakeSecurityRoleAnnotation(null, null));
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertNull(type.getSecurityRoles().getRolesAllowed());
assertNull(type.getSecurityRoles().getRolesReferenced());
}
- public void testTYPESecurityRoles() throws Exception
- {
+ public void testTYPESecurityRoles() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
- String[] rolesAllowed = { "rolesallowed" };
- String[] rolesReferenced = { "rolesreferenced" };
+ String[] rolesAllowed = {"rolesallowed"};
+ String[] rolesReferenced = {"rolesreferenced"};
typeAnnotations.add(new FakeSecurityRoleAnnotation(rolesAllowed, rolesReferenced));
-
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertEquals(1, type.getSecurityRoles().getRolesAllowed().size());
assertEquals("rolesallowed", (String) type.getSecurityRoles().getRolesAllowed().iterator().next());
assertEquals(1, type.getSecurityRoles().getRolesReferenced().size());
@@ -633,33 +552,25 @@
//
/////////////////////////
- public void testTYPESecurityIdentityDefaults() throws Exception
- {
+ public void testTYPESecurityIdentityDefaults() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
typeAnnotations.add(new FakeSecurityIdentityAnnotation(null));
-
- WebServiceTYPEMetadata type = new WebServiceTYPEMetadata(
- wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ WebServiceTYPEMetadata type = new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertNull(type.getSiValue());
}
- public void testTYPESecurityIdentity() throws Exception
- {
+ public void testTYPESecurityIdentity() throws Exception {
Collection<WebServiceMETHODMetadata> methodMetadata =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> typeAnnotations = new ArrayList<Annotation>();
WebService wsAnnotation = new FakeWebServiceAnnotation("", "", "", "", "");
typeAnnotations.add(wsAnnotation);
typeAnnotations.add(new FakeSecurityIdentityAnnotation("value"));
-
- WebServiceTYPEMetadata type = new WebServiceTYPEMetadata(
- wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
-
+ WebServiceTYPEMetadata type = new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, methodMetadata);
assertEquals(type.getSiValue(), "value");
}
@@ -669,196 +580,155 @@
//
/////////////////////////
- public void testTYPESOAPHandlerWithHandlerChain() throws Exception
- {
+ public void testTYPESOAPHandlerWithHandlerChain() throws Exception {
boolean hasPassed = false;
-
try {
Collection<Annotation> typeAnnotations =
- new ArrayList<Annotation>();
+ new ArrayList<Annotation>();
WebService wsAnnotation =
- new FakeWebServiceAnnotation(
- "name",
- "serviceName",
- "wsdlLocation",
- "targetNamespace",
- "endpointInterface"
- );
+ new FakeWebServiceAnnotation("name",
+ "serviceName",
+ "wsdlLocation",
+ "targetNamespace",
+ "endpointInterface");
typeAnnotations.add(wsAnnotation);
typeAnnotations.add(new FakeSOAPMessageHandlersAnnotation(new SOAPMessageHandler[0]));
typeAnnotations.add(new FakeHandlerChainAnnotation("fileName", "chainName"));
WebServiceTYPEMetadata type =
- new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, new ArrayList<WebServiceMETHODMetadata>());
- }
- catch (Exception e)
- {
+ new WebServiceTYPEMetadata(wsAnnotation, "a.b.c.testclass", typeAnnotations, new ArrayList<WebServiceMETHODMetadata>());
+ } catch (Exception e) {
hasPassed = true;
}
- if (! hasPassed)
- {
+ if (!hasPassed) {
fail("Error not caught: @SOAPMessageHandlers cannot be combined with @HandlerChain");
}
}
- public void testMETHODSecurityRoleDefaults() throws Exception
- {
+ public void testMETHODSecurityRoleDefaults() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
WebMethod mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeSecurityRoleAnnotation(null, null));
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
assertNull(method.getSecurityRoles().getRolesAllowed());
assertNull(method.getSecurityRoles().getRolesReferenced());
}
-
- public void testMETHODSecurityRole() throws Exception
- {
+
+ public void testMETHODSecurityRole() throws Exception {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
WebMethod mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
- String[] rolesAllowed = { "rolesallowed" };
- String[] rolesReferenced = { "rolesreferenced" };
+ String[] rolesAllowed = {"rolesallowed"};
+ String[] rolesReferenced = {"rolesreferenced"};
methodAnnotations.add(new FakeSecurityRoleAnnotation(rolesAllowed,
rolesReferenced));
-
WebServiceMETHODMetadata method =
- new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
-
+ new WebServiceMETHODMetadata("methodname", void.class, false, methodAnnotations, null);
assertEquals(1, method.getSecurityRoles().getRolesAllowed().size());
assertEquals("rolesallowed", method.getSecurityRoles().getRolesAllowed().iterator().next());
assertEquals(1, method.getSecurityRoles().getRolesReferenced().size());
assertEquals("rolesreferenced", method.getSecurityRoles().getRolesReferenced().iterator().next());
}
- public void testMETHODOnewayWithWebResult() throws Exception
- {
+ public void testMETHODOnewayWithWebResult() throws Exception {
boolean hasPassed = false;
try {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
FakeWebMethodAnnotation mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeOneWayAnnotation());
methodAnnotations.add(new FakeWebResultAnnotation("result", ""));
- WebServiceMETHODMetadata method = new WebServiceMETHODMetadata(
- "methodname",
- void.class,
- false,
- methodAnnotations,
- null
- );
- }
- catch (Exception e)
- {
+ WebServiceMETHODMetadata method = new WebServiceMETHODMetadata("methodname",
+ void.class,
+ false,
+ methodAnnotations,
+ null);
+ } catch (Exception e) {
hasPassed = true;
}
- if (! hasPassed)
- {
+ if (!hasPassed) {
fail("Error not caught: @Oneway method has @WebResult");
}
}
- public void testMETHODOnewayWithReturnType() throws Exception
- {
+ public void testMETHODOnewayWithReturnType() throws Exception {
boolean hasPassed = false;
try {
Collection<Annotation> methodAnnotations = new ArrayList<Annotation>();
FakeWebMethodAnnotation mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeOneWayAnnotation());
- WebServiceMETHODMetadata method = new WebServiceMETHODMetadata(
- "methodname",
- int.class,
- false,
- methodAnnotations,
- null
- );
- }
- catch (Exception e)
- {
+ WebServiceMETHODMetadata method = new WebServiceMETHODMetadata("methodname",
+ int.class,
+ false,
+ methodAnnotations,
+ null);
+ } catch (Exception e) {
hasPassed = true;
}
- if (! hasPassed)
- {
+ if (!hasPassed) {
fail("Error not caught: @Oneway method has non-void return type");
}
}
- public void testMETHODOnewayWithExceptions() throws Exception
- {
+ public void testMETHODOnewayWithExceptions() throws Exception {
boolean hasPassed = false;
try {
Collection<Annotation> methodAnnotations =
- new ArrayList<Annotation>();
+ new ArrayList<Annotation>();
FakeWebMethodAnnotation mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeOneWayAnnotation());
- WebServiceMETHODMetadata method = new WebServiceMETHODMetadata(
- "methodname",
- void.class,
- true,
- methodAnnotations,
- null
- );
- }
- catch (Exception e)
- {
+ WebServiceMETHODMetadata method = new WebServiceMETHODMetadata("methodname",
+ void.class,
+ true,
+ methodAnnotations,
+ null);
+ } catch (Exception e) {
hasPassed = true;
}
- if (! hasPassed)
- {
+ if (!hasPassed) {
fail("Error not caught: @Oneway method throws exceptions");
}
}
- public void testMETHODOnewayOUTParam() throws Exception
- {
+ public void testMETHODOnewayOUTParam() throws Exception {
boolean hasPassed = false;
try {
-
Collection<Annotation> methodAnnotations =
- new ArrayList<Annotation>();
+ new ArrayList<Annotation>();
FakeWebMethodAnnotation mAnnotation =
- new FakeWebMethodAnnotation("operationname", "action");
+ new FakeWebMethodAnnotation("operationname", "action");
methodAnnotations.add(mAnnotation);
methodAnnotations.add(new FakeOneWayAnnotation());
-
List<WebServicePARAMETERMetadata> params =
- new ArrayList<WebServicePARAMETERMetadata>();
+ new ArrayList<WebServicePARAMETERMetadata>();
Collection<Annotation> paramAnnotations =
- new ArrayList<Annotation>();
+ new ArrayList<Annotation>();
FakeWebParamAnnotation pAnnotation =
- new FakeWebParamAnnotation("param", "", WebParam.Mode.OUT, false);
+ new FakeWebParamAnnotation("param", "", WebParam.Mode.OUT, false);
paramAnnotations.add(pAnnotation);
WebServicePARAMETERMetadata param =
- new WebServicePARAMETERMetadata(
- String.class, // javaType
- "paramname", // name
- paramAnnotations // annotations
- );
+ new WebServicePARAMETERMetadata(String.class, // javaType
+ "paramname", // name
+ paramAnnotations // annotations
+ );
params.add(param);
-
- WebServiceMETHODMetadata method = new WebServiceMETHODMetadata(
- "methodname",
- void.class,
- false,
- methodAnnotations,
- params
- );
- }
- catch (Exception e)
- {
+ WebServiceMETHODMetadata method = new WebServiceMETHODMetadata("methodname",
+ void.class,
+ false,
+ methodAnnotations,
+ params);
+ } catch (Exception e) {
hasPassed = true;
}
- if (! hasPassed)
- {
+ if (!hasPassed) {
fail("Error not caught: @Oneway method has OUT or INOUT parameters");
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeHandlerChainAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeHandlerChainAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeHandlerChainAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,6 +1,5 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.HandlerChain;
@@ -24,22 +23,24 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeHandlerChainAnnotation.java
+
public class FakeHandlerChainAnnotation implements Annotation, HandlerChain {
String file;
String name;
+
/**
*
*/
public FakeHandlerChainAnnotation(String file, String name) {
- this.file=file;
- this.name=name;
+ this.file = file;
+ this.name = name;
}
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return HandlerChain.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeInitParamAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeInitParamAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeInitParamAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,9 +1,9 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.soap.InitParam;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -23,6 +23,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeInitParamAnnotation.java
+
public class FakeInitParamAnnotation implements Annotation, InitParam {
private String name;
@@ -32,14 +33,14 @@
*
*/
public FakeInitParamAnnotation(String name, String value) {
- this.name=name;
- this.value=value;
+ this.name = name;
+ this.value = value;
}
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return InitParam.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeOneWayAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeOneWayAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeOneWayAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,9 +1,9 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.Oneway;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -23,6 +23,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeOneWayAnnotation.java
+
public class FakeOneWayAnnotation implements Annotation, Oneway {
/**
@@ -35,8 +36,8 @@
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
- return Oneway.class;
+ public Class<? extends Annotation> annotationType() {
+ return Oneway.class;
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPBindingAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPBindingAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPBindingAnnotation.java Fri Oct 29 13:13:18 2004
@@ -22,40 +22,32 @@
import javax.jws.soap.SOAPBinding;
-public class FakeSOAPBindingAnnotation implements SOAPBinding, Annotation
-{
+public class FakeSOAPBindingAnnotation implements SOAPBinding, Annotation {
private SOAPBinding.Style style;
private SOAPBinding.Use use;
private SOAPBinding.ParameterStyle parameterStyle;
-
- public FakeSOAPBindingAnnotation(
- SOAPBinding.Style style,
- SOAPBinding.Use use,
- SOAPBinding.ParameterStyle parameterStyle
- )
- {
- this.style=style;
- this.use=use;
- this.parameterStyle=parameterStyle;
+
+ public FakeSOAPBindingAnnotation(SOAPBinding.Style style,
+ SOAPBinding.Use use,
+ SOAPBinding.ParameterStyle parameterStyle) {
+ this.style = style;
+ this.use = use;
+ this.parameterStyle = parameterStyle;
}
-
- public Style style()
- {
+
+ public Style style() {
return style;
}
-
- public Use use()
- {
+
+ public Use use() {
return use;
}
- public ParameterStyle parameterStyle()
- {
+ public ParameterStyle parameterStyle() {
return parameterStyle;
}
-
- public Class annotationType()
- {
+
+ public Class annotationType() {
return SOAPBinding.class;
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlerAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlerAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlerAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,10 +1,10 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.soap.InitParam;
import javax.jws.soap.SOAPMessageHandler;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -24,6 +24,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSOAPMessageHandlerAnnotation.java
+
public class FakeSOAPMessageHandlerAnnotation implements Annotation,
SOAPMessageHandler {
@@ -32,7 +33,7 @@
InitParam[] initParams;
String[] roles;
String[] headers;
-
+
/**
* @param name
* @param className
@@ -41,7 +42,7 @@
* @param headers
*/
public FakeSOAPMessageHandlerAnnotation(String name, String className,
- InitParam[] initParams, String[] roles, String[] headers) {
+ InitParam[] initParams, String[] roles, String[] headers) {
super();
this.name = name;
this.className = className;
@@ -50,13 +51,10 @@
this.headers = headers;
}
-
-
-
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return SOAPMessageHandler.class;
}
@@ -72,7 +70,6 @@
*/
public String className() {
return className;
-
}
/* (non-Javadoc)
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlersAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlersAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSOAPMessageHandlersAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,10 +1,10 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.soap.SOAPMessageHandler;
import javax.jws.soap.SOAPMessageHandlers;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -24,21 +24,23 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSOAPMessageHandlersAnnotation.java
+
public class FakeSOAPMessageHandlersAnnotation implements Annotation,
SOAPMessageHandlers {
SOAPMessageHandler[] value;
+
/**
*
*/
public FakeSOAPMessageHandlersAnnotation(SOAPMessageHandler[] value) {
- this.value=value;
+ this.value = value;
}
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
// TODO Auto-generated method stub
return SOAPMessageHandlers.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityIdentityAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityIdentityAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityIdentityAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,9 +1,9 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.security.SecurityIdentity;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -23,6 +23,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSecurityIdentityAnnotation.java
+
public class FakeSecurityIdentityAnnotation implements Annotation,
SecurityIdentity {
@@ -39,7 +40,7 @@
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return SecurityIdentity.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityRoleAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityRoleAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeSecurityRoleAnnotation.java Fri Oct 29 13:13:18 2004
@@ -3,6 +3,7 @@
import java.lang.annotation.Annotation;
import javax.jws.security.SecurityRoles;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -22,6 +23,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeSecurityRoleAnnotation.java
+
public class FakeSecurityRoleAnnotation implements Annotation, SecurityRoles {
private String[] rolesAllowed;
@@ -39,7 +41,7 @@
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return SecurityRoles.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebMethodAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebMethodAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebMethodAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,9 +1,9 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.WebMethod;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -23,6 +23,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebMethodAnnotation.java
+
public class FakeWebMethodAnnotation implements Annotation, WebMethod {
private String operationName;
@@ -40,7 +41,7 @@
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return WebMethod.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,9 +1,9 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.WebParam;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -23,6 +23,7 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebParamAnnotation.java
+
public class FakeWebParamAnnotation implements Annotation, WebParam {
private String name;
@@ -35,16 +36,16 @@
*/
public FakeWebParamAnnotation(String name, String targetNamespace, WebParam.Mode mode, boolean header) {
super();
- this.name=name;
+ this.name = name;
this.targetNamespace = targetNamespace;
- this.mode=mode;
- this.header=header;
+ this.mode = mode;
+ this.header = header;
}
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return WebParam.class;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebResultAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebResultAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebResultAnnotation.java Fri Oct 29 13:13:18 2004
@@ -1,9 +1,9 @@
package org.apache.beehive.wsm.jsr181.model.fakeAnnotations;
-
import java.lang.annotation.Annotation;
import javax.jws.WebResult;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -23,11 +23,12 @@
*/
//org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebResultAnnotation.java
+
public class FakeWebResultAnnotation implements Annotation, WebResult {
private String name;
private String targetNamespace;
-
+
/**
*
*/
@@ -40,7 +41,7 @@
/* (non-Javadoc)
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class< ? extends Annotation> annotationType() {
+ public Class<? extends Annotation> annotationType() {
return WebResult.class;
}
@@ -50,7 +51,7 @@
public String name() {
return name;
}
-
+
/* (non-Javadoc)
* @see javax.jws.WebResult#targetNamespace()
*/
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebServiceAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebServiceAnnotation.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebServiceAnnotation.java Fri Oct 29 13:13:18 2004
@@ -22,22 +22,18 @@
import javax.jws.WebService;
-public class FakeWebServiceAnnotation implements WebService, Annotation
-{
+public class FakeWebServiceAnnotation implements WebService, Annotation {
private String name;
private String endpointInterface;
private String serviceName;
private String wsdlLocation;
private String targetNamespace;
- public FakeWebServiceAnnotation(
- String name,
- String serviceName,
- String wsdlLocation,
- String targetNamespace,
- String endpointInterface
- )
- {
+ public FakeWebServiceAnnotation(String name,
+ String serviceName,
+ String wsdlLocation,
+ String targetNamespace,
+ String endpointInterface) {
this.name = name;
this.serviceName = serviceName;
this.wsdlLocation = wsdlLocation;
@@ -50,8 +46,7 @@
*
* @see javax.jws.WebService#name()
*/
- public String name()
- {
+ public String name() {
return name;
}
@@ -60,8 +55,7 @@
*
* @see javax.jws.WebService#serviceName()
*/
- public String serviceName()
- {
+ public String serviceName() {
return serviceName;
}
@@ -70,8 +64,7 @@
*
* @see javax.jws.WebService#wsdlLocation()
*/
- public String wsdlLocation()
- {
+ public String wsdlLocation() {
return wsdlLocation;
}
@@ -80,8 +73,7 @@
*
* @see javax.jws.WebService#targetNamespace()
*/
- public String targetNamespace()
- {
+ public String targetNamespace() {
return targetNamespace;
}
@@ -90,8 +82,7 @@
*
* @see javax.jws.WebService#endpointInterface()
*/
- public String endpointInterface()
- {
+ public String endpointInterface() {
return endpointInterface;
}
@@ -100,8 +91,7 @@
*
* @see java.lang.annotation.Annotation#annotationType()
*/
- public Class annotationType()
- {
+ public Class annotationType() {
return WebService.class;
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/handlerChainConfig.xml
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/handlerChainConfig.xml (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/handlerChainConfig.xml Fri Oct 29 13:13:18 2004
@@ -1,25 +1,25 @@
<handler-config>
- <handler-chain>
- <handler-chain-name>testname</handler-chain-name>
- <handler>
- <handler-name>
+ <handler-chain>
+ <handler-chain-name>testname</handler-chain-name>
+ <handler>
+ <handler-name>
handlerOne
- </handler-name>
- <handler-class>
+ </handler-name>
+ <handler-class>
org.apache.beehive.wsm.HandlerOne
- </handler-class>
- <init-param>
- <param-name>param_1</param-name>
- <param-value>defaultValue</param-value>
- </init-param>
- </handler>
- <handler>
- <handler-name>
+ </handler-class>
+ <init-param>
+ <param-name>param_1</param-name>
+ <param-value>defaultValue</param-value>
+ </init-param>
+ </handler>
+ <handler>
+ <handler-name>
handlerTwo
- </handler-name>
- <handler-class>
+ </handler-name>
+ <handler-class>
org.apache.beehive.wsm.HandlerTwo
- </handler-class>
- </handler>
- </handler-chain>
+ </handler-class>
+ </handler>
+ </handler-chain>
</handler-config>
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java Fri Oct 29 13:13:18 2004
@@ -23,7 +23,6 @@
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
-
/**
* Test case verifies that a source file can be read and its annotations can be
* interpreted by the annotation processor.
@@ -31,44 +30,35 @@
public class WsmAnnotationProcessorEndpointInterfaceTest extends BarTestCase {
@Override
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
// get project root from environment
String BEEHIVE_HOME;
- if (null == (BEEHIVE_HOME = System.getenv("BEEHIVE_HOME")))
- {
+ if (null == (BEEHIVE_HOME = System.getenv("BEEHIVE_HOME"))) {
throw new Exception("BEEHIVE_HOME not set properly");
}
-
- for (String srcFilename : java.util.Arrays.asList(SRCFILENAMES))
- {
+ for (String srcFilename : java.util.Arrays.asList(SRCFILENAMES)) {
// initialize "command line args"
String[] _args = {
"-factory",
"org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessorFactory",
"-AsrcPath=" + new java.io.File(BEEHIVE_HOME, "/wsm/drt/tests/").getCanonicalPath(),
- new java.io.File(
- new java.io.File(BEEHIVE_HOME, "/wsm/drt/tests/"),
- srcFilename
- ).getCanonicalPath()
+ new java.io.File(new java.io.File(BEEHIVE_HOME, "/wsm/drt/tests/"),
+ srcFilename).getCanonicalPath()
};
// compile source file
int status = new Main().compile(_args);
- if (0 != status)
- {
+ if (0 != status) {
throw new Exception("error compiling: " + SRCFILENAMES);
}
}
// check if we have an object model
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(Class.forName(CLASSNAME));
-
}
@Override
- public void tearDown() throws Exception
- {
+ public void tearDown() throws Exception {
// empty
}
@@ -77,16 +67,14 @@
* our own default name "in<number>".
*/
@Override
- public void testWebParamGoLocoFirst() throws Exception
- {
+ public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
assertNotNull("Cannot find first param for WebMethod GoLocoCheetorama()", param);
assertEquals("Invalid wpName", "in" + paramNo, param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
/**
@@ -94,16 +82,14 @@
* our own default name "in<number>".
*/
@Override
- public void testWebParamDropMoneyFirst() throws Exception
- {
+ public void testWebParamDropMoneyFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("dropMoney", paramNo);
assertNotNull("Cannot find first param for WebMethod dropMoeny()", param);
assertEquals("Invalid wpName", "in" + paramNo, param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java Fri Oct 29 13:13:18 2004
@@ -23,7 +23,6 @@
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
-
/**
* Test case verifies that a source file can be read and its annotations can be
* interpreted by the annotation processor.
@@ -31,12 +30,10 @@
public class WsmAnnotationProcessorTest extends FooTestCase {
@Override
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
// get project root from environment
String BEEHIVE_HOME;
- if (null == (BEEHIVE_HOME = System.getenv("BEEHIVE_HOME")))
- {
+ if (null == (BEEHIVE_HOME = System.getenv("BEEHIVE_HOME"))) {
throw new Exception("BEEHIVE_HOME not set properly");
}
@@ -44,43 +41,37 @@
String[] _args = {
"-factory",
"org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessorFactory",
- new java.io.File(
- new java.io.File(BEEHIVE_HOME, "/wsm/drt/tests/"),
- SRCFILENAME
- ).getCanonicalPath()
+ new java.io.File(new java.io.File(BEEHIVE_HOME, "/wsm/drt/tests/"),
+ SRCFILENAME).getCanonicalPath()
};
// compile source file
int status = new Main().compile(_args);
- if (0 != status)
- {
+ if (0 != status) {
throw new Exception("error compiling: " + SRCFILENAME);
}
// check if we have an object model
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(Class.forName(CLASSNAME));
}
-
+
@Override
- public void tearDown() throws Exception
- {
+ public void tearDown() throws Exception {
// empty
}
-
+
/**
* We can't derive default values for WebParam from binaries. Thus, we use
* our own default name "in<number>".
*/
@Override
- public void testWebParamGoLocoFirst() throws Exception
- {
+ public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
assertNotNull("Cannot find first param for WebMethod GoLoco()", param);
assertEquals("Invalid wpName", "in" + paramNo, param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java Fri Oct 29 13:13:18 2004
@@ -20,35 +20,27 @@
import org.apache.beehive.wsm.jsr181.model.Bar2TestCase;
-public class WsmAnnotationProcessorEndpointInterface2Test extends Bar2TestCase
-{
+public class WsmAnnotationProcessorEndpointInterface2Test extends Bar2TestCase {
@Override
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
// empty
}
@Override
- public void tearDown() throws Exception
- {
+ public void tearDown() throws Exception {
// empty
}
- public void testConsistency() throws Exception
- {
+ public void testConsistency() throws Exception {
Class clazz = Class.forName(CLASSNAME);
- try
- {
+ try {
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
objectModel.validate();
fail("Failed to generate error for the service implementation which doesn't implement the methods declared "
- + "in the corresponding endpoint interface.");
- }
- catch(Exception e)
- {
+ + "in the corresponding endpoint interface.");
+ } catch (Exception e) {
// good case
}
-
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java Fri Oct 29 13:13:18 2004
@@ -23,29 +23,22 @@
public class WsmAnnotationProcessorEndpointInterface3Test extends Bar3TestCase {
@Override
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
// empty
}
@Override
- public void tearDown() throws Exception
- {
+ public void tearDown() throws Exception {
// empty
}
- public void testConsistency() throws Exception
- {
+ public void testConsistency() throws Exception {
Class clazz = Class.forName(CLASSNAME);
- try
- {
+ try {
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
- }
- catch(Exception e)
- {
+ } catch (Exception e) {
fail("The processor must not throw an exception.");
}
-
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java Fri Oct 29 13:13:18 2004
@@ -31,16 +31,14 @@
public class WsmAnnotationProcessorEndpointInterfaceTest extends BarTestCase {
@Override
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
Class clazz = Class.forName(CLASSNAME);
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
- WebServiceMetadataViewer.print( (WebServiceTYPEMetadata) objectModel );
+ WebServiceMetadataViewer.print((WebServiceTYPEMetadata) objectModel);
}
@Override
- public void tearDown() throws Exception
- {
+ public void tearDown() throws Exception {
// empty
}
@@ -49,16 +47,14 @@
* our own default name "in<number>".
*/
@Override
- public void testWebParamGoLocoFirst() throws Exception
- {
+ public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
assertNotNull("Cannot find first param for WebMethod GoLocoCheetorama()", param);
assertEquals("Invalid wpName", "in" + paramNo, param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
/**
@@ -66,15 +62,13 @@
* our own default name "in<number>".
*/
@Override
- public void testWebParamDropMoneyFirst() throws Exception
- {
+ public void testWebParamDropMoneyFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("dropMoney", paramNo);
assertNotNull("Cannot find first param for WebMethod dropMoeny()", param);
assertEquals("Invalid wpName", "in" + paramNo, param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorTest.java Fri Oct 29 13:13:18 2004
@@ -29,33 +29,29 @@
public class WsmAnnotationProcessorTest extends FooTestCase {
@Override
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
Class clazz = Class.forName(CLASSNAME);
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
}
@Override
- public void tearDown() throws Exception
- {
+ public void tearDown() throws Exception {
// empty
}
-
+
/**
* We can't derive default values for WebParam from binaries. Thus, we use
* our own default name "in<number>".
*/
@Override
- public void testWebParamGoLocoFirst() throws Exception
- {
+ public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
assertNotNull("Cannot find first param for WebMethod GoLoco()", param);
assertEquals("Invalid wpName", "in" + paramNo, param.getWpName());
assertEquals("Invalid return type: " + param.getJavaType(),
- int.class,
- param.getJavaType()
- );
+ int.class,
+ param.getJavaType());
}
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java Fri Oct 29 13:13:18 2004
@@ -34,25 +34,21 @@
import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
import org.xmlsoap.schemas.wsdl.soap.UseChoice;
-
-/*******************************************************************************
- *
- *
+/**
+ * ****************************************************************************
*/
public class WSDLProcessorTest extends TestCase {
- private static final String BEEHIVE_HOME = System.getenv( "BEEHIVE_HOME" );
+ private static final String BEEHIVE_HOME = System.getenv("BEEHIVE_HOME");
DefinitionsDocument doc;
- public void setUp() throws Exception
- {
- File f = new File( BEEHIVE_HOME, "wsm/drt/tests/FooWSDL.xml" );
- doc = WSDLProcessor.parseWSDL( f );
+ public void setUp() throws Exception {
+ File f = new File(BEEHIVE_HOME, "wsm/drt/tests/FooWSDL.xml");
+ doc = WSDLProcessor.parseWSDL(f);
}
- public void testSOAPActionChildren() throws Exception
- {
+ public void testSOAPActionChildren() throws Exception {
assertNotNull(doc);
if (doc != null) {
TDefinitions tDefs = doc.getDefinitions();
@@ -63,7 +59,7 @@
if (tBind != null) {
TBindingOperation bOp = tBind.getOperationArray(0);
TOperation[] tOps = WSDLProcessor.getSOAPOperations(bOp);
- for (TOperation op :tOps) {
+ for (TOperation op : tOps) {
assertEquals("Soap Actions did not match", op.getSoapAction(), "LocoAction");
}
}
@@ -71,8 +67,7 @@
}
}
- public void testSOAPBindingChildren() throws Exception
- {
+ public void testSOAPBindingChildren() throws Exception {
assertNotNull(doc);
if (doc != null) {
TDefinitions tDefs = doc.getDefinitions();
@@ -82,22 +77,21 @@
assertNotNull(tBind);
if (tBind != null) {
org.xmlsoap.schemas.wsdl.soap.TBinding[] tBs =
- WSDLProcessor.getSOAPBinding(tBind);
+ WSDLProcessor.getSOAPBinding(tBind);
for (org.xmlsoap.schemas.wsdl.soap.TBinding tb : tBs) {
assertSame("Soap Styles not the same",
- tb.getStyle(),
- TStyleChoice.RPC);
+ tb.getStyle(),
+ TStyleChoice.RPC);
assertEquals("SoapTransport mismatch",
- tb.getTransport(),
- "http://schemas.xmlsoap.org/soap/http");
+ tb.getTransport(),
+ "http://schemas.xmlsoap.org/soap/http");
}
}
}
}
}
- public void testSOAPBodyChildren() throws Exception
- {
+ public void testSOAPBodyChildren() throws Exception {
assertNotNull(doc);
if (doc != null) {
TDefinitions tDefs = doc.getDefinitions();
@@ -115,24 +109,22 @@
}
private void processBindingOperationMessage(TBindingOperationMessage tBom)
- throws Exception
- {
+ throws Exception {
TBody[] bodies = WSDLProcessor.getSOAPBody(tBom);
for (TBody bod : bodies) {
assertEquals("Soap EncodingStyles did not match",
- bod.getEncodingStyle().get(0),
- "http://schemas.xmlsoap.org/soap/encoding/");
+ bod.getEncodingStyle().get(0),
+ "http://schemas.xmlsoap.org/soap/encoding/");
assertEquals("Soap Namespaces did not match",
- bod.getNamespace(),
- "http://www.superflaco.com/AnnotationTest");
+ bod.getNamespace(),
+ "http://www.superflaco.com/AnnotationTest");
assertSame("Soap Uses did not match",
- bod.getUse(),
- UseChoice.ENCODED);
+ bod.getUse(),
+ UseChoice.ENCODED);
}
}
- public void testSOAPAddressChildren() throws Exception
- {
+ public void testSOAPAddressChildren() throws Exception {
assertNotNull(doc);
if (doc != null) {
TDefinitions tDefs = doc.getDefinitions();
@@ -145,30 +137,28 @@
TAddress[] addrs = WSDLProcessor.getSOAPAddress(port);
for (TAddress addr : addrs) {
assertEquals("Soap Actions did not match",
- addr.getLocation(),
- "http://localhost:8080/AnnotatedAxis/Foo.jws");
+ addr.getLocation(),
+ "http://localhost:8080/AnnotatedAxis/Foo.jws");
}
}
}
}
}
- public void testWSMConversion() throws Exception
- {
- File wsdlOut = new File( BEEHIVE_HOME, "wsm/drt/logs/WSM_WSDL.xml" );
+ public void testWSMConversion() throws Exception {
+ File wsdlOut = new File(BEEHIVE_HOME, "wsm/drt/logs/WSM_WSDL.xml");
assertNotNull(doc);
if (doc != null) {
org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata wsm = WSDLProcessor.toWebServiceMetadata(doc);
assertEquals("Cheetorama", wsm.getWsServiceName());
assertEquals("Abacus", wsm.getWsName());
assertEquals("http://www.superflaco.com/AnnotationTest",
- wsm.getWsTargetNamespace());
+ wsm.getWsTargetNamespace());
assertEquals(2, wsm.getMethods().size());
-
WSDLProcessor.fromWebServiceMetadata(wsm)
- .save(wsdlOut, new XmlOptions()
- .setSavePrettyPrint()
- .setSavePrettyPrintIndent(4));
+ .save(wsdlOut, new XmlOptions()
+ .setSavePrettyPrint()
+ .setSavePrettyPrintIndent(4));
}
}
}
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/build.xml (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/client/build.xml Fri Oct 29 13:13:18 2004
@@ -1,76 +1,58 @@
<?xml version="1.0" ?>
-
<project name="AddressBookClient" basedir="." default="all">
-
- <property name="AddressBook.wsdl.url"
- value="http://localhost:8080/AnnotatedAxis/AddressBookWebService.jws?wsdl" />
-
-
- <path id="jars">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
- loaderref="axis" >
+ <property name="AddressBook.wsdl.url"
+ value="http://localhost:8080/AnnotatedAxis/AddressBookWebService.jws?wsdl"/>
+ <path id="jars">
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+ <taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+ loaderref="axis">
<classpath refid="jars"/>
- </taskdef>
-
-
- <target name="clean">
- <delete dir="build" />
- </target>
-
- <target name="dirs">
- <mkdir dir="build" />
- <mkdir dir="build/generated" />
- <mkdir dir="build/classes" />
-
- </target>
- <target name="all" depends="genClient, compile, test"/>
-
- <target name="genClient" depends="dirs">
- <wsdl2java url="${AddressBook.wsdl.url}"
- output="build/generated"
- testcase="yes">
- </wsdl2java>
-
- </target>
-
- <target name="compile" depends="genClient">
- <javac srcdir="build/generated"
- destdir="build/classes"
- classpathref="jars"
- failonerror="true"
- source="1.4"
- />
+ </taskdef>
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+ <target name="dirs">
+ <mkdir dir="build"/>
+ <mkdir dir="build/generated"/>
+ <mkdir dir="build/classes"/>
+ </target>
+ <target name="all" depends="genClient, compile, test"/>
+ <target name="genClient" depends="dirs">
+ <wsdl2java url="${AddressBook.wsdl.url}"
+ output="build/generated"
+ testcase="yes">
+ </wsdl2java>
+ </target>
+ <target name="compile" depends="genClient">
+ <javac srcdir="build/generated"
+ destdir="build/classes"
+ classpathref="jars"
+ failonerror="true"
+ source="1.4"
+ />
- <!-- just in case there are some client specific source -->
- <javac srcdir="src"
- destdir="build/classes"
- classpathref="jars"
- failonerror="true"
- source="1.4"
- />
-
- </target>
-
- <target name="test" depends="compile">
- <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
- <classpath>
- <pathelement location= "build/classes"/>
- <path refid="jars"/>
- </classpath>
-
-
- <batchtest fork="yes" todir=".">
- <fileset dir="build/classes">
- <include name="**/*Test*.class"/>
- </fileset>
- </batchtest>
- </junit>
-
- </target>
-
+ <!-- just in case there are some client specific source -->
+ <javac srcdir="src"
+ destdir="build/classes"
+ classpathref="jars"
+ failonerror="true"
+ source="1.4"
+ />
+ </target>
+ <target name="test" depends="compile">
+ <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+ <classpath>
+ <pathelement location="build/classes"/>
+ <path refid="jars"/>
+ </classpath>
+ <batchtest fork="yes" todir=".">
+ <fileset dir="build/classes">
+ <include name="**/*Test*.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
</project>
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/readme.html
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/readme.html (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/readme.html Fri Oct 29 13:13:18 2004
@@ -1,100 +1,115 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head>
- <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
- <title>readme.html</title>
-</head>
+ <head>
+ <meta content="text/html; charset=ISO-8859-1"
+ http-equiv="content-type">
+ <title>readme.html</title>
+ </head>
<body>
-<p class="MsoNormal">This directory contains samples for annotation
+ <p class="MsoNormal">This directory contains samples for annotation
aware web
services using the Axis’s drop in deployment model.</p>
-<p class="MsoNormal"><o:p> </o:p>AddressBook:<span style="">
-</span>Address
+ <p class="MsoNormal">
+ <o:p> </o:p>AddressBook:
+ <span style="">
+ </span>Address
Book is a client/server application that is based on the Axis’s “addr”
-sample.<span style=""> </span>The sample is organized as a
+sample.
+ <span style=""> </span>The sample is organized as a
real application
with POJO models, service interface, service implementation, and unit
tests for
-the service.<span style=""> </span>The directory strutcture
+the service.
+ <span style=""> </span>The directory strutcture
and ant build file can be used as the starting point of building new
standalone
-web services.</p>
-<p class="MsoNormal"><o:p> </o:p></p>
-<table class="MsoTableGrid"
- style="border: medium none ; border-collapse: collapse;" border="1"
- cellpadding="0" cellspacing="0">
- <tbody>
- <tr style="">
- <td
- style="border: 1pt solid windowtext; padding: 0in 5.4pt; width: 95.4pt;"
- valign="top" width="127">
- <p class="MsoNormal">build</p>
- </td>
- <td
- style="border-style: solid solid solid none; border-color: windowtext windowtext windowtext -moz-use-text-color; border-width: 1pt 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
- valign="top" width="463">
- <p class="MsoNormal">output of the build process</p>
- </td>
- </tr>
- <tr style="">
- <td
- style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
- valign="top" width="127">
- <p class="MsoNormal">src</p>
- </td>
- <td
- style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
- valign="top" width="463">
- <p class="MsoNormal">The Web Service implementation. Web Serivce
+web services.
+ </p>
+ <p class="MsoNormal">
+ <o:p> </o:p>
+ </p>
+ <table class="MsoTableGrid"
+ style="border: medium none ; border-collapse: collapse;" border="1"
+ cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr style="">
+ <td
+ style="border: 1pt solid windowtext; padding: 0in 5.4pt; width: 95.4pt;"
+ valign="top" width="127">
+ <p class="MsoNormal">build</p>
+ </td>
+ <td
+ style="border-style: solid solid solid none; border-color: windowtext windowtext windowtext -moz-use-text-color; border-width: 1pt 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
+ valign="top" width="463">
+ <p class="MsoNormal">output of the build process</p>
+ </td>
+ </tr>
+ <tr style="">
+ <td
+ style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
+ valign="top" width="127">
+ <p class="MsoNormal">src</p>
+ </td>
+ <td
+ style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
+ valign="top" width="463">
+ <p class="MsoNormal">The Web Service implementation. Web Serivce
is implemented a java objects with POJO as the model</p>
- </td>
- </tr>
- <tr style="">
- <td
- style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
- valign="top" width="127">
- <p class="MsoNormal">tests</p>
- </td>
- <td
- style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
- valign="top" width="463">
- <p class="MsoNormal">tests for the service.</p>
- </td>
- </tr>
- <tr style="">
- <td
- style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
- valign="top" width="127">
- <p class="MsoNormal">web</p>
- </td>
- <td
- style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
- valign="top" width="463">
- <p class="MsoNormal">location of the .jws file that exposes the
+ </td>
+ </tr>
+ <tr style="">
+ <td
+ style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
+ valign="top" width="127">
+ <p class="MsoNormal">tests</p>
+ </td>
+ <td
+ style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
+ valign="top" width="463">
+ <p class="MsoNormal">tests for the service.</p>
+ </td>
+ </tr>
+ <tr style="">
+ <td
+ style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
+ valign="top" width="127">
+ <p class="MsoNormal">web</p>
+ </td>
+ <td
+ style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
+ valign="top" width="463">
+ <p class="MsoNormal">location of the .jws file that exposes the
Web Service</p>
- </td>
- </tr>
- <tr style="">
- <td
- style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
- valign="top" width="127">
- <p class="MsoNormal"><o:p> </o:p></p>
- </td>
- <td
- style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
- valign="top" width="463">
- <p class="MsoNormal"><o:p> </o:p></p>
- </td>
- </tr>
- </tbody>
-</table>
-<p class="MsoNormal"><o:p> </o:p></p>
-<p class="MsoNormal">Requirements:</p>
+ </td>
+ </tr>
+ <tr style="">
+ <td
+ style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 95.4pt;"
+ valign="top" width="127">
+ <p class="MsoNormal">
+ <o:p> </o:p>
+ </p>
+ </td>
+ <td
+ style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 347.4pt;"
+ valign="top" width="463">
+ <p class="MsoNormal">
+ <o:p> </o:p>
+ </p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <p class="MsoNormal">
+ <o:p> </o:p>
+ </p>
+ <p class="MsoNormal">Requirements:</p>
-<><o:p></o:p>You need to have servlet container running, you can use
+<>
+ <o:p></o:p>You need to have servlet container running, you can use
tomcat distribution from beehive, or download your own, or use
-alternative.</>
+alternative.
+</>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">How to Install the AddressBook webservice:</p>
<p class="MsoNormal"><o:p> </o:p></p>
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml Fri Oct 29 13:13:18 2004
@@ -17,21 +17,16 @@
$Header:$
-->
-
<project name="AddressBookWS" default="usage" basedir=".">
-
<property environment="env"/>
-
<property name="build.dir" location="build"/>
<property name="webapp.dir" value="${env.CATALINA_HOME}/webapps"/>
<property name="classes.dir" location="${build.dir}/classes"/>
<property name="logs.dir" location="logs"/>
<property name="test.dir" location="tests"/>
-
<condition property="isJDK15">
<equals arg1="${ant.java.version}" arg2="1.5"/>
</condition>
-
<property name="AnnotatedAxis.base.dir" value="${webapp.dir}/AnnotatedAxis"/>
<path id="jars">
<fileset dir="${AnnotatedAxis.base.dir}/WEB-INF/lib/">
@@ -47,19 +42,18 @@
<!-- Automatically copies file into servlet container -->
<!-- Should this be done manually? -->
<target name="deploy" depends="build" if="AnnotatedAxis.base.dir">
- <echo message="** Deploying Web service to ${webapp.dir} **" />
- <copy file="AddressBookWS.jar" todir="${AnnotatedAxis.base.dir}/WEB-INF/lib/" overwrite="true" />
- <copy file="web/AddressBookWebService.jws" todir="${AnnotatedAxis.base.dir}/" overwrite="true" />
+ <echo message="** Deploying Web service to ${webapp.dir} **"/>
+ <copy file="AddressBookWS.jar" todir="${AnnotatedAxis.base.dir}/WEB-INF/lib/" overwrite="true"/>
+ <copy file="web/AddressBookWebService.jws" todir="${AnnotatedAxis.base.dir}/" overwrite="true"/>
</target>
<!-- ========================================= -->
<!-- build - build jar-file -->
<!-- ========================================= -->
-
<target name="build" depends="test">
- <jar jarfile="AddressBookWS.jar" >
- <fileset dir="${classes.dir}" >
+ <jar jarfile="AddressBookWS.jar">
+ <fileset dir="${classes.dir}">
<exclude name="**/Test.class"/>
</fileset>
</jar>
@@ -69,16 +63,15 @@
<!-- ========================================= -->
<!-- test - run junit tests -->
<!-- ========================================= -->
-
<target name="test" depends="verify, compile">
<javac srcdir="${test.dir}"
destdir="${classes.dir}"
classpathref="jars"
- failonerror="true" />
- <echo message="** writing junit log-files to ${logs.dir} **" />
- <junit haltonfailure="yes" printsummary="yes" tempdir="${build.dir}" fork="yes">
+ failonerror="true"/>
+ <echo message="** writing junit log-files to ${logs.dir} **"/>
+ <junit haltonfailure="yes" printsummary="yes" tempdir="${build.dir}" fork="yes">
<classpath>
- <pathelement location= "${classes.dir}"/>
+ <pathelement location="${classes.dir}"/>
<path refid="jars"/>
</classpath>
<formatter type="plain"/>
@@ -87,19 +80,18 @@
<include name="**/*Test*.java"/>
</fileset>
</batchtest>
- </junit>
+ </junit>
</target>
<!-- ========================================= -->
<!-- compile - compile sources -->
<!-- ========================================= -->
-
<target name="compile" depends="dirs" if="isJDK15">
<javac srcdir="src"
destdir="${classes.dir}"
classpathref="jars"
- failonerror="true" />
+ failonerror="true"/>
</target>
@@ -107,60 +99,57 @@
<!-- usage - output usage -->
<!-- ========================================= -->
<target name="usage">
- <echo message="" />
- <echo message="AddressBookWS build file" />
- <echo message="" />
- <echo message="+==============================================================+" />
- <echo message="| Usage |" />
- <echo message="+==============================================================+" />
- <echo message="" />
- <echo message="deploy - deploy into servlet container" />
- <echo message="build - build jar-file" />
- <echo message="compile - compile source files" />
- <echo message="clean - remove build files" />
- <echo message="test - run unit tests" />
- <echo message="" />
- <echo message="+==============================================================+" />
- <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK1.5 |" />
- <echo message="+==============================================================+" />
- <echo message="" />
+ <echo message=""/>
+ <echo message="AddressBookWS build file"/>
+ <echo message=""/>
+ <echo message="+==============================================================+"/>
+ <echo message="| Usage |"/>
+ <echo message="+==============================================================+"/>
+ <echo message=""/>
+ <echo message="deploy - deploy into servlet container"/>
+ <echo message="build - build jar-file"/>
+ <echo message="compile - compile source files"/>
+ <echo message="clean - remove build files"/>
+ <echo message="test - run unit tests"/>
+ <echo message=""/>
+ <echo message="+==============================================================+"/>
+ <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK1.5 |"/>
+ <echo message="+==============================================================+"/>
+ <echo message=""/>
</target>
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
-
<target name="dirs">
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${logs.dir}" />
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${logs.dir}"/>
</target>
<!-- ========================================= -->
<!-- clean - remove build files -->
<!-- ========================================= -->
-
<target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${logs.dir}" />
- <delete file="AddressBookWS.jar" />
+ <delete dir="${build.dir}"/>
+ <delete dir="${logs.dir}"/>
+ <delete file="AddressBookWS.jar"/>
</target>
<!-- ========================================= -->
<!-- verify - check environment -->
<!-- ========================================= -->
-
<target name="verify">
- <fail message="Failed to find the webapps directory. Set webapp.dir in the build.xml to your servlet container's webapp directory.">
+ <fail message="Failed to find the webapps directory. Set webapp.dir in the build.xml to your servlet container's webapp directory.">
<condition>
<not>
- <available file="${webapp.dir}" />
+ <available file="${webapp.dir}"/>
</not>
</condition>
</fail>
- <fail message="Failed to find the AnnotatedAxis webapp. Make sure the AnnotatedAxis is deployed to your webapps directory.">
+ <fail message="Failed to find the AnnotatedAxis webapp. Make sure the AnnotatedAxis is deployed to your webapps directory.">
<condition>
<not>
<isset property="AnnotatedAxis.base.dir"/>
@@ -168,5 +157,4 @@
</condition>
</fail>
</target>
-
</project>
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Address.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Address.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Address.java Fri Oct 29 13:13:18 2004
@@ -20,8 +20,7 @@
import java.io.Serializable;
-public class Address implements Serializable
-{
+public class Address implements Serializable {
private static final long serialVersionUID = 1L;
private int streetNum;
private java.lang.String streetName;
@@ -30,8 +29,6 @@
private int zip;
private Phone phoneNumber;
-
-
/**
* @param streetNum
* @param streetName
@@ -41,7 +38,7 @@
* @param phoneNumber
*/
public Address(int streetNum, java.lang.String streetName,
- java.lang.String city, StateType state, int zip, Phone phoneNumber) {
+ java.lang.String city, StateType state, int zip, Phone phoneNumber) {
super();
this.streetNum = streetNum;
this.streetName = streetName;
@@ -50,6 +47,7 @@
this.zip = zip;
this.phoneNumber = phoneNumber;
}
+
/**
*
*/
@@ -57,72 +55,84 @@
super();
// TODO Auto-generated constructor stub
}
+
/**
* @return Returns the city.
*/
public java.lang.String getCity() {
return city;
}
+
/**
* @param city The city to set.
*/
public void setCity(java.lang.String city) {
this.city = city;
}
+
/**
* @return Returns the phoneNumber.
*/
public Phone getPhoneNumber() {
return phoneNumber;
}
+
/**
* @param phoneNumber The phoneNumber to set.
*/
public void setPhoneNumber(Phone phoneNumber) {
this.phoneNumber = phoneNumber;
}
+
/**
* @return Returns the state.
*/
public StateType getState() {
return state;
}
+
/**
* @param state The state to set.
*/
public void setState(StateType state) {
this.state = state;
}
+
/**
* @return Returns the streetName.
*/
public java.lang.String getStreetName() {
return streetName;
}
+
/**
* @param streetName The streetName to set.
*/
public void setStreetName(java.lang.String streetName) {
this.streetName = streetName;
}
+
/**
* @return Returns the streetNum.
*/
public int getStreetNum() {
return streetNum;
}
+
/**
* @param streetNum The streetNum to set.
*/
public void setStreetNum(int streetNum) {
this.streetNum = streetNum;
}
+
/**
* @return Returns the zip.
*/
public int getZip() {
return zip;
}
+
/**
* @param zip The zip to set.
*/
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBook.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBook.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBook.java Fri Oct 29 13:13:18 2004
@@ -20,11 +20,10 @@
import java.rmi.Remote;
-public interface AddressBook extends Remote
-{
+public interface AddressBook extends Remote {
void addEntry(java.lang.String name, Address address)
- throws java.rmi.RemoteException;
+ throws java.rmi.RemoteException;
Address getAddressFromName(java.lang.String name)
- throws java.rmi.RemoteException;
+ throws java.rmi.RemoteException;
}
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookImpl.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookImpl.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookImpl.java Fri Oct 29 13:13:18 2004
@@ -18,22 +18,18 @@
* $Header:$
*/
-
import java.util.Hashtable;
import java.util.Map;
-public class AddressBookImpl implements AddressBook
-{
+public class AddressBookImpl implements AddressBook {
private Map<String, Address> addresses = new Hashtable<String, Address>();
- public void addEntry(String name, Address address)
- {
- System.out.println("addEntry is called." );
+ public void addEntry(String name, Address address) {
+ System.out.println("addEntry is called.");
this.addresses.put(name, address);
}
-
- public Address getAddressFromName(String name)
- {
+
+ public Address getAddressFromName(String name) {
System.out.println("getAddressFromName is called.");
return (Address) this.addresses.get(name);
}
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookService.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookService.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/AddressBookService.java Fri Oct 29 13:13:18 2004
@@ -23,9 +23,10 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.ServiceException;
-public interface AddressBookService extends Service
-{
+public interface AddressBookService extends Service {
String getAddressBookAddress();
+
AddressBook getAddressBook() throws ServiceException;
+
AddressBook getAddressBook(URL portAddress) throws ServiceException;
}
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Phone.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Phone.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/Phone.java Fri Oct 29 13:13:18 2004
@@ -20,28 +20,26 @@
import java.io.Serializable;
-public class Phone implements Serializable
-{
+public class Phone implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private int areaCode;
private java.lang.String exchange;
private java.lang.String number;
-
-
/**
* @param areaCode
* @param exchange
* @param number
*/
public Phone(int areaCode, java.lang.String exchange,
- java.lang.String number) {
+ java.lang.String number) {
super();
this.areaCode = areaCode;
this.exchange = exchange;
this.number = number;
}
+
/**
*
*/
@@ -49,36 +47,42 @@
super();
// TODO Auto-generated constructor stub
}
+
/**
* @return Returns the areaCode.
*/
public int getAreaCode() {
return areaCode;
}
+
/**
* @param areaCode The areaCode to set.
*/
public void setAreaCode(int areaCode) {
this.areaCode = areaCode;
}
+
/**
* @return Returns the exchange.
*/
public java.lang.String getExchange() {
return exchange;
}
+
/**
* @param exchange The exchange to set.
*/
public void setExchange(java.lang.String exchange) {
this.exchange = exchange;
}
+
/**
* @return Returns the number.
*/
public java.lang.String getNumber() {
return number;
}
+
/**
* @param number The number to set.
*/
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/StateType.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/StateType.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/src/org/beehive/demo/StateType.java Fri Oct 29 13:13:18 2004
@@ -20,12 +20,10 @@
import java.io.Serializable;
-public class StateType implements Serializable
-{
+public class StateType implements Serializable {
private static final long serialVersionUID = 1L;
String state;
-
-
+
/**
*
*/
@@ -33,6 +31,7 @@
super();
// TODO Auto-generated constructor stub
}
+
/**
* @param state
*/
@@ -40,6 +39,7 @@
super();
this.state = state;
}
+
/**
* @return Returns the state.
*/
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/tests/org/beehive/demo/AddressBookTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/tests/org/beehive/demo/AddressBookTest.java (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/tests/org/beehive/demo/AddressBookTest.java Fri Oct 29 13:13:18 2004
@@ -2,12 +2,12 @@
import junit.framework.TestCase;
-
/*
*
* Local version of unit test for the implementation class.
*
*/
+
public class AddressBookTest extends TestCase {
public void test1AddressBookWebServiceAddEntry() throws Exception {
@@ -17,35 +17,27 @@
// TBD - validate results
}
- public void test2AddressBookWebServiceGetAddressFromName() throws Exception
- {
+ public void test2AddressBookWebServiceGetAddressFromName() throws Exception {
int streetNum = 1022;
String streetName = "Wilsher Blvd";
String city = "LA";
StateType state = new StateType("CA");
int zip = 90023;
- Phone phoneNumber = new Phone(310,"000","1111");
-
+ Phone phoneNumber = new Phone(310, "000", "1111");
AddressBook addressBook = new AddressBookImpl();
Address addressOfNick =
- new Address(streetNum,streetName,city,state,zip,phoneNumber);
-
- addressBook.addEntry("NICK",addressOfNick);
-
+ new Address(streetNum, streetName, city, state, zip, phoneNumber);
+ addressBook.addEntry("NICK", addressOfNick);
Address address = addressBook.getAddressFromName("NICK");
-
assertTrue(address.getStreetNum() == addressOfNick.getStreetNum());
assertTrue(address.getStreetName() == addressOfNick.getStreetName());
assertTrue(address.getCity() == addressOfNick.getCity());
-
assertEquals(address.getState().getState(),
- addressOfNick.getState().getState());
-
+ addressOfNick.getState().getState());
assertTrue(address.getZip() == addressOfNick.getZip());
-
assertTrue(address.getPhoneNumber().getAreaCode() == addressOfNick.getPhoneNumber().getAreaCode());
assertEquals(address.getPhoneNumber().getExchange(), addressOfNick.getPhoneNumber().getExchange());
- assertEquals(address.getPhoneNumber().getNumber(),
- addressOfNick.getPhoneNumber().getNumber());
- }
+ assertEquals(address.getPhoneNumber().getNumber(),
+ addressOfNick.getPhoneNumber().getNumber());
+ }
}
Modified: incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/web/AddressBookWebService.jws
==============================================================================
--- incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/web/AddressBookWebService.jws (original)
+++ incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/web/AddressBookWebService.jws Fri Oct 29 13:13:18 2004
@@ -1,26 +1,22 @@
+
import java.rmi.RemoteException;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
import org.beehive.demo.Address;
import org.beehive.demo.AddressBook;
import org.beehive.demo.AddressBookImpl;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-@WebService( targetNamespace="http://www.beehive.com/AddressBook")
+@WebService(targetNamespace = "http://www.beehive.com/AddressBook")
public class AddressBookWebService implements AddressBook {
- AddressBook addressBook;
-
-
+ AddressBook addressBook;
+
public AddressBookWebService() {
- addressBook= new AddressBookImpl();
+ addressBook = new AddressBookImpl();
}
-
+
/**
* @param name
* @param address
@@ -30,6 +26,7 @@
public void addEntry(String name, Address address) throws RemoteException {
addressBook.addEntry(name, address);
}
+
/**
* @param name
* @return
@@ -39,8 +36,7 @@
public Address getAddressFromName(String name) throws RemoteException {
return addressBook.getAddressFromName(name);
}
-
-
+
public void notWebService() {
}
}
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java Fri Oct 29 13:13:18 2004
@@ -10,7 +10,6 @@
* where embedding the handler configuration directly in the Java source is not appropriate; for example, where the
* handler configuration needs to be shared across multiple Web Services, or where the handler chain consists of
* handlers for multiple transports.
- *
* It is an error to combine this annotation with the @SOAPMessageHandlers annotation.
*
* @author Copyright (c) 2004 by BEA Systems, Inc. All Rights Reserved.
@@ -29,4 +28,6 @@
* Name of the handler chain in the configuration file
*/
String name();
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java Fri Oct 29 13:13:18 2004
@@ -27,4 +27,6 @@
* The action for this operation. For SOAP bindings, this determines the value of the SOAPAction header.
*/
String action() default "";
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java Fri Oct 29 13:13:18 2004
@@ -48,4 +48,6 @@
* If true, the parameter is pulled from a message header rather then the message body.
*/
boolean header() default false;
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java Fri Oct 29 13:13:18 2004
@@ -26,4 +26,6 @@
* XML element. Defaults to the targetNamespace of the Web Service.
*/
String targetNamespace() default "";
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java Fri Oct 29 13:13:18 2004
@@ -13,7 +13,7 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = {ElementType.TYPE})
public @interface WebService {
-
+
/**
* The name of the Web Service. Used as the name of the wsdl:portType when mapped to WSDL 1.1.
* Defaults to the simple name of the Java class or interface
@@ -54,4 +54,6 @@
* generated into an implementation-defined package with an implementation defined name.
*/
String endpointInterface() default "";
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityIdentity.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityIdentity.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityIdentity.java Fri Oct 29 13:13:18 2004
@@ -23,4 +23,6 @@
* ejb-jar.xml.
*/
String value();
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityRoles.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityRoles.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/security/SecurityRoles.java Fri Oct 29 13:13:18 2004
@@ -31,4 +31,6 @@
* ejb-jar.xml
*/
String[] rolesReferenced() default {};
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/InitParam.java Fri Oct 29 13:13:18 2004
@@ -2,6 +2,7 @@
/**
* An initialization parameter
+ *
* @author Copyright (c) 2004 by BEA Systems, Inc. All Rights Reserved.
*/
public @interface InitParam {
@@ -15,5 +16,7 @@
* Value of the initialization parameter
*/
String value();
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java Fri Oct 29 13:13:18 2004
@@ -9,7 +9,6 @@
* Specifies the mapping of the Web Service onto the SOAP message protocol.
*
* @author Copyright (c) 2004 by BEA Systems, Inc. All Rights Reserved.
- *
*/
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = {ElementType.TYPE})
@@ -19,24 +18,24 @@
* The SOAP binding style
*/
public enum Style {
- DOCUMENT,
- RPC
+ DOCUMENT,
+ RPC
};
/**
* The SOAP binding use
*/
public enum Use {
- LITERAL,
- ENCODED
+ LITERAL,
+ ENCODED
};
/**
* The style of mapping parameters onto SOAP messages
*/
public enum ParameterStyle {
- BARE,
- WRAPPED
+ BARE,
+ WRAPPED
}
/**
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandler.java Fri Oct 29 13:13:18 2004
@@ -33,6 +33,8 @@
* documentation for javax.xml.namespace.QName.valueOf(String qNameAsString)
*/
String[] headers() default {};
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java Fri Oct 29 13:13:18 2004
@@ -8,7 +8,6 @@
/**
* Specifies a list of SOAP protocol handlers that run before and after business methods on the Web Service. These
* handlers are called in response to SOAP messages targeting the service.
- *
* The @SOAPMessageHandlers annotation is an array of SOAPMessageHandler types. The handlers are run in the order in
* which they appear in the annotation, starting with the first handler in the array.
*
@@ -19,4 +18,6 @@
public @interface SOAPMessageHandlers {
SOAPMessageHandler[] value();
-};
+}
+
+;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java Fri Oct 29 13:13:18 2004
@@ -39,42 +39,37 @@
import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
import org.apache.commons.logging.Log;
-/*******************************************************************************
+/**
+ * ****************************************************************************
* A few annotation specific things added and lots of code copied from the
* JWSHandler class by
- *
+ *
* @author Jonathan Colwell (jcolwell@bea.com)
- *
- * but most of the original code was written by:
+ * but most of the original code was written by:
* @author Glen Daniels (gdaniels@allaire.com)
* @author Doug Davis (dug@us.ibm.com)
* @author Sam Ruby (rubys@us.ibm.com)
- *
- * todo: fix directory structure/classloaders for output files
+ * todo: fix directory structure/classloaders for output files
*/
-public class AnnotatedWebServiceDeploymentHandler extends BasicHandler
-{
+public class AnnotatedWebServiceDeploymentHandler extends BasicHandler {
protected static Log log =
- LogFactory.getLog(AnnotatedWebServiceDeploymentHandler.class.getName());
+ LogFactory.getLog(AnnotatedWebServiceDeploymentHandler.class.getName());
protected Map<String, SOAPService> soapServices = new HashMap<String,
- SOAPService>();
+ SOAPService>();
/**
- * @param mc
- * @throws AxisFault
- */
+ * @param mc
+ * @throws AxisFault
+ */
public void invoke(MessageContext mc)
- throws AxisFault
- {
+ throws AxisFault {
try {
-
SOAPService ss =
- createSOAPServiceFromAnnotatedClass(findWebServiceClass(mc));
- if (null != ss)
- {
+ createSOAPServiceFromAnnotatedClass(findWebServiceClass(mc));
+ if (null != ss) {
ss.setEngine(mc.getAxisEngine());
- ss.init();
+ ss.init();
mc.setService(ss);
/*
* NOTE jcolwell@bea.com 2004-Oct-22 -- not sure why, but xsi
@@ -82,157 +77,130 @@
* to not send the types unless encoded.
*/
mc.setProperty(Call.SEND_TYPE_ATTR,
- new Boolean(Use.ENCODED
- .equals(ss.getUse())));
+ new Boolean(Use.ENCODED
+ .equals(ss.getUse())));
// blow away the real path to bypass the regular JWSHandler
mc.removeProperty(Constants.MC_REALPATH);
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw AxisFault.makeFault(e);
}
}
/**
- * @param mc
- * @throws AxisFault
- */
+ * @param mc
+ * @throws AxisFault
+ */
public void generateWSDL(MessageContext mc)
- throws AxisFault
- {
+ throws AxisFault {
invoke(mc);
}
/**
- * @param clazz
- * @return SOAPService
- * @throws Exception
- */
+ * @param clazz
+ * @return SOAPService
+ * @throws Exception
+ */
protected SOAPService createSOAPServiceFromAnnotatedClass(Class clazz)
- throws Exception
- {
+ throws Exception {
SOAPService rpc = null;
-
- if (null != clazz)
- {
+ if (null != clazz) {
rpc = soapServices.get(clazz.getName());
- if (null == rpc)
- {
+ if (null == rpc) {
WebServiceTYPEMetadata wsm =
- (WebServiceTYPEMetadata) WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
-
+ (WebServiceTYPEMetadata) WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
rpc = createSOAPServiceUsingAnnotations(wsm, clazz);
}
}
-
return rpc;
}
/**
- * @param wsm
- * @param cls
- * @return
- * @throws Exception
- */
+ * @param wsm
+ * @param cls
+ * @return
+ * @throws Exception
+ */
protected SOAPService createSOAPServiceUsingAnnotations(WebServiceTYPEMetadata wsm, Class cls)
- throws Exception
- {
+ throws Exception {
SOAPService rpc = null;
-
- if (null != wsm)
- {
+ if (null != wsm) {
HandlerHandler hh = new HandlerHandler();
hh.init(wsm);
rpc = new SOAPService(hh, new ControlProvider(), hh);
rpc.setName(wsm.getWsName());
- rpc.setOption(RPCProvider.OPTION_CLASSNAME, cls.getName() );
+ rpc.setOption(RPCProvider.OPTION_CLASSNAME, cls.getName());
// Take the setting for the scope option from the handler
// parameter named "scope"
- String scope = (String)getOption(RPCProvider.OPTION_SCOPE);
- if (null == scope)
- {
+ String scope = (String) getOption(RPCProvider.OPTION_SCOPE);
+ if (null == scope) {
scope = "Request";
}
rpc.setOption(RPCProvider.OPTION_SCOPE, scope);
-
ServiceDesc sd = AxisHook.createServiceDesc(wsm, cls.getClassLoader());
rpc.setServiceDescription(sd);
-
List allowedMethodNames = sd.getAllowedMethods();
Iterator allowIt = allowedMethodNames.iterator();
StringBuffer sb = new StringBuffer();
boolean firstPass = true;
- while (allowIt.hasNext())
- {
- if (firstPass)
- {
+ while (allowIt.hasNext()) {
+ if (firstPass) {
sb.append(' ');
firstPass = false;
}
- sb.append(((String)allowIt.next()));
+ sb.append(((String) allowIt.next()));
}
rpc.setOption(RPCProvider.OPTION_ALLOWEDMETHODS,
- sb.toString());
+ sb.toString());
rpc.setOption(RPCProvider.OPTION_WSDL_PORTTYPE,
- wsm.getWsName());
+ wsm.getWsName());
rpc.setOption(RPCProvider.OPTION_WSDL_SERVICEPORT,
- wsm.getWsName());
+ wsm.getWsName());
rpc.setOption(RPCProvider.OPTION_WSDL_SERVICEELEMENT,
- wsm.getWsServiceName());
- rpc.setOption(RPCProvider.OPTION_WSDL_TARGETNAMESPACE,
- wsm.getWsTargetNamespace());
-
+ wsm.getWsServiceName());
+ rpc.setOption(RPCProvider.OPTION_WSDL_TARGETNAMESPACE,
+ wsm.getWsTargetNamespace());
rpc.setStyle(sd.getStyle());
rpc.setUse(sd.getUse());
-
soapServices.put(cls.getName(), rpc);
}
return rpc;
}
-
+
/**
- * Mostly taken from Axis code base.
- *
- * @param mc
- * @return
- * @throws Exception
- */
+ * Mostly taken from Axis code base.
+ *
+ * @param mc
+ * @return
+ * @throws Exception
+ */
protected Class findWebServiceClass(MessageContext mc)
- throws Exception
- {
-
- if (null != mc) {
-
+ throws Exception {
+ if (null != mc) {
String relPath = mc.getStrProp(Constants.MC_RELATIVE_PATH);
- if(null != relPath ) {
+ if (null != relPath) {
// check to see if this is annotated class
// clean up the relative path to use as the class destination
// dir
- if ('/' == relPath.charAt(0))
- {
+ if ('/' == relPath.charAt(0)) {
relPath = relPath.substring(1);
}
- int indexOfDot = relPath.indexOf(".");
- if(-1 != indexOfDot) relPath=relPath.substring(0, indexOfDot);
- String clsName=relPath.replaceAll("/", ".");
+ int indexOfDot = relPath.indexOf(".");
+ if (-1 != indexOfDot) relPath = relPath.substring(0, indexOfDot);
+ String clsName = relPath.replaceAll("/", ".");
log.debug("look for webserivce in class: " + clsName);
-
try {
- Class result = getClass().getClassLoader().loadClass(clsName);
+ Class result = getClass().getClassLoader().loadClass(clsName);
return result;
- } catch (ClassNotFoundException e) {
- log.debug("class: " + clsName + " was not found by the AnnotatedWebServiceDeploymentHandler continue to the next handler. ");
+ } catch (ClassNotFoundException e) {
+ log.debug("class: " + clsName + " was not found by the AnnotatedWebServiceDeploymentHandler continue to the next handler. ");
return null;
- }
-
+ }
}
-
}
return null;
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java Fri Oct 29 13:13:18 2004
@@ -29,11 +29,16 @@
import javax.wsdl.OperationType;
import javax.xml.namespace.QName;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+import org.apache.axis.description.ElementDesc;
import org.apache.axis.description.FaultDesc;
+import org.apache.axis.description.FieldDesc;
import org.apache.axis.description.JavaServiceDesc;
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ParameterDesc;
import org.apache.axis.description.ServiceDesc;
+import org.apache.axis.description.TypeDesc;
import org.apache.axis.encoding.DeserializerFactory;
import org.apache.axis.encoding.SerializerFactory;
import org.apache.axis.encoding.TypeMapping;
@@ -45,18 +50,6 @@
import org.apache.axis.utils.BeanPropertyDescriptor;
import org.apache.axis.wsdl.fromJava.Namespaces;
import org.apache.axis.wsdl.fromJava.Types;
-import org.apache.axis.constants.Style;
-import org.apache.axis.constants.Use;
-import org.apache.axis.description.ElementDesc;
-import org.apache.axis.description.FaultDesc;
-import org.apache.axis.description.FieldDesc;
-import org.apache.axis.description.ServiceDesc;
-import org.apache.axis.description.TypeDesc;
-import org.apache.axis.description.JavaServiceDesc;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.description.OperationDesc;
-import org.apache.axis.utils.BeanPropertyDescriptor;
-import org.apache.axis.utils.BeanUtils;
import org.apache.beehive.wsm.axis.util.encoding.CollectionSerializerFactory;
import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
@@ -67,8 +60,8 @@
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@@ -76,13 +69,10 @@
public static ServiceDesc createServiceDesc(WebServiceTYPEMetadata wsm,
ClassLoader cl)
- throws ClassNotFoundException,
- NoSuchMethodException,
- InvalidTypeMappingException
- {
-
+ throws ClassNotFoundException,
+ NoSuchMethodException,
+ InvalidTypeMappingException {
JavaServiceDesc sd = new JavaServiceDesc();
-
if (cl == null) {
/*
* NOTE jcolwell@bea.com 2004-Aug-30 -- if no classloader
@@ -90,142 +80,112 @@
*/
cl = AxisHook.class.getClassLoader();
}
-
Class serviceClass = cl.loadClass(wsm.getServiceImplementationBean());
-
String portType = wsm.getWsName();
sd.setName(portType);
sd.setImplClass(serviceClass);
-
String targetNamespace = wsm.getWsTargetNamespace();
sd.setDefaultNamespace(targetNamespace);
-
-
SOAPBindingInfo sbi = wsm.getSoapBinding();
configureSoapBinding(sd, sbi);
-
Collection<WebServiceMETHODMetadata> methods = wsm.getMethods();
List<String> allowedMethods = new ArrayList<String>();
for (WebServiceMETHODMetadata meth : methods) {
-
String operationName = meth.getWmOperationName();
-
if (operationName != null && operationName.length() > 0) {
-
OperationDesc od = new OperationDesc();
-
String javaMethodName = meth.getJavaMethodName();
od.setElementQName(new QName(operationName));
od.setName(operationName);
allowedMethods.add(operationName);
-
od.setSoapAction(meth.getWmAction());
-
if (meth.isOneWay()) {
od.setMep(OperationType.ONE_WAY);
- }
- else {
+ } else {
od.setReturnQName(new QName(meth.getWrTargetNamespace(),
- meth.getWrName()));
+ meth.getWrName()));
Class returnType = meth.getJavaReturnType();
QName type = configureTypeMapping(sd, returnType);
od.setReturnType(type);
od.setReturnClass(returnType);
//od.setReturnHeader(
}
-
List<WebServicePARAMETERMetadata> parameters = meth.getParams();
- List<Class> paramClasses = new ArrayList<Class>();
-
+ List<Class> paramClasses = new ArrayList<Class>();
for (WebServicePARAMETERMetadata param : parameters) {
-
ParameterDesc pd = new ParameterDesc();
pd.setQName(new QName(param.getWpTargetNamespace(),
- param.getWpName()));
+ param.getWpName()));
Class paramType = param.getJavaType();
configureTypeMapping(sd, paramType);
pd.setJavaType(paramType);
paramClasses.add(paramType);
-
WebParam.Mode mo = param.getWpMode();
switch (mo) {
- case OUT:
- pd.setMode(ParameterDesc.OUT);
- pd.setInHeader(false);
- pd.setOutHeader(param.isWpHeader());
- break;
-
- case INOUT:
- pd.setMode(ParameterDesc.INOUT);
- boolean header = param.isWpHeader();
- pd.setInHeader(header);
- pd.setOutHeader(header);
- break;
-
- case IN:
- default:
- pd.setMode(ParameterDesc.IN);
- pd.setInHeader(param.isWpHeader());
- pd.setOutHeader(false);
+ case OUT:
+ pd.setMode(ParameterDesc.OUT);
+ pd.setInHeader(false);
+ pd.setOutHeader(param.isWpHeader());
+ break;
+ case INOUT:
+ pd.setMode(ParameterDesc.INOUT);
+ boolean header = param.isWpHeader();
+ pd.setInHeader(header);
+ pd.setOutHeader(header);
+ break;
+ case IN:
+ default:
+ pd.setMode(ParameterDesc.IN);
+ pd.setInHeader(param.isWpHeader());
+ pd.setOutHeader(false);
}
od.addParameter(pd);
}
-
Method javaMethod = serviceClass
- .getMethod(meth.getJavaMethodName(),
- paramClasses.toArray(new Class[paramClasses.size()]));
+ .getMethod(meth.getJavaMethodName(),
+ paramClasses.toArray(new Class[paramClasses.size()]));
for (Class thrown : javaMethod.getExceptionTypes()) {
FaultDesc fd = new FaultDesc();
fd.setClassName(thrown.getName());
od.addFault(fd);
}
-
od.setMethod(javaMethod);
-
sd.addOperationDesc(od);
}
}
sd.setAllowedMethods(allowedMethods);
-
return sd;
}
- private static boolean isActivationEnabled()
- {
+ private static boolean isActivationEnabled() {
return null != getDataHandlerClass() && null != getMultipartClass();
}
- private static Class getDataHandlerClass()
- {
+ private static Class getDataHandlerClass() {
try {
return AxisHook.class.getClassLoader()
- .loadClass("javax.activation.DataHandler");
+ .loadClass("javax.activation.DataHandler");
+ } catch (Exception e) {
}
- catch (Exception e) { }
return null;
}
- private static Class getMultipartClass()
- {
+ private static Class getMultipartClass() {
try {
return AxisHook.class.getClassLoader()
- .loadClass("javax.mail.internet.MimeMultipart");
+ .loadClass("javax.mail.internet.MimeMultipart");
+ } catch (Exception e) {
}
- catch (Exception e) { }
return null;
}
private static QName configureTypeMapping(ServiceDesc desc, Class type)
- throws InvalidTypeMappingException {
-
+ throws InvalidTypeMappingException {
if (Void.TYPE.equals(type)) {
return null;
- }
- else {
-
+ } else {
TypeMapping tm = desc.getTypeMapping();
QName q = tm.getTypeQName(type);
-
if (Collection.class.isAssignableFrom(type)) {
/*
* NOTE jcolwell@bea.com 2004-Oct-11 --
@@ -234,48 +194,37 @@
* since the namespace prefix is left hanging with literal use
*/
q = generateQName(type, desc);
- tm.register( type, q,
- new CollectionSerializerFactory(type, q),
- new VectorDeserializerFactory(type, q));
- }
- else {
-
+ tm.register(type, q,
+ new CollectionSerializerFactory(type, q),
+ new VectorDeserializerFactory(type, q));
+ } else {
if (q == null) {
q = generateQName(type, desc);
}
-
if (type.isArray()) {
-
- if (! tm.isRegistered(type, q)) {
-
+ if (!tm.isRegistered(type, q)) {
tm.register(type, q,
- new ArraySerializerFactory(type, q),
- new ArrayDeserializerFactory());
-
-
+ new ArraySerializerFactory(type, q),
+ new ArrayDeserializerFactory());
}
q = configureTypeMapping(desc,
- type.getComponentType());
- }
- else if (! tm.isRegistered(type, q)) {
-
+ type.getComponentType());
+ } else if (!tm.isRegistered(type, q)) {
if (XmlObject.class.isAssignableFrom(type)) {
q = XmlBeans.typeForClass(type).getName();
tm.register(type, q,
- new XmlBeanSerializerFactory(type, q),
- new XmlBeanDeserializerFactory(type, q));
+ new XmlBeanSerializerFactory(type, q),
+ new XmlBeanDeserializerFactory(type, q));
}
/*
* NOTE jcolwell@bea.com 2004-Oct-11 -- these datahandler
* using classes are generally already registered but
* just in case...
- */
-
+ */
else if (isActivationEnabled() &&
- (java.awt.Image.class.isAssignableFrom(type)
- || getMultipartClass().isAssignableFrom(type)
- || getDataHandlerClass().isAssignableFrom(type))) {
-
+ (java.awt.Image.class.isAssignableFrom(type)
+ || getMultipartClass().isAssignableFrom(type)
+ || getDataHandlerClass().isAssignableFrom(type))) {
try {
/*
* NOTE jcolwell@bea.com 2004-Oct-08 -- doing
@@ -283,136 +232,120 @@
* attachment support.
*/
ClassLoader cl = AxisHook.class.getClassLoader();
- Class<SerializerFactory> sfClass =
- (Class<SerializerFactory>)
- cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
- Class<DeserializerFactory> dsfClass =
- (Class<DeserializerFactory>)
- cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
- Constructor<SerializerFactory> sfCon =
- sfClass.getConstructor(Class.class,
- QName.class);
+ Class<SerializerFactory> sfClass =
+ (Class<SerializerFactory>)
+ cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
+ Class<DeserializerFactory> dsfClass =
+ (Class<DeserializerFactory>)
+ cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
+ Constructor<SerializerFactory> sfCon =
+ sfClass.getConstructor(Class.class,
+ QName.class);
Constructor<DeserializerFactory> dsfCon =
- dsfClass.getConstructor(Class.class,
- QName.class);
-
+ dsfClass.getConstructor(Class.class,
+ QName.class);
SerializerFactory sf = sfCon.newInstance(type, q);
DeserializerFactory dsf = dsfCon.newInstance(type, q);
-
tm.register(type, q, sf, dsf);
-
- }
- catch (Exception e) {
+ } catch (Exception e) {
/*
* FIXME jcolwell@bea.com 2004-Oct-08 --
* log this properly
*/
e.printStackTrace();
}
- }
- else if (Serializable.class.isAssignableFrom(type)
- /*
- * NOTE jcolwell@bea.com 2004-Oct-11 --
- * java.io.Serializable is required and
- * java.rmi.Remote is prohibited
- * by the jax-rpc spec
- */
- && !Remote.class.isAssignableFrom(type)
- /*
- * NOTE jcolwell@bea.com 2004-Oct-11 --
- * restricting against File since even though it
- * is technically serializable, it doesn't make
- * sense to serialize as a bean.
- * That and it causes an infinite
- * loop as it keeps returning itself from the
- * getAbsoluteFile and getCanonicalFile calls
- */
- && !File.class.isAssignableFrom(type)) {
-
+ } else if (Serializable.class.isAssignableFrom(type)
+ /*
+ * NOTE jcolwell@bea.com 2004-Oct-11 --
+ * java.io.Serializable is required and
+ * java.rmi.Remote is prohibited
+ * by the jax-rpc spec
+ */
+ && !Remote.class.isAssignableFrom(type)
+ /*
+ * NOTE jcolwell@bea.com 2004-Oct-11 --
+ * restricting against File since even though it
+ * is technically serializable, it doesn't make
+ * sense to serialize as a bean.
+ * That and it causes an infinite
+ * loop as it keeps returning itself from the
+ * getAbsoluteFile and getCanonicalFile calls
+ */
+ && !File.class.isAssignableFrom(type)) {
TypeDesc td = TypeDesc.getTypeDescForClass(type);
TypeDesc superTd = null;
BeanPropertyDescriptor[] superPd = null;
if (null == td) {
td = new TypeDesc(type);
-
Class supa = type.getSuperclass();
-
- if ((supa != null)
- && (supa != java.lang.Object.class)
- && (supa != java.lang.Exception.class)
- && (supa != java.lang.Throwable.class)
- && (supa != java.rmi.RemoteException.class)
- && (supa != org.apache.axis.AxisFault.class)) {
+ if ((supa != null)
+ && (supa != java.lang.Object.class)
+ && (supa != java.lang.Exception.class)
+ && (supa != java.lang.Throwable.class)
+ && (supa != java.rmi.RemoteException.class)
+ && (supa != org.apache.axis.AxisFault.class)) {
configureTypeMapping(desc, supa);
}
-
superTd = TypeDesc
- .getTypeDescForClass(supa);
-
+ .getTypeDescForClass(supa);
if (superTd != null) {
superPd = superTd.getPropertyDescriptors();
}
td.setXmlType(q);
TypeDesc.registerTypeDescForClass(type, td);
-
- }
- else {
+ } else {
td = null;
}
- tm.register( type, q,
- new BeanSerializerFactory(type, q),
- /*
- * NOTE jcolwell@bea.com 2004-Oct-11 --
- * should check that the type to deserialize
- * has a default contructor but with this
- * setup there is no way to know if it is
- * used only in serialization.
- */
- new BeanDeserializerFactory(type, q));
+ tm.register(type, q,
+ new BeanSerializerFactory(type, q),
+ /*
+ * NOTE jcolwell@bea.com 2004-Oct-11 --
+ * should check that the type to deserialize
+ * has a default contructor but with this
+ * setup there is no way to know if it is
+ * used only in serialization.
+ */
+ new BeanDeserializerFactory(type, q));
Map serProps = BeanDeserializerFactory
- .getProperties(type, null);
+ .getProperties(type, null);
for (BeanPropertyDescriptor beanProps :
- (Collection<BeanPropertyDescriptor>)serProps
- .values()) {
+ (Collection<BeanPropertyDescriptor>) serProps
+ .values()) {
Class subType = beanProps.getType();
- if (!(subType.isPrimitive()
- || subType.getName().startsWith("java.")
- || subType.getName().startsWith("javax."))) {
+ if (!(subType.isPrimitive()
+ || subType.getName().startsWith("java.")
+ || subType.getName().startsWith("javax."))) {
configureTypeMapping(desc, subType);
}
-
if (td != null) {
String ns = q.getNamespaceURI();
if (superTd != null && superPd != null) {
- for (int j=0; j<superPd.length; j++) {
+ for (int j = 0; j < superPd.length; j++) {
if (beanProps.getName()
- .equals(superPd[j]
- .getName())) {
+ .equals(superPd[j]
+ .getName())) {
ns = superTd.getXmlType()
- .getNamespaceURI();
+ .getNamespaceURI();
break;
}
}
}
-
FieldDesc fd = new ElementDesc();
fd.setJavaType(subType);
fd.setFieldName(beanProps.getName());
-
fd.setXmlName(new QName(ns,
- beanProps.getName()));
+ beanProps.getName()));
// NOTE jcolwell@bea.com 2004-Oct-28 -- might need
// to do more to ensure a useful type QName.
fd.setXmlType(tm.getTypeQName(subType));
td.addFieldDesc(fd);
}
}
- }
- else {
+ } else {
throw new InvalidTypeMappingException
- ("failed to register " + type.getName()
- + " as a valid web service datatype,"
- + " consider using a custom type mapping");
+ ("failed to register " + type.getName()
+ + " as a valid web service datatype,"
+ + " consider using a custom type mapping");
}
}
}
@@ -420,47 +353,37 @@
}
}
-
- private static QName generateQName(Class type, ServiceDesc desc)
- {
-
- String namespace = Namespaces.makeNamespace(type.getName()) ;
- if (namespace == null || namespace
- .endsWith("DefaultNamespace")) {
+ private static QName generateQName(Class type, ServiceDesc desc) {
+ String namespace = Namespaces.makeNamespace(type.getName());
+ if (namespace == null || namespace
+ .endsWith("DefaultNamespace")) {
namespace = desc.getDefaultNamespace();
}
- return new QName(namespace,
- Types.getLocalNameFromFullName(type.getName()));
-
+ return new QName(namespace,
+ Types.getLocalNameFromFullName(type.getName()));
}
protected static void configureSoapBinding(ServiceDesc sd,
- SOAPBindingInfo sbi)
- {
-
- javax.jws.soap.SOAPBinding.Style style
- = javax.jws.soap.SOAPBinding.Style.DOCUMENT;
+ SOAPBindingInfo sbi) {
+ javax.jws.soap.SOAPBinding.Style style
+ = javax.jws.soap.SOAPBinding.Style.DOCUMENT;
javax.jws.soap.SOAPBinding.Use use
- = javax.jws.soap.SOAPBinding.Use.LITERAL;
+ = javax.jws.soap.SOAPBinding.Use.LITERAL;
javax.jws.soap.SOAPBinding.ParameterStyle paramStyle
- = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED;
-
+ = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED;
if (sbi != null) {
- style = sbi.getStyle();
- use = sbi.getUse();
- paramStyle = sbi.getParameterStyle();
+ style = sbi.getStyle();
+ use = sbi.getUse();
+ paramStyle = sbi.getParameterStyle();
}
-
if (style == style.RPC) {
sd.setStyle(Style.RPC);
if (use == use.ENCODED) {
sd.setUse(Use.ENCODED);
- }
- else {
+ } else {
sd.setUse(Use.LITERAL);
}
- }
- else {
+ } else {
/*
* since DOCUMENT ENCODED is not valid so
* force to use LITERAL
@@ -470,12 +393,11 @@
// check if this is a wrapped document literal
if (paramStyle == paramStyle.WRAPPED) {
sd.setStyle(Style.WRAPPED);
- }
- else {
+ } else {
// just regular document style
sd.setStyle(Style.DOCUMENT);
}
- }
+ }
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java Fri Oct 29 13:13:18 2004
@@ -30,42 +30,36 @@
import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.runtime.bean.ControlContainerContext;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
-public class ControlProvider extends RPCProvider
-{
+public class ControlProvider extends RPCProvider {
protected Object makeNewServiceObject(MessageContext msgContext, String clsName)
- throws Exception
- {
+ throws Exception {
Object obj = super.makeNewServiceObject(msgContext, clsName);
initializeControls(obj);
return obj;
}
- private void initializeControls(Object obj) throws Exception
- {
+ private void initializeControls(Object obj) throws Exception {
Class cls = obj.getClass();
Field[] fields = cls.getFields();
// search for fields with @Control annotations
- for (Field field : fields)
- {
- if (null != field.getAnnotation(Control.class))
- {
+ for (Field field : fields) {
+ if (null != field.getAnnotation(Control.class)) {
//attempt to load using client initializer.
ControlContainerContext ccc =
- ControlContainerContext.getContext();
- if (null == ccc)
- {
+ ControlContainerContext.getContext();
+ if (null == ccc) {
throw new Exception("no control container context found");
}
Class clientInitializer =
- cls.getClassLoader().loadClass(cls.getName() + "ClientInitializer");
+ cls.getClassLoader().loadClass(cls.getName() + "ClientInitializer");
Method init =
- clientInitializer.getMethod("initialize", ControlBeanContext.class, cls);
+ clientInitializer.getMethod("initialize", ControlBeanContext.class, cls);
init.invoke(null, ccc, obj);
break;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java Fri Oct 29 13:13:18 2004
@@ -31,10 +31,10 @@
import com.sun.tools.apt.main.Main;
import org.apache.axis.configuration.FileProvider;
+import org.apache.axis.deployment.wsdd.WSDDConstants;
import org.apache.axis.deployment.wsdd.WSDDDeployment;
import org.apache.axis.deployment.wsdd.WSDDOperation;
import org.apache.axis.deployment.wsdd.WSDDService;
-import org.apache.axis.deployment.wsdd.WSDDConstants;
import org.apache.axis.description.JavaServiceDesc;
import org.apache.axis.description.OperationDesc;
import org.apache.axis.encoding.SerializationContext;
@@ -42,8 +42,8 @@
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
import org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessor;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@@ -56,8 +56,7 @@
* Currently, the usage is:
* <output wsdd> <input wsdd> <assorted APT and javac options> <source files>
*/
- public static void main(String[] args) throws Exception
- {
+ public static void main(String[] args) throws Exception {
if (args.length > 2) {
String wsddOut = args[0];
String wsddIn = args[1];
@@ -67,15 +66,12 @@
for (String arg : aptArgs) {
System.out.println(arg);
}
-
Main apt = new Main("AxisApt");
-
if (0 == apt.compile(aptArgs)) {
DeploymentDumper dd = new DeploymentDumper();
dd.createAxisDeployment(dd.retrieveWebServiceMetadata(),
- wsddOut,
- wsddIn);
-
+ wsddOut,
+ wsddIn);
}
}
}
@@ -83,14 +79,12 @@
public void createAxisDeployment(Collection<WebServiceTYPEMetadata> wsms,
String newConfigFilename,
String existingConfigFilename)
- throws Exception
- {
+ throws Exception {
Writer fw = new OutputStreamWriter
- (new FileOutputStream(newConfigFilename), "UTF-8");
+ (new FileOutputStream(newConfigFilename), "UTF-8");
SerializationContext serial = new SerializationContext(fw);
serial.setPretty(true);
serial.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-
if (existingConfigFilename != null) {
FileProvider fp = new FileProvider(existingConfigFilename);
@@ -105,17 +99,13 @@
* the current directory.
*/
fp.configureEngine(new AxisServer());
-
WSDDDeployment dep = fp.getDeployment();
-
if (dep != null) {
-
- for (WebServiceTYPEMetadata wsm : wsms) {
+ for (WebServiceTYPEMetadata wsm : wsms) {
WSDDService wsds = new WSDDService();
-
JavaServiceDesc sd = (JavaServiceDesc)
- AxisHook.createServiceDesc(wsm, getClass()
- .getClassLoader());
+ AxisHook.createServiceDesc(wsm, getClass()
+ .getClassLoader());
wsds.setName(sd.getName());
/*
* NOTE jcolwell@bea.com 2004-Sep-08 --
@@ -124,7 +114,7 @@
wsds.setQName(new QName(sd.getDefaultNamespace(),
sd.getName()));
*/
- wsds.setProviderQName(WSDDConstants.QNAME_JAVARPC_PROVIDER);
+ wsds.setProviderQName(WSDDConstants.QNAME_JAVARPC_PROVIDER);
wsds.setUse(sd.getUse());
wsds.setStyle(sd.getStyle());
@@ -138,25 +128,22 @@
*/
// sd.setImplClass(null);
- List<OperationDesc> ops = (List<OperationDesc>)sd
- .getOperations();
-
+ List<OperationDesc> ops = (List<OperationDesc>) sd
+ .getOperations();
for (OperationDesc op : ops) {
wsds.addOperation(new WSDDOperation(op));
}
-
List allowedMethods = sd.getAllowedMethods();
StringBuffer allowedNames = new StringBuffer(allowedMethods
- .size());
+ .size());
boolean firstRun = true;
for (Object methName : allowedMethods) {
if (firstRun) {
firstRun = false;
- }
- else {
+ } else {
allowedNames.append(' ');
}
- allowedNames.append((String)methName);
+ allowedNames.append((String) methName);
}
wsds.setParameter("allowedMethods", allowedNames.toString());
wsds.setParameter("className", sd.getImplClass().getName());
@@ -169,22 +156,20 @@
*/
dep.deployService(wsds);
}
- dep.writeToContext(serial);
+ dep.writeToContext(serial);
}
}
fw.close();
}
- protected Collection<WebServiceTYPEMetadata> retrieveWebServiceMetadata()
- {
- Collection<WebServiceTYPEMetadata> meta =
- new ArrayList<WebServiceTYPEMetadata>();
-
+ protected Collection<WebServiceTYPEMetadata> retrieveWebServiceMetadata() {
+ Collection<WebServiceTYPEMetadata> meta =
+ new ArrayList<WebServiceTYPEMetadata>();
Set<String> keys = WsmAnnotationProcessor.getObjectModelNames();
for (String key : keys) {
- meta.add((WebServiceTYPEMetadata)WsmAnnotationProcessor
- .getObjectModel(key));
+ meta.add((WebServiceTYPEMetadata) WsmAnnotationProcessor
+ .getObjectModel(key));
}
- return meta;
+ return meta;
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java Fri Oct 29 13:13:18 2004
@@ -37,9 +37,9 @@
import org.apache.axis.AxisFault;
import org.apache.axis.Constants;
import org.apache.axis.MessageContext;
-import org.apache.axis.constants.Use;
import org.apache.axis.client.Call;
import org.apache.axis.components.logger.LogFactory;
+import org.apache.axis.constants.Use;
import org.apache.axis.description.ServiceDesc;
import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.handlers.soap.SOAPService;
@@ -54,42 +54,38 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-/*******************************************************************************
- * A few annotation specific things added and lots of code copied
+/**
+ * ****************************************************************************
+ * A few annotation specific things added and lots of code copied
* from the JWSHandler class by
*
* @author Jonathan Colwell (jcolwell@bea.com)
- *
- * but most of the original code was written by:
+ * but most of the original code was written by:
* @author Glen Daniels (gdaniels@allaire.com)
* @author Doug Davis (dug@us.ibm.com)
* @author Sam Ruby (rubys@us.ibm.com)
- *
- * todo: fix directory structure/classloaders for output files
+ * todo: fix directory structure/classloaders for output files
*/
-public class DropInDeploymentHandler extends BasicHandler
-{
+public class DropInDeploymentHandler extends BasicHandler {
protected static Log log =
- LogFactory.getLog(DropInDeploymentHandler.class.getName());
+ LogFactory.getLog(DropInDeploymentHandler.class.getName());
protected Map<String, SOAPService> soapServices = new HashMap<String,
- SOAPService>();
+ SOAPService>();
/**
* @param mc
* @throws AxisFault
*/
public void invoke(MessageContext mc)
- throws AxisFault
- {
+ throws AxisFault {
try {
- if( null != mc.getService()) return; // previous handler(s) took care of the url.
+ if (null != mc.getService()) return; // previous handler(s) took care of the url.
SOAPService ss =
- createSOAPServiceFromAnnotatedClass(compileDroppedInSource(mc));
- if (null != ss)
- {
+ createSOAPServiceFromAnnotatedClass(compileDroppedInSource(mc));
+ if (null != ss) {
ss.setEngine(mc.getAxisEngine());
- ss.init();
+ ss.init();
mc.setService(ss);
/*
* NOTE jcolwell@bea.com 2004-Oct-22 --
@@ -98,26 +94,22 @@
* encoded.
*/
mc.setProperty(Call.SEND_TYPE_ATTR,
- new Boolean(Use.ENCODED
- .equals(ss.getUse())));
+ new Boolean(Use.ENCODED
+ .equals(ss.getUse())));
// blow away the real path to bypass the regular JWSHandler
mc.removeProperty(Constants.MC_REALPATH);
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw AxisFault.makeFault(e);
}
}
/**
- * @param mc
- * throws AxisFault
+ * @param mc throws AxisFault
*/
public void generateWSDL(MessageContext mc)
- throws AxisFault
- {
+ throws AxisFault {
invoke(mc);
}
@@ -127,22 +119,16 @@
* @throws Exception
*/
protected SOAPService createSOAPServiceFromAnnotatedClass(Class clazz)
- throws Exception
- {
+ throws Exception {
SOAPService rpc = null;
-
- if (null != clazz)
- {
+ if (null != clazz) {
rpc = soapServices.get(clazz.getName());
- if (null == rpc)
- {
+ if (null == rpc) {
WebServiceTYPEMetadata wsm =
- (WebServiceTYPEMetadata) WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
-
+ (WebServiceTYPEMetadata) WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
rpc = createSOAPServiceUsingAnnotations(wsm, clazz);
}
}
-
return rpc;
}
@@ -153,120 +139,92 @@
* @throws Exception
*/
protected SOAPService createSOAPServiceUsingAnnotations(WebServiceTYPEMetadata wsm, Class cls)
- throws Exception
- {
+ throws Exception {
SOAPService rpc = null;
-
- if (null != wsm)
- {
+ if (null != wsm) {
HandlerHandler hh = new HandlerHandler();
hh.init(wsm);
rpc = new SOAPService(hh, new ControlProvider(), hh);
rpc.setName(wsm.getWsName());
- rpc.setOption(RPCProvider.OPTION_CLASSNAME, cls.getName() );
+ rpc.setOption(RPCProvider.OPTION_CLASSNAME, cls.getName());
// Take the setting for the scope option from the handler
// parameter named "scope"
- String scope = (String)getOption(RPCProvider.OPTION_SCOPE);
- if (null == scope)
- {
+ String scope = (String) getOption(RPCProvider.OPTION_SCOPE);
+ if (null == scope) {
scope = "Request";
}
rpc.setOption(RPCProvider.OPTION_SCOPE, scope);
-
ServiceDesc sd = AxisHook.createServiceDesc(wsm, cls.getClassLoader());
rpc.setServiceDescription(sd);
-
List allowedMethodNames = sd.getAllowedMethods();
Iterator allowIt = allowedMethodNames.iterator();
StringBuffer sb = new StringBuffer();
boolean firstPass = true;
- while (allowIt.hasNext())
- {
- if (firstPass)
- {
+ while (allowIt.hasNext()) {
+ if (firstPass) {
sb.append(' ');
firstPass = false;
}
- sb.append(((String)allowIt.next()));
+ sb.append(((String) allowIt.next()));
}
rpc.setOption(RPCProvider.OPTION_ALLOWEDMETHODS,
- sb.toString());
+ sb.toString());
rpc.setOption(RPCProvider.OPTION_WSDL_PORTTYPE,
- wsm.getWsName());
+ wsm.getWsName());
rpc.setOption(RPCProvider.OPTION_WSDL_SERVICEPORT,
- wsm.getWsName());
+ wsm.getWsName());
rpc.setOption(RPCProvider.OPTION_WSDL_SERVICEELEMENT,
- wsm.getWsServiceName());
- rpc.setOption(RPCProvider.OPTION_WSDL_TARGETNAMESPACE,
- wsm.getWsTargetNamespace());
-
+ wsm.getWsServiceName());
+ rpc.setOption(RPCProvider.OPTION_WSDL_TARGETNAMESPACE,
+ wsm.getWsTargetNamespace());
rpc.setStyle(sd.getStyle());
rpc.setUse(sd.getUse());
-
soapServices.put(cls.getName(), rpc);
}
return rpc;
}
-
+
/**
* Mostly taken from Axis code base.
+ *
* @param mc
* @return
* @throws Exception
*/
protected Class compileDroppedInSource(MessageContext mc)
- throws Exception
- {
+ throws Exception {
final String EXTENSION_JWS = ".jws";
final String EXTENSION_JAVA = ".java";
final String EXTENSION_CLASS = ".class";
-
- if (null != mc)
- {
+ if (null != mc) {
// get extension for jws-files; typically ".jws"
String extension = (String) getOption("extension");
- if (null == extension)
- {
+ if (null == extension) {
extension = EXTENSION_JWS;
}
-
String realpath = mc.getStrProp(Constants.MC_REALPATH);
- if ((null != realpath) && (realpath.endsWith(extension)))
- {
+ if ((null != realpath) && (realpath.endsWith(extension))) {
// grab the *.jws filename from context; placed there by HTTPActionHandler
String srcPath = realpath;
String relPath = mc.getStrProp(Constants.MC_RELATIVE_PATH);
// check if file exists
File srcFile = new File(srcPath);
- if (! srcFile.exists())
- {
+ if (!srcFile.exists()) {
// report error with relative path to avoid giving out directory info
throw new FileNotFoundException(relPath);
}
// clean up the relative path to use as the class destination dir
- if ('/' == relPath.charAt(0))
- {
+ if ('/' == relPath.charAt(0)) {
relPath = relPath.substring(1);
}
- /*
- int lastSlash = relPath.lastIndexOf('/');
- String dir = null;
-
- if (0 < lastSlash)
- {
- dir = relPath.substring(0, lastSlash);
- }
- String relativeOutputPath = relPath.substring(lastSlash + 1);
- */
String relativeOutputPath = relPath;
String outDirPath = mc.getStrProp(Constants.MC_JWS_CLASSDIR);
- if (null == outDirPath)
- {
- outDirPath = "." ;
+ if (null == outDirPath) {
+ outDirPath = ".";
}
// Build matching directory structure under the output
@@ -285,76 +243,63 @@
// allowed to.
// !!! TODO: add a switch to control this.
File outDirectory = new File(outDirPath);
- if (! outDirectory.exists())
- {
+ if (!outDirectory.exists()) {
outDirectory.mkdirs();
}
-
- String jFile = outDirPath + File.separator
- + relativeOutputPath
- .substring(0, relativeOutputPath.length()-extension.length())
- + EXTENSION_JAVA;
-
- String cFile = outDirPath + File.separator
- + relativeOutputPath
- .substring(0, relativeOutputPath.length()-extension.length())
- + EXTENSION_CLASS;
-
+ String jFile = outDirPath + File.separator
+ + relativeOutputPath
+ .substring(0, relativeOutputPath.length() - extension.length())
+ + EXTENSION_JAVA;
+ String cFile = outDirPath + File.separator
+ + relativeOutputPath
+ .substring(0, relativeOutputPath.length() - extension.length())
+ + EXTENSION_CLASS;
File clsFile = new File(cFile);
// get class name
//String clsName = srcFile.getName();
String clsName = relativeOutputPath;
- if ((null != clsName) && ('/' == clsName.charAt(0)))
- {
+ if ((null != clsName) && ('/' == clsName.charAt(0))) {
clsName = clsName.substring(1);
}
clsName = clsName.substring(0, clsName.length() - 4);
clsName = clsName.replace('/', '.');
// compile the source file if necessary
- if ((! clsFile.exists()) || (srcFile.lastModified() > clsFile.lastModified()))
- {
+ if ((!clsFile.exists()) || (srcFile.lastModified() > clsFile.lastModified())) {
File javaFile = new File(jFile);
try {
- copyFile(srcFile,javaFile);
+ copyFile(srcFile, javaFile);
if (0 != compile(ClasspathUtils
- .getDefaultClasspath(mc),
- outDirPath, jFile))
- {
+ .getDefaultClasspath(mc),
+ outDirPath, jFile)) {
clsFile.delete();
}
ClassUtils.removeClassLoader(clsName);
soapServices.remove(clsName);
// clean out the cached service
- }
- finally {
+ } finally {
javaFile.delete();
}
}
// load class from disk & return it
ClassLoader cl = ClassUtils.getClassLoader(clsName);
- if (null == cl)
- {
+ if (null == cl) {
// todo: cl = new JWSClassLoader(clsName, mc.getClassLoader(), cFile);
- cl = new URLClassLoader(
- new URL[]{outDirectory.toURL()},
- mc.getClassLoader()
- );
+ cl = new URLClassLoader(new URL[]{outDirectory.toURL()},
+ mc.getClassLoader());
ClassUtils.setClassLoader(clsName, cl);
}
mc.setClassLoader(cl);
-
return cl.loadClass(clsName);
}
}
return null;
}
- private void copyFile(File src, File dest)
- throws IOException
- {
+ private void copyFile(File src, File dest)
+ throws IOException {
byte[] buf = new byte[4096];
FileInputStream fis = new FileInputStream(src);
FileOutputStream fos = new FileOutputStream(dest);
@@ -373,19 +318,16 @@
* @throws Exception
*/
protected int compile(String classpath, String outDirPath, String jFile)
- throws Exception
- {
+ throws Exception {
String[] args = {
"-verbose",
"-classpath", classpath, // classpath
"-d", outDirPath, // output directory
jFile // source file
};
-
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
int result = com.sun.tools.apt.Main.compile(args, pw);
-
if (0 != result) // todo evaluate the return code
{
// construct error message
@@ -399,12 +341,10 @@
root.appendChild(doc.createTextNode(message.toString()));
// generate fault
- AxisFault af = new AxisFault(
- "Server.compileError",
- Messages.getMessage("badCompile00", jFile),
- null,
- new Element[] { root }
- );
+ AxisFault af = new AxisFault("Server.compileError",
+ Messages.getMessage("badCompile00", jFile),
+ null,
+ new Element[]{root});
// log fault
log.warn("Error compiling JWS", af);
@@ -419,7 +359,6 @@
// throw fault
throw af;
}
-
return result;
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java Fri Oct 29 13:13:18 2004
@@ -26,18 +26,18 @@
import org.apache.beehive.wsm.jsr181.model.SOAPMessageHandlerInfo;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-/*******************************************************************************
+/**
+ * ****************************************************************************
* Yes, this class name is a bit silly in order to highlight the confusion
* caused by overloading the term "Handler" used both by jaxrpc and AXIS.
* Might as well embrace the insanity rather than using an equally uninteresting
* name like HandlerManager or something.
*
* @author Jonathan Colwell
- *
- * All but the init method was copied from org.apache.axis.handlers.JAXRPCHandler
- * written by Davanum Srinivas (dims@yahoo.com) but the JAXRPCHandler only
- * allowed a single handler to be added to the HandlerChain. Subclassing would
- * have be preferable but the internal HandlerChainImpl was package private.
+ * All but the init method was copied from org.apache.axis.handlers.JAXRPCHandler
+ * written by Davanum Srinivas (dims@yahoo.com) but the JAXRPCHandler only
+ * allowed a single handler to be added to the HandlerChain. Subclassing would
+ * have be preferable but the internal HandlerChainImpl was package private.
*/
public class HandlerHandler extends BasicHandler {
@@ -55,7 +55,6 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
-
if (!msgContext.getPastPivot()) {
impl.handleRequest(msgContext);
} else {
@@ -66,7 +65,7 @@
public void onFault(MessageContext msgContext) {
impl.handleFault(msgContext);
}
-
+
public void cleanup() {
impl.destroy();
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/InvalidTypeMappingException.java Fri Oct 29 13:13:18 2004
@@ -18,30 +18,26 @@
*/
package org.apache.beehive.wsm.axis;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
public class InvalidTypeMappingException extends java.lang.Exception {
- public InvalidTypeMappingException()
- {
+ public InvalidTypeMappingException() {
super();
}
- public InvalidTypeMappingException(String message)
- {
+ public InvalidTypeMappingException(String message) {
super(message);
}
-
- public InvalidTypeMappingException(String message, Throwable cause)
- {
+
+ public InvalidTypeMappingException(String message, Throwable cause) {
super(message, cause);
}
- public InvalidTypeMappingException(Throwable cause)
- {
+ public InvalidTypeMappingException(Throwable cause) {
super(cause);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java Fri Oct 29 13:13:18 2004
@@ -36,26 +36,25 @@
import org.apache.axis.MessageContext;
import org.apache.axis.transport.http.HTTPConstants;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
public class ClasspathUtils {
- /**
- * Function borrowed from org.apache.axis.handlers.JWSHandler
- *
- * Expand a directory path or list of directory paths (File.pathSeparator
- * delimited) into a list of file paths of all the jar files in those
- * directories.
- *
- * @param dirPaths The string containing the directory path or list of
- * directory paths.
- * @return The file paths of the jar files in the directories. This is an
- * empty string if no files were found, and is terminated by an
- * additional pathSeparator in all other cases.
- */
+ /**
+ * Function borrowed from org.apache.axis.handlers.JWSHandler
+ * Expand a directory path or list of directory paths (File.pathSeparator
+ * delimited) into a list of file paths of all the jar files in those
+ * directories.
+ *
+ * @param dirPaths The string containing the directory path or list of
+ * directory paths.
+ * @return The file paths of the jar files in the directories. This is an
+ * empty string if no files were found, and is terminated by an
+ * additional pathSeparator in all other cases.
+ */
public static String expandDirs(String dirPaths) {
StringTokenizer st = new StringTokenizer(dirPaths, File.pathSeparator);
StringBuffer buffer = new StringBuffer();
@@ -72,7 +71,6 @@
return buffer.toString();
}
-
// an exception or emptiness signifies not a jar
public static boolean isJar(InputStream is) {
try {
@@ -82,37 +80,32 @@
}
} catch (IOException ioe) {
}
-
return false;
}
-
- public static String getDefaultClasspath(MessageContext msgContext)
- {
+ public static String getDefaultClasspath(MessageContext msgContext) {
StringBuffer classpath = new StringBuffer();
-
ClassLoader cl = Thread.currentThread().getContextClassLoader();
fillClassPath(cl, classpath);
// Just to be safe (the above doesn't seem to return the webapp
// classpath in all cases), manually do this:
- String webBase = (String)msgContext.getProperty(
- HTTPConstants.MC_HTTP_SERVLETLOCATION);
+ String webBase = (String) msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETLOCATION);
if (webBase != null) {
classpath.append(webBase + File.separatorChar + "classes" +
- File.pathSeparatorChar);
+ File.pathSeparatorChar);
try {
String libBase = webBase + File.separatorChar + "lib";
File libDir = new File(libBase);
- String [] jarFiles = libDir.list();
+ String[] jarFiles = libDir.list();
for (int i = 0; i < jarFiles.length; i++) {
String jarFile = jarFiles[i];
if (jarFile.endsWith(".jar")) {
classpath.append(libBase +
- File.separatorChar +
- jarFile +
- File.pathSeparatorChar);
+ File.separatorChar +
+ jarFile +
+ File.pathSeparatorChar);
}
}
} catch (Exception e) {
@@ -138,7 +131,6 @@
// boot classpath isn't found in above search
getClassPathFromProperty(classpath, "sun.boot.class.path");
-
return classpath.toString();
}
@@ -150,7 +142,7 @@
} catch (Exception e) {
// Oh well. No big deal.
}
- if( path!= null) {
+ if (path != null) {
classpath.append(path);
classpath.append(File.pathSeparatorChar);
}
@@ -158,7 +150,7 @@
private static void getClassPathFromProperty(StringBuffer classpath, String property) {
String path = AxisProperties.getProperty(property);
- if( path != null) {
+ if (path != null) {
classpath.append(path);
classpath.append(File.pathSeparatorChar);
}
@@ -166,7 +158,7 @@
/**
* Walk the classloader hierarchy and add to the classpath
- *
+ *
* @param cl
* @param classpath
*/
@@ -188,7 +180,6 @@
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
-
if (isJar(fis)) {
JarFile jar = new JarFile(file);
Manifest manifest = jar.getManifest();
@@ -197,7 +188,6 @@
if (attributes != null) {
String s = attributes.getValue(Attributes.Name.CLASS_PATH);
String base = file.getParent();
-
if (s != null) {
StringTokenizer st = new StringTokenizer(s, " ");
while (st.hasMoreTokens()) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/JavaArchiveFilter.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/JavaArchiveFilter.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/JavaArchiveFilter.java Fri Oct 29 13:13:18 2004
@@ -22,8 +22,9 @@
import java.io.File;
import java.io.FileFilter;
-/*******************************************************************************
- * This class stolen from an package private inner class of
+/**
+ * ****************************************************************************
+ * This class stolen from an package private inner class of
* org.apache.axis.handlers.JWSHandler
*/
public class JavaArchiveFilter implements FileFilter {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java Fri Oct 29 13:13:18 2004
@@ -22,31 +22,26 @@
import org.apache.axis.encoding.ser.VectorSerializer;
import org.xml.sax.Attributes;
-
-
-/******************************************************************************
- *
+/**
+ * ***************************************************************************
+ *
* @author Jonathan Colwell
- * @version
- * <!--$$Revision:--> <!-- $-->, <!--$$JustDate:--> <!-- $-->
+ * @version <!--$$Revision:--> <!-- $-->, <!--$$JustDate:--> <!-- $-->
*/
public class CollectionSerializer extends VectorSerializer {
public void serialize(QName name, Attributes attributes,
Object value, SerializationContext context)
- throws IOException
- {
-
+ throws IOException {
if (!(value instanceof Collection)) {
- throw new IOException(((value != null) ?
- value.getClass().getName()
- : "null")
- + " is not an instance of "
- + Collection.class.getName());
- }
- else {
+ throw new IOException(((value != null) ?
+ value.getClass().getName()
+ : "null")
+ + " is not an instance of "
+ + Collection.class.getName());
+ } else {
Vector v = new Vector();
- v.addAll((Collection)value);
+ v.addAll((Collection) value);
super.serialize(name, attributes, v, context);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java Fri Oct 29 13:13:18 2004
@@ -19,8 +19,9 @@
import org.apache.axis.encoding.ser.BaseSerializerFactory;
-/******************************************************************************
- *
+/**
+ * ***************************************************************************
+ *
* @author Jonathan Colwell
*/
public class CollectionSerializerFactory extends BaseSerializerFactory {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java Fri Oct 29 13:13:18 2004
@@ -33,8 +33,8 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@@ -43,8 +43,7 @@
private Class mJavaType;
private QName mXmlType;
- public XmlBeanDeserializer(Class javaType, QName xmlType)
- {
+ public XmlBeanDeserializer(Class javaType, QName xmlType) {
mJavaType = javaType;
mXmlType = xmlType;
}
@@ -52,22 +51,18 @@
public void onStartElement(String namespace, String localName,
String prefix, Attributes attributes,
DeserializationContext context)
- throws SAXException
- {
+ throws SAXException {
try {
MessageElement me = context.getCurElement();
-
XmlOptions opts = new XmlOptions()
- .setLoadReplaceDocumentElement(null);
+ .setLoadReplaceDocumentElement(null);
XmlObject xObj = XmlObject.Factory.parse(me, opts);
SchemaType st = xObj.schemaType();
- SchemaType jt = (SchemaType)mJavaType.getField("type").get(null);
-
+ SchemaType jt = (SchemaType) mJavaType.getField("type").get(null);
XmlObject converted = xObj.changeType(jt);
if (converted != null) {
setValue(converted);
- }
- else {
+ } else {
XmlObject[] children = xObj.selectChildren(QNameSet.ALL);
for (XmlObject kid : children) {
st = kid.schemaType();
@@ -78,8 +73,7 @@
}
}
}
- }
- catch (Exception xe) {
+ } catch (Exception xe) {
throw new SAXException(xe);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java Fri Oct 29 13:13:18 2004
@@ -25,8 +25,8 @@
import org.apache.axis.encoding.ser.BaseDeserializerFactory;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java Fri Oct 29 13:13:18 2004
@@ -45,36 +45,32 @@
import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
import org.xmlsoap.schemas.wsdl.TDefinitions;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
public class XmlBeanSerializer implements Serializer {
-
-
-
/**
* Serialize an element named name, with the indicated attributes
* and value.
- * @param name is the element name
+ *
+ * @param name is the element name
* @param attributes are the attributes...serialize is free to add more.
- * @param value is the value
- * @param context is the SerializationContext
+ * @param value is the value
+ * @param context is the SerializationContext
*/
public void serialize(QName name, Attributes attributes,
Object value, SerializationContext context)
- throws IOException
- {
+ throws IOException {
if (!(value instanceof XmlObject)) {
- throw new IOException(((value != null) ?
- value.getClass().getName()
- : "null")
- + " is not an "
- + XmlObject.class.getName());
- }
- else {
+ throw new IOException(((value != null) ?
+ value.getClass().getName()
+ : "null")
+ + " is not an "
+ + XmlObject.class.getName());
+ } else {
context.setWriteXMLType(null);
context.startElement(name, attributes);
/*
@@ -82,7 +78,7 @@
context.writeString(xObj.xmlText(new XmlOptions().setSaveInner()));
*/
- Node n = ((XmlObject)value).newDomNode();
+ Node n = ((XmlObject) value).newDomNode();
NodeList kids = n.getChildNodes();
for (int j = 0; j < kids.getLength(); j++) {
Node kid = kids.item(j);
@@ -94,7 +90,9 @@
}
}
- public String getMechanismType() { return Constants.AXIS_SAX; }
+ public String getMechanismType() {
+ return Constants.AXIS_SAX;
+ }
/**
* Return XML schema for the specified type, suitable for insertion into
@@ -102,13 +100,12 @@
* <element> or <attribute> declaration.
*
* @param javaType the Java Class we're writing out schema for
- * @param types the Java2WSDL Types object which holds the context
- * for the WSDL being generated.
+ * @param types the Java2WSDL Types object which holds the context
+ * for the WSDL being generated.
* @return a type element containing a schema simpleType/complexType
* @see org.apache.axis.wsdl.fromJava.Types
*/
- public Element writeSchema(Class javaType, Types types) throws Exception
- {
+ public Element writeSchema(Class javaType, Types types) throws Exception {
if (XmlObject.class.isAssignableFrom(javaType)) {
SchemaType docType = XmlBeans.typeForClass(javaType);
@@ -123,16 +120,12 @@
*/
Document doc = types.createElement("deleteme")
- .getOwnerDocument();
-
+ .getOwnerDocument();
XmlOptions opts = new XmlOptions()
- .setLoadReplaceDocumentElement(null);
+ .setLoadReplaceDocumentElement(null);
Element root = doc.getDocumentElement();
-
-
InputStream stream = docType.getTypeSystem()
- .getSourceAsStream(docType.getSourceName());
-
+ .getSourceAsStream(docType.getSourceName());
SchemaDocument schemaDoc = SchemaDocument.Factory.parse(stream);
/*
FIXME jcolwell@bea.com 2004-Oct-21 -- it would be great if
@@ -141,78 +134,62 @@
providing the schema elements individually.
*/
DefinitionsDocument defDoc = DefinitionsDocument.Factory
- .newInstance();
-
-
+ .newInstance();
TDefinitions definitions = defDoc.addNewDefinitions();
definitions.addNewService();
Node defEl = definitions.newDomNode(new XmlOptions()
- .setSaveOuter());
+ .setSaveOuter());
Document dDoc = defEl.getOwnerDocument();
-
if (null == dDoc.getDocumentElement()) {
dDoc.appendChild(defEl);
}
Set<String> existingNameSpaces = new HashSet<String>();
if (dDoc != null) {
types.insertTypesFragment(dDoc);
- Element e = (Element)dDoc.getFirstChild().getFirstChild()
- .getFirstChild();
+ Element e = (Element) dDoc.getFirstChild().getFirstChild()
+ .getFirstChild();
if (e != null) {
String tn = e.getAttribute("targetNamespace");
existingNameSpaces.add(tn);
-
- while (null != (e = (Element)e.getNextSibling())) {
+ while (null != (e = (Element) e.getNextSibling())) {
tn = e.getAttribute("targetNamespace");
existingNameSpaces.add(tn);
}
}
- }
- else {
+ } else {
throw new Exception("null document");
}
-
SchemaDocument.Schema schema = schemaDoc.getSchema();
String targetNamespace = schema.getTargetNamespace();
-
-
if (targetNamespace != null) {
System.out.println(existingNameSpaces);
if (!existingNameSpaces.contains(targetNamespace)) {
TopLevelComplexType[] schemaTypes = schema
- .getComplexTypeArray();
-
-
-
+ .getComplexTypeArray();
for (TopLevelComplexType top : schemaTypes) {
-
types.writeSchemaElement(targetNamespace,
- (Element)doc
- .importNode(top.newDomNode()
- .getFirstChild(),
- true));
+ (Element) doc
+ .importNode(top.newDomNode()
+ .getFirstChild(),
+ true));
}
TopLevelElement[] elements = schemaDoc.getSchema()
- .getElementArray();
-
+ .getElementArray();
for (TopLevelElement element : elements) {
-
types.writeSchemaElement(targetNamespace,
- (Element)doc
- .importNode(element.newDomNode()
- .getFirstChild(),
- true));
-
+ (Element) doc
+ .importNode(element.newDomNode()
+ .getFirstChild(),
+ true));
}
}
return null;
}
throw new Exception(javaType.getName()
- + "did not specify a target namspace");
- }
- else {
+ + "did not specify a target namspace");
+ } else {
throw new Exception(javaType.getName()
- + " must be a subclass of XmlObject");
+ + " must be a subclass of XmlObject");
}
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java Fri Oct 29 13:13:18 2004
@@ -25,8 +25,8 @@
import org.apache.axis.encoding.ser.BaseSerializerFactory;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java Fri Oct 29 13:13:18 2004
@@ -22,37 +22,29 @@
import java.util.Collection;
public abstract class AnnotationModel {
-
- public static boolean hasAnnotationType(Collection<Annotation> annotations, Class<? extends Annotation> annotationType)
- {
- if ((null != annotations) && (null != annotationType) && (0 < annotations.size()))
- {
- for ( Annotation a : annotations )
- {
- if (a.annotationType() == annotationType)
- {
+
+ public static boolean hasAnnotationType(Collection<Annotation> annotations, Class<? extends Annotation> annotationType) {
+ if ((null != annotations) && (null != annotationType) && (0 < annotations.size())) {
+ for (Annotation a : annotations) {
+ if (a.annotationType() == annotationType) {
return true;
}
}
}
return false;
}
-
+
//TODO: can this method be enhanced?
- public static Annotation getAnnotationOfType(Collection<Annotation> annotations, Class<? extends Annotation> annotationType)
- {
- if ((null != annotations) && (null != annotationType) && (0 < annotations.size()))
- {
- for ( Annotation a : annotations )
- {
- if (a.annotationType() == annotationType)
- {
+ public static Annotation getAnnotationOfType(Collection<Annotation> annotations, Class<? extends Annotation> annotationType) {
+ if ((null != annotations) && (null != annotationType) && (0 < annotations.size())) {
+ for (Annotation a : annotations) {
+ if (a.annotationType() == annotationType) {
return a;
}
}
}
return null;
}
-
+
public abstract void validate() throws ValidationException;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java Fri Oct 29 13:13:18 2004
@@ -19,6 +19,7 @@
*
* $Header:$
*/
+
public class InitParamInfo {
String name;
@@ -42,7 +43,6 @@
setValue(a.value());
}
// no defaults
-
}
/**
@@ -53,8 +53,7 @@
}
/**
- * @param name
- * The name to set.
+ * @param name The name to set.
*/
public void setName(String name) {
this.name = name;
@@ -68,8 +67,7 @@
}
/**
- * @param value
- * The value to set.
+ * @param value The value to set.
*/
public void setValue(String value) {
this.value = value;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InvalidFileType.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InvalidFileType.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InvalidFileType.java Fri Oct 29 13:13:18 2004
@@ -1,4 +1,5 @@
package org.apache.beehive.wsm.jsr181.model;
+
/*
* Copyright 2004 The Apache Software Foundation
*
@@ -26,14 +27,14 @@
*/
public InvalidFileType() {
super();
- }
+ }
/**
* @param arg0
*/
public InvalidFileType(String arg0) {
super(arg0);
- }
+ }
/**
* @param arg0
@@ -41,7 +42,7 @@
*/
public InvalidFileType(String arg0, Throwable arg1) {
super(arg0, arg1);
- }
+ }
/**
* @param arg0
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java Fri Oct 29 13:13:18 2004
@@ -24,7 +24,7 @@
SOAPBinding.Style style;
SOAPBinding.Use use;
SOAPBinding.ParameterStyle parameterStyle;
-
+
/**
*
*/
@@ -32,45 +32,52 @@
super();
}
- public SOAPBindingInfo (SOAPBinding annotation) {
+ public SOAPBindingInfo(SOAPBinding annotation) {
initFromAnnotation(annotation);
- }
+ }
+
/**
* @return Returns the parameterStyle.
*/
public SOAPBinding.ParameterStyle getParameterStyle() {
return parameterStyle;
}
+
/**
* @param parameterStyle The parameterStyle to set.
*/
public void setParameterStyle(SOAPBinding.ParameterStyle parameterStyle) {
this.parameterStyle = parameterStyle;
}
+
/**
* @return Returns the style.
*/
public SOAPBinding.Style getStyle() {
return style;
}
+
/**
* @param style The style to set.
*/
public void setStyle(SOAPBinding.Style style) {
this.style = style;
}
+
/**
* @return Returns the use.
*/
public SOAPBinding.Use getUse() {
return use;
}
+
/**
* @param use The use to set.
*/
public void setUse(SOAPBinding.Use use) {
this.use = use;
}
+
/**
* @param annotation
*/
@@ -80,5 +87,5 @@
setParameterStyle(annotation.parameterStyle());
// set the defaults -- no defaults to set
- }
+ }
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java Fri Oct 29 13:13:18 2004
@@ -28,29 +28,25 @@
import javax.jws.soap.InitParam;
import javax.jws.soap.SOAPMessageHandler;
-public class SOAPMessageHandlerInfo
-{
+public class SOAPMessageHandlerInfo {
String name;
String className;
HashMap<String, String> parameterMap = new HashMap<String, String>();
Collection<String> roles = new ArrayList<String>();
Collection<String> headers = new ArrayList<String>();
+
/**
*
*/
public SOAPMessageHandlerInfo(SOAPMessageHandler annotation) {
-
String handlerClassName = annotation.className();
if (handlerClassName.length() == 0) {
throw new IllegalArgumentException
- ("A className is required to configure a SOAPMessageHandler");
- }
- else {
+ ("A className is required to configure a SOAPMessageHandler");
+ } else {
setClassName(handlerClassName);
-
String handlerName = annotation.name();
setName((handlerName.length() > 0) ? handlerName : handlerClassName);
-
for (InitParam p : annotation.initParams()) {
addInitParam(p.name(), p.value());
}
@@ -58,19 +54,17 @@
for (String s : annotation.headers()) {
addHeader(s);
}
- }
+ }
}
public SOAPMessageHandlerInfo(String handlerClassName,
String handlerName,
Map<String, String> initParams,
Collection<String> roles,
- Collection<String> headers)
- {
+ Collection<String> headers) {
setClassName(handlerClassName);
- setName((handlerName != null && handlerName.length() > 0)
+ setName((handlerName != null && handlerName.length() > 0)
? handlerName : handlerClassName);
-
addInitParams(initParams);
addRoles(roles);
addHeaders(headers);
@@ -82,68 +76,74 @@
public String getClassName() {
return className;
}
+
/**
* @param className The className to set.
*/
public void setClassName(String className) {
this.className = className;
}
+
/**
* @return Returns the name.
*/
public String getName() {
return name;
}
+
/**
* @param name The name to set.
*/
public void setName(String name) {
this.name = name;
}
+
/**
* @return Returns the headers.
*/
public Collection<String> getHeaders() {
return Collections.unmodifiableCollection(headers);
}
-
+
public void addHeader(String header) {
this.headers.add(header);
}
+
/**
* @param headers
*/
private void addHeaders(Collection<String> headers) {
this.headers.addAll(headers);
}
-
+
/**
* @return Returns the params.
*/
public Map<String, String> getParameterMap() {
return Collections.unmodifiableMap(parameterMap);
}
-
+
public void addInitParam(String key, String value) {
parameterMap.put(key, value);
}
-
- public void addInitParams(Map<String,String> params) {
+
+ public void addInitParams(Map<String, String> params) {
parameterMap.putAll(params);
}
+
/**
* @return Returns the roles.
*/
public Collection<String> getRoles() {
return Collections.unmodifiableCollection(roles);
}
-
+
public void addRole(String role) {
this.roles.add(role);
}
-
+
public void addRoles(Collection<String> roles) {
this.roles.addAll(roles);
}
-
+
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/ValidationException.java Fri Oct 29 13:13:18 2004
@@ -19,7 +19,12 @@
*/
public class ValidationException extends Exception {
-
- public ValidationException() { super(); }
- public ValidationException(String msg) { super(msg); }
+
+ public ValidationException() {
+ super();
+ }
+
+ public ValidationException(String msg) {
+ super(msg);
+ }
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java Fri Oct 29 13:13:18 2004
@@ -30,45 +30,38 @@
import javax.jws.WebResult;
import javax.jws.security.SecurityRoles;
-public class WebServiceMETHODMetadata extends AnnotationModel
-{
+public class WebServiceMETHODMetadata extends AnnotationModel {
private String wmOperationName;
private String wmAction;
private boolean oneway = false;
private List<WebServicePARAMETERMetadata> params =
- new ArrayList<WebServicePARAMETERMetadata>();
+ new ArrayList<WebServicePARAMETERMetadata>();
private String wrName;
private String wrTargetNamespace;
private SecurityRolesInfo securityRoles;
private String javaMethodName;
private Class javaReturnType;
- public void validate() throws ValidationException
- {
+ public void validate() throws ValidationException {
return; // no validation required
}
- public WebServiceMETHODMetadata(String methodName, Class returnType)
- {
+ public WebServiceMETHODMetadata(String methodName, Class returnType) {
super();
javaMethodName = methodName;
javaReturnType = returnType;
}
- public WebServiceMETHODMetadata(
- String javaMethodName,
- Class javaReturnType,
- boolean throwsExceptions,
- Collection<Annotation> annotations,
- List< ? extends WebServicePARAMETERMetadata> webParams
- ) throws Exception
- {
+ public WebServiceMETHODMetadata(String javaMethodName,
+ Class javaReturnType,
+ boolean throwsExceptions,
+ Collection<Annotation> annotations,
+ List<? extends WebServicePARAMETERMetadata> webParams) throws Exception {
super();
// check parameters
if ((null == javaMethodName) || (null == javaReturnType)) {
- throw new IllegalArgumentException(
- "javaMethodName or javaReturnType not set");
+ throw new IllegalArgumentException("javaMethodName or javaReturnType not set");
}
this.javaMethodName = javaMethodName;
this.javaReturnType = javaReturnType;
@@ -84,81 +77,61 @@
setWrName("result");
// enforce JSR-181 rules
- if (AnnotationModel.hasAnnotationType(annotations, Oneway.class))
- {
+ if (AnnotationModel.hasAnnotationType(annotations, Oneway.class)) {
// prohibit @Oneway with @WebResult
- if (AnnotationModel.hasAnnotationType(annotations, WebResult.class))
- {
+ if (AnnotationModel.hasAnnotationType(annotations, WebResult.class)) {
// todo needs to be proper Exception subclass
throw new Exception("@Oneway method " + javaMethodName +
- " has incompatible annotation: @WebResult");
+ " has incompatible annotation: @WebResult");
}
// prohibit @Oneway with return types other than <code>void</code>
- if (void.class != javaReturnType)
- {
+ if (void.class != javaReturnType) {
// todo needs to be proper Exception subclass
throw new Exception("@Oneway method " + javaMethodName +
- " has illegal non-void return type: " + javaReturnType);
+ " has illegal non-void return type: " + javaReturnType);
}
// prohibit @Oneway methods that throw Exceptions
- if (throwsExceptions)
- {
+ if (throwsExceptions) {
// todo needs to be proper Exception subclass
throw new Exception("@Oneway method " + javaMethodName +
- " must not throw exceptions");
+ " must not throw exceptions");
}
// prohibit @Oneway with "OUT" and "INOUT" parameters
- if (null != webParams)
- {
- for (WebServicePARAMETERMetadata param : webParams)
- {
+ if (null != webParams) {
+ for (WebServicePARAMETERMetadata param : webParams) {
if ((WebParam.Mode.OUT == param.getWpMode()) ||
- (WebParam.Mode.INOUT == param.getWpMode()))
- {
+ (WebParam.Mode.INOUT == param.getWpMode())) {
// todo needs to be proper Exception subclass
throw new Exception("@Oneway method " + javaMethodName +
- " has illegal INOUT or OUT parameter: " +
- param.getWpName());
+ " has illegal INOUT or OUT parameter: " +
+ param.getWpName());
}
}
}
}
// set optional annotations
- if (null != annotations)
- {
- for (Annotation a : annotations)
- {
- if (a.annotationType() == javax.jws.WebMethod.class)
- {
+ if (null != annotations) {
+ for (Annotation a : annotations) {
+ if (a.annotationType() == javax.jws.WebMethod.class) {
initFromAnnotation((javax.jws.WebMethod) a);
- }
- else if (a.annotationType() == javax.jws.Oneway.class)
- {
+ } else if (a.annotationType() == javax.jws.Oneway.class) {
initFromAnnotation((javax.jws.Oneway) a);
- }
- else if (a.annotationType() == javax.jws.security.SecurityRoles.class)
- {
+ } else if (a.annotationType() == javax.jws.security.SecurityRoles.class) {
initFromAnnotation((javax.jws.security.SecurityRoles) a);
- }
- else if (a.annotationType() == javax.jws.WebResult.class)
- {
+ } else if (a.annotationType() == javax.jws.WebResult.class) {
initFromAnnotation((javax.jws.WebResult) a);
- }
- else
- {
+ } else {
// todo: warning -- unknown annotation
}
}
}
// set defaults for @WebMethod -- always, even when @WebMethod not present
- if ((null == getWmOperationName()) || (0 == getWmOperationName().length()))
- {
+ if ((null == getWmOperationName()) || (0 == getWmOperationName().length())) {
setWmOperationName(javaMethodName);
}
- if ((null == getWmAction()) || (0 == getWmAction().length()))
- {
+ if ((null == getWmAction()) || (0 == getWmAction().length())) {
setWmAction("");
}
@@ -166,125 +139,99 @@
addParams(webParams);
}
- private void initFromAnnotation(SecurityRoles annotation)
- {
- if (null != annotation)
- {
+ private void initFromAnnotation(SecurityRoles annotation) {
+ if (null != annotation) {
setSecurityRoles(new SecurityRolesInfo(annotation));
}
}
- private void initFromAnnotation(WebResult annotation)
- {
- if (null != annotation)
- {
+ private void initFromAnnotation(WebResult annotation) {
+ if (null != annotation) {
setWrName(annotation.name());
setWrTargetNamespace(annotation.targetNamespace());
}
}
- private void initFromAnnotation(Oneway annotation)
- {
+ private void initFromAnnotation(Oneway annotation) {
setOneWay(null != annotation);
}
- private void initFromAnnotation(WebMethod annotation)
- {
- if (null != annotation)
- {
+ private void initFromAnnotation(WebMethod annotation) {
+ if (null != annotation) {
setWmAction(annotation.action());
setWmOperationName(annotation.operationName());
}
}
- public boolean isOneWay()
- {
+ public boolean isOneWay() {
return oneway;
}
- public void setOneWay(boolean oneway)
- {
+ public void setOneWay(boolean oneway) {
this.oneway = oneway;
}
- public SecurityRolesInfo getSecurityRoles()
- {
+ public SecurityRolesInfo getSecurityRoles() {
return securityRoles;
}
- public void setSecurityRoles(SecurityRolesInfo securityRoles)
- {
+ public void setSecurityRoles(SecurityRolesInfo securityRoles) {
this.securityRoles = securityRoles;
}
- public String getWmAction()
- {
+ public String getWmAction() {
return wmAction;
}
- public void setWmAction(String wmAction)
- {
+ public void setWmAction(String wmAction) {
this.wmAction = wmAction;
}
- public String getWmOperationName()
- {
+ public String getWmOperationName() {
return wmOperationName;
}
- public void setWmOperationName(String wmOperationName)
- {
+ public void setWmOperationName(String wmOperationName) {
this.wmOperationName = wmOperationName;
}
- public String getWrName()
- {
+ public String getWrName() {
return wrName;
}
- public void setWrName(String wrName)
- {
+ public void setWrName(String wrName) {
this.wrName = wrName;
}
- public String getWrTargetNamespace()
- {
+ public String getWrTargetNamespace() {
return wrTargetNamespace;
}
- public void setWrTargetNamespace(String wrTargetNamespace)
- {
+ public void setWrTargetNamespace(String wrTargetNamespace) {
this.wrTargetNamespace = wrTargetNamespace;
}
- public List<WebServicePARAMETERMetadata> getParams()
- {
+ public List<WebServicePARAMETERMetadata> getParams() {
return Collections.unmodifiableList(params);
}
- public void addParams(Collection<? extends WebServicePARAMETERMetadata> parameters)
- {
- if (null != parameters)
- {
+ public void addParams(Collection<? extends WebServicePARAMETERMetadata> parameters) {
+ if (null != parameters) {
params.addAll(parameters);
}
}
- public void addParam(WebServicePARAMETERMetadata parameter)
- {
- if (null != parameter)
- {
+ public void addParam(WebServicePARAMETERMetadata parameter) {
+ if (null != parameter) {
params.add(parameter);
}
}
-
- public String getJavaMethodName()
- {
+
+ public String getJavaMethodName() {
return javaMethodName;
}
- public Class getJavaReturnType()
- {
+ public Class getJavaReturnType() {
return javaReturnType;
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java Fri Oct 29 13:13:18 2004
@@ -23,114 +23,89 @@
import javax.jws.WebParam;
-public class WebServicePARAMETERMetadata extends AnnotationModel
-{
+public class WebServicePARAMETERMetadata extends AnnotationModel {
private String wpName;
private String wpTargetNamespace;
private WebParam.Mode wpMode;
private boolean wpHeader;
private Class javaType;
-
- public void validate() throws ValidationException
- {
+
+ public void validate() throws ValidationException {
return; // no validation required
}
- public WebServicePARAMETERMetadata()
- {
+ public WebServicePARAMETERMetadata() {
super();
}
-
+
// defaultName is argument name in the source file. It can be null if the
// name is not known.
- public WebServicePARAMETERMetadata(
- Class javaType,
- String defaultName,
- Collection<Annotation> annotations)
- {
+ public WebServicePARAMETERMetadata(Class javaType,
+ String defaultName,
+ Collection<Annotation> annotations) {
// check parameters
- if (null == javaType)
- {
+ if (null == javaType) {
throw new IllegalArgumentException("javaType not set");
}
this.javaType = javaType;
-
setWpMode(WebParam.Mode.IN); // by default if there were no anotations
setWpName(defaultName); // in case there are no annotations
// set optional annotations
- if (null != annotations)
- {
- for (Annotation a : annotations)
- {
- if (a.annotationType() == javax.jws.WebParam.class)
- {
+ if (null != annotations) {
+ for (Annotation a : annotations) {
+ if (a.annotationType() == javax.jws.WebParam.class) {
initFromAnnotation((javax.jws.WebParam) a);
- }
- else
- {
+ } else {
// todo: warning -- unknown annotation
}
}
}
}
-
- public boolean isWpHeader()
- {
+
+ public boolean isWpHeader() {
return wpHeader;
}
-
- public void setWpHeader(boolean wpHeader)
- {
+
+ public void setWpHeader(boolean wpHeader) {
this.wpHeader = wpHeader;
}
-
- public WebParam.Mode getWpMode()
- {
+
+ public WebParam.Mode getWpMode() {
return wpMode;
}
-
- public void setWpMode(WebParam.Mode wpMode)
- {
+
+ public void setWpMode(WebParam.Mode wpMode) {
this.wpMode = wpMode;
}
-
- public String getWpName()
- {
+
+ public String getWpName() {
return wpName;
}
-
- public void setWpName(String wpName)
- {
+
+ public void setWpName(String wpName) {
this.wpName = wpName;
}
-
- public String getWpTargetNamespace()
- {
+
+ public String getWpTargetNamespace() {
return wpTargetNamespace;
}
-
- public void setWpTargetNamespace(String wpTargetNamespace)
- {
+
+ public void setWpTargetNamespace(String wpTargetNamespace) {
this.wpTargetNamespace = wpTargetNamespace;
}
-
- public Class getJavaType()
- {
+
+ public Class getJavaType() {
return javaType;
}
-
- public void setJavaType(Class javaType)
- {
+
+ public void setJavaType(Class javaType) {
this.javaType = javaType;
}
-
- private void initFromAnnotation(WebParam annotation)
- {
- if (null != annotation)
- {
- if (0 < annotation.name().length())
- {
+
+ private void initFromAnnotation(WebParam annotation) {
+ if (null != annotation) {
+ if (0 < annotation.name().length()) {
setWpName(annotation.name());
}
setWpTargetNamespace(annotation.targetNamespace());
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java Fri Oct 29 13:13:18 2004
@@ -48,75 +48,68 @@
import org.w3c.dom.NodeList;
import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-public class WebServiceTYPEMetadata extends AnnotationModel
-{
+public class WebServiceTYPEMetadata extends AnnotationModel {
private String wsName;
private String wsServiceName;
private String wsWsdlLocation;
private String wsTargetNamespace;
private String wsEndpointInterface;
private Collection<WebServiceMETHODMetadata> methods =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
private SOAPBindingInfo soapBinding;
private String hcFileName;
private String hcName;
private List<SOAPMessageHandlerInfo> soapHandlers =
- new ArrayList<SOAPMessageHandlerInfo>();
+ new ArrayList<SOAPMessageHandlerInfo>();
private SecurityRolesInfo securityRoles;
private String siValue;
private String sibClassName; // name of the service implementation bean
private String seiClassName; // name of the service endpoint interface
-
+
/**
* Constructor.
+ *
* @param sibClassName The fully-qualified name of the service
- * implementation bean class.
+ * implementation bean class.
*/
- public WebServiceTYPEMetadata(String sibClassName)
- {
+ public WebServiceTYPEMetadata(String sibClassName) {
super();
-
this.sibClassName = sibClassName;
}
-
+
/**
* This method does not require to load the service implementation bean
* class.
- * @param sibWsAnnotation The @WebService annotation of the service
- * implementation bean.
- * @param sibClassName The fully-qualified name of the service
- * implementation bean class.
- * @param annotations All annotations (including @WebService) of the
- * service endpoint interface if it exists; all annotations
- * (including @WebService) of the service implementation bean otherwise.
- * @param webMethods All methods that are published by the service.
+ *
+ * @param sibWsAnnotation The @WebService annotation of the service
+ * implementation bean.
+ * @param sibClassName The fully-qualified name of the service
+ * implementation bean class.
+ * @param annotations All annotations (including @WebService) of the
+ * service endpoint interface if it exists; all annotations
+ * (including @WebService) of the service implementation bean otherwise.
+ * @param webMethods All methods that are published by the service.
* @throws Exception
*/
- public WebServiceTYPEMetadata(
- WebService sibWsAnnotation,
- String sibClassName,
- Collection<Annotation> annotations,
- Collection<? extends WebServiceMETHODMetadata> webMethods
- ) throws Exception
- {
+ public WebServiceTYPEMetadata(WebService sibWsAnnotation,
+ String sibClassName,
+ Collection<Annotation> annotations,
+ Collection<? extends WebServiceMETHODMetadata> webMethods) throws Exception {
super();
// check required parameter: sibWsAnnotation
- if (null == sibWsAnnotation)
- {
+ if (null == sibWsAnnotation) {
throw new IllegalArgumentException("@WebService is required for service implementation beans");
}
// check required parameter: sibClassName
- if ((null == sibClassName) || (0 == sibClassName.length()))
- {
+ if ((null == sibClassName) || (0 == sibClassName.length())) {
throw new IllegalArgumentException("service implementation bean class not set");
}
this.sibClassName = sibClassName;
// check required parameters: annotations, webMethods
- if ((null == annotations) || (null == webMethods))
- {
+ if ((null == annotations) || (null == webMethods)) {
throw new IllegalArgumentException("annotations or webMethods is null");
}
@@ -125,57 +118,45 @@
// enforce JSR-181 rules
if (AnnotationModel.hasAnnotationType(annotations, SOAPMessageHandlers.class) &&
- AnnotationModel.hasAnnotationType(annotations, HandlerChain.class))
- {
+ AnnotationModel.hasAnnotationType(annotations, HandlerChain.class)) {
// todo needs to be proper Exception subclass (e.g. ObjectModelException)
- throw new Exception(
- "Illegal combination of @SOAPMessageHandlers and @HandlerChain"
- );
+ throw new Exception("Illegal combination of @SOAPMessageHandlers and @HandlerChain");
}
// initilize instance
WebService seiWsAnnotation = null;
- if (0 < seiClassName.length())
- {
+ if (0 < seiClassName.length()) {
seiWsAnnotation = (WebService)
- AnnotationModel.getAnnotationOfType(annotations, WebService.class);
+ AnnotationModel.getAnnotationOfType(annotations, WebService.class);
}
initFromAnnotation(sibWsAnnotation, seiWsAnnotation);
// set optional annotations
- for (Annotation a : annotations)
- {
+ for (Annotation a : annotations) {
// @HandlerChain
- if (a.annotationType() == javax.jws.HandlerChain.class)
- {
+ if (a.annotationType() == javax.jws.HandlerChain.class) {
initFromAnnotation((javax.jws.HandlerChain) a);
}
// @SecurityIdentity
- else if (a.annotationType() == javax.jws.security.SecurityIdentity.class)
- {
+ else if (a.annotationType() == javax.jws.security.SecurityIdentity.class) {
initFromAnnotation((javax.jws.security.SecurityIdentity) a);
}
// @SecurityRoles
- else if (a.annotationType() == javax.jws.security.SecurityRoles.class)
- {
+ else if (a.annotationType() == javax.jws.security.SecurityRoles.class) {
initFromAnnotation((javax.jws.security.SecurityRoles) a);
}
// @SOAPBinding
- else if (a.annotationType() == javax.jws.soap.SOAPBinding.class)
- {
+ else if (a.annotationType() == javax.jws.soap.SOAPBinding.class) {
initFromAnnotation((javax.jws.soap.SOAPBinding) a);
}
// @SOAPMessageHandlers
- else if (a.annotationType() == javax.jws.soap.SOAPMessageHandlers.class)
- {
+ else if (a.annotationType() == javax.jws.soap.SOAPMessageHandlers.class) {
initFromAnnotation((javax.jws.soap.SOAPMessageHandlers) a);
- }
- else
- {
+ } else {
// TODO: What to do with annotations that are not specified in
// 181? For now ignore them. Later: delegation model?
@@ -184,21 +165,17 @@
}
// set WebServiceMETHODMetadata and back fill JSR-181 default values
- for (WebServiceMETHODMetadata wsmm : webMethods)
- {
+ for (WebServiceMETHODMetadata wsmm : webMethods) {
// JSR-181 defaults: fill in default for tergetNamespace from @WebService
String wrTargetNamespace = wsmm.getWrTargetNamespace();
- if ((null == wrTargetNamespace) || (0 == wrTargetNamespace.length()))
- {
+ if ((null == wrTargetNamespace) || (0 == wrTargetNamespace.length())) {
wsmm.setWrTargetNamespace(getWsTargetNamespace());
}
// JSR-181 defaults: fill in default for tergetNamespace from @WebService
- for (WebServicePARAMETERMetadata wspm : wsmm.getParams())
- {
+ for (WebServicePARAMETERMetadata wspm : wsmm.getParams()) {
String wpTargetNamespace = wspm.getWpTargetNamespace();
- if ((null == wpTargetNamespace) || (0 == wpTargetNamespace.length()))
- {
+ if ((null == wpTargetNamespace) || (0 == wpTargetNamespace.length())) {
wspm.setWpTargetNamespace(getWsTargetNamespace());
}
}
@@ -208,19 +185,14 @@
}
}
- protected void initFromAnnotation(WebService sibWsAnnotation, WebService seiWsAnnotation)
- {
+ protected void initFromAnnotation(WebService sibWsAnnotation, WebService seiWsAnnotation) {
// initialize fields with values from annotations
- if (null == seiWsAnnotation)
- {
+ if (null == seiWsAnnotation) {
setWsName(sibWsAnnotation.name());
setWsTargetNamespace(sibWsAnnotation.targetNamespace());
setWsWsdlLocation(sibWsAnnotation.wsdlLocation());
-
- }
- else
- {
+ } else {
setWsName(seiWsAnnotation.name());
setWsTargetNamespace(seiWsAnnotation.targetNamespace());
setWsWsdlLocation(seiWsAnnotation.wsdlLocation());
@@ -232,49 +204,39 @@
// name
String name = (0 == seiClassName.length()) ? sibClassName : seiClassName;
- if (-1 < name.indexOf('.'))
- {
+ if (-1 < name.indexOf('.')) {
int index = name.lastIndexOf('.');
name = name.substring(index + 1);
}
- if (0 == getWsName().length())
- {
+ if (0 == getWsName().length()) {
setWsName(name);
}
// serviceName
String serviceName = sibClassName;
- if (-1 < serviceName.indexOf('.'))
- {
+ if (-1 < serviceName.indexOf('.')) {
int index = serviceName.lastIndexOf('.');
serviceName = serviceName.substring(index + 1);
}
- if (0 == getWsServiceName().length())
- {
+ if (0 == getWsServiceName().length()) {
setWsServiceName(serviceName + "Service");
}
// targetNamespace
- if (0 == getWsTargetNamespace().length())
- {
+ if (0 == getWsTargetNamespace().length()) {
String defaultNamespaceSrc =
- (0 == seiClassName.length()) ? sibClassName : seiClassName;
+ (0 == seiClassName.length()) ? sibClassName : seiClassName;
setWsTargetNamespace(getTargetNamespace(defaultNamespaceSrc));
}
}
- private void initFromAnnotation(SOAPBinding annotation)
- {
- if (null != annotation)
- {
+ private void initFromAnnotation(SOAPBinding annotation) {
+ if (null != annotation) {
setSoapBinding(new SOAPBindingInfo(annotation));
}
SOAPBindingInfo sbi = getSoapBinding();
- if (null == sbi)
- {
- throw new IllegalArgumentException(
- "illegal SOAPBinding annotation on WebService class:\n\t" + sbi
- );
+ if (null == sbi) {
+ throw new IllegalArgumentException("illegal SOAPBinding annotation on WebService class:\n\t" + sbi);
}
// no defaults to handle
@@ -289,81 +251,60 @@
setHcName(hcName);
try {
configureHandlerChain(hcPath, hcName);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeException
- ("An Exception occurred while configuring"
- + " the HandlerChain", e);
+ ("An Exception occurred while configuring"
+ + " the HandlerChain", e);
}
- }
- else {
+ } else {
throw new IllegalArgumentException
- ("SOAPMessageHandlers and HandlerChain annotations" +
- " are mutually exclusive, and a SOAPMessageHandlers " +
- "annotation is already present.");
+ ("SOAPMessageHandlers and HandlerChain annotations" +
+ " are mutually exclusive, and a SOAPMessageHandlers " +
+ "annotation is already present.");
}
}
}
- private void initFromAnnotation(SOAPMessageHandlers annotation)
- {
- if (null != annotation)
- {
- if (null == getHcFileName())
- {
+ private void initFromAnnotation(SOAPMessageHandlers annotation) {
+ if (null != annotation) {
+ if (null == getHcFileName()) {
SOAPMessageHandler[] soapMsgHandlerArray = annotation.value();
- for (int i = 0; i < soapMsgHandlerArray.length; i++)
- {
- addSOAPHandler(
- new SOAPMessageHandlerInfo(soapMsgHandlerArray[i])
- );
+ for (int i = 0; i < soapMsgHandlerArray.length; i++) {
+ addSOAPHandler(new SOAPMessageHandlerInfo(soapMsgHandlerArray[i]));
}
+ } else {
+ throw new IllegalArgumentException("SOAPMessageHandlers and HandlerChain annotations " +
+ "are mutually exclusive, and a HandlerChain " +
+ "annotation is already present.");
}
- else
- {
- throw new IllegalArgumentException(
- "SOAPMessageHandlers and HandlerChain annotations " +
- "are mutually exclusive, and a HandlerChain " +
- "annotation is already present."
- );
- }
- }
+ }
}
- private void initFromAnnotation(SecurityRoles annotation)
- {
- if (null != annotation)
- {
+ private void initFromAnnotation(SecurityRoles annotation) {
+ if (null != annotation) {
setSecurityRoles(new SecurityRolesInfo(annotation));
}
// no defaults to handle
}
- private void initFromAnnotation(SecurityIdentity annotation)
- {
- if (null != annotation)
- {
+ private void initFromAnnotation(SecurityIdentity annotation) {
+ if (null != annotation) {
setSiValue(annotation.value());
}
// no defaults to handle
}
- private void configureHandlerChain(
- String handlerChainConfigPath,
- String handlerChainName
- )
- throws Exception
- {
+ private void configureHandlerChain(String handlerChainConfigPath,
+ String handlerChainName)
+ throws Exception {
URL handlerChainConfigURL;
// check if we have a likely absolute URL
if (handlerChainConfigPath.indexOf("://") > 2) {
-
handlerChainConfigURL = new URL(handlerChainConfigPath);
- }
- else {
+ } else {
// attempt to load a handler config file as a resource.
/*
* FIXME jcolwell@bea.com 2004-Sep-16 -- perhaps add code to ensure
@@ -373,63 +314,55 @@
* Using the current ClassLoader for the moment.
*/
handlerChainConfigURL = getClass().getClassLoader()
- .getResource(handlerChainConfigPath);
+ .getResource(handlerChainConfigPath);
if (handlerChainConfigURL == null) {
// try again using the classes package as a prefix
StringBuffer fullPath = new StringBuffer
- (sibClassName.substring(0,sibClassName
- .lastIndexOf('.')));
-
+ (sibClassName.substring(0, sibClassName
+ .lastIndexOf('.')));
if (!handlerChainConfigPath.startsWith("/")) {
fullPath.append('/');
}
-
handlerChainConfigURL = getClass().getClassLoader()
- .getResource(fullPath.toString().replace('.', '/') +
- handlerChainConfigPath);
+ .getResource(fullPath.toString().replace('.', '/') +
+ handlerChainConfigPath);
}
}
initHandlersFromChainConfig(handlerChainConfigURL, handlerChainName);
}
/**
- * Made public so specific implementations can configure handlers relevant
- * to their own environment. Calls to this are ignored if SOAPHandlers are
+ * Made public so specific implementations can configure handlers relevant
+ * to their own environment. Calls to this are ignored if SOAPHandlers are
* already configured.
- *
* e.g. in case the config file is located next to the .jws source file in
* the context root of an axis webapp rather than in the classpath
*/
public void initHandlersFromChainConfig(URL chainConfigURL,
String chainName)
- throws Exception
- {
+ throws Exception {
if (getSoapHandlers().isEmpty() &&
- chainConfigURL != null && chainName != null) {
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
+ chainConfigURL != null && chainName != null) {
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
factory.setNamespaceAware(true);
factory.setIgnoringComments(true);
-
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(chainConfigURL.openStream());
-
NodeList handlerChainNodes = doc
- .getElementsByTagName("handler-chain");
+ .getElementsByTagName("handler-chain");
for (int j = 0; j < handlerChainNodes.getLength(); j++) {
Node handlerChainNode = handlerChainNodes.item(j);
if (handlerChainNode.getNodeType() == Node.ELEMENT_NODE) {
- Element chainElement = (Element)handlerChainNode;
+ Element chainElement = (Element) handlerChainNode;
NodeList chainNames = chainElement
- .getElementsByTagName("handler-chain-name");
+ .getElementsByTagName("handler-chain-name");
//should only be one chain name so just grab the first one
if (chainNames.getLength() > 0
- && chainName.equals(chainNames.item(0).getFirstChild()
- .getNodeValue())) {
-
+ && chainName.equals(chainNames.item(0).getFirstChild()
+ .getNodeValue())) {
NodeList handlers = chainElement
- .getElementsByTagName("handler");
-
+ .getElementsByTagName("handler");
for (int k = 0; k < handlers.getLength(); k++) {
processHandlerNode(handlers.item(k));
}
@@ -440,162 +373,131 @@
}
private void processHandlerNode(Node handlerNode) {
-
if (handlerNode.hasChildNodes()) {
String handlerName = null;
String handlerClassName = null;
Map<String, String> initParams = new HashMap<String, String>();
Collection<String> roles = new ArrayList<String>();
Collection<String> headers = new ArrayList<String>();
-
Node currentChild = handlerNode.getFirstChild();
while (currentChild != null) {
-
String nodeName = currentChild.getNodeName();
if ("handler-name".equals(nodeName)) {
handlerName = currentChild.getFirstChild().getNodeValue();
- }
- else if ("handler-class".equals(nodeName)) {
+ } else if ("handler-class".equals(nodeName)) {
handlerClassName = currentChild
- .getFirstChild().getNodeValue();
- }
- else if ("soap-role".equals(nodeName)) {
+ .getFirstChild().getNodeValue();
+ } else if ("soap-role".equals(nodeName)) {
roles.add(currentChild
- .getFirstChild().getNodeValue());
- }
- else if ("soap-header".equals(nodeName)) {
+ .getFirstChild().getNodeValue());
+ } else if ("soap-header".equals(nodeName)) {
headers.add(currentChild.getFirstChild().getNodeValue());
- }
- else if ("init-param".equals(nodeName)) {
+ } else if ("init-param".equals(nodeName)) {
nodeName = currentChild.getFirstChild().getNodeName();
if ("param-name".equals(nodeName)) {
initParams
- .put(currentChild.getFirstChild().getNodeValue(),
- currentChild.getLastChild().getNodeValue());
- }
- else {
+ .put(currentChild.getFirstChild().getNodeValue(),
+ currentChild.getLastChild().getNodeValue());
+ } else {
initParams
- .put(currentChild.getLastChild().getNodeValue(),
- currentChild.getFirstChild().getNodeValue());
+ .put(currentChild.getLastChild().getNodeValue(),
+ currentChild.getFirstChild().getNodeValue());
}
}
currentChild = currentChild.getNextSibling();
}
addSOAPHandler(new SOAPMessageHandlerInfo(handlerClassName,
- handlerName,
- initParams,
- roles,
- headers));
+ handlerName,
+ initParams,
+ roles,
+ headers));
}
-
}
/**
* Checks whether the implementation bean implements all the methods
* specified in the endpointInterface.
+ *
* @throws ValidationException
*/
- public void validate() throws ValidationException
- {
+ public void validate() throws ValidationException {
// note: load class here -- we might want to create the object model without a sib class file (from source)
// if we have a service endpoint interface
- if (0 < seiClassName.length())
- {
+ if (0 < seiClassName.length()) {
try {
-
// load endpoint interface
Class sibClass = Class.forName(sibClassName);
Class seiClass = Class.forName(seiClassName);
// verify that bean implements all methods specified in interface
- for (Method m : seiClass.getMethods())
- {
- if (! doesImplement(sibClass, m))
- {
- throw new ValidationException(
- "The implementation bean doesn't implement " +
- m +
- " as required by the interface: " +
- getServiceImplementationBean()
- );
+ for (Method m : seiClass.getMethods()) {
+ if (!doesImplement(sibClass, m)) {
+ throw new ValidationException("The implementation bean doesn't implement " +
+ m +
+ " as required by the interface: " +
+ getServiceImplementationBean());
}
}
- }
- catch (ClassNotFoundException e)
- {
- throw new ValidationException(
- "endpoint interface (" +
- seiClassName +
- ") or implementation bean (" +
- sibClassName +
- ") not on classpath"
- );
+ } catch (ClassNotFoundException e) {
+ throw new ValidationException("endpoint interface (" +
+ seiClassName +
+ ") or implementation bean (" +
+ sibClassName +
+ ") not on classpath");
}
}
}
/**
* Compares the signature of specified methods.
+ *
* @param m
* @return
*/
- private boolean doesImplement(Class sibClass, Method m)
- {
- if (null == m)
- {
+ private boolean doesImplement(Class sibClass, Method m) {
+ if (null == m) {
return false;
}
// search methods
boolean found = false;
- for (Method _m : sibClass.getMethods())
- {
+ for (Method _m : sibClass.getMethods()) {
// compare java method names; todo should this be the action/operation name instead?
- if (! m.getName().equals(_m.getName()))
- {
+ if (!m.getName().equals(_m.getName())) {
continue;
}
// compare return types
- if (! m.getReturnType().equals(_m.getReturnType()))
- {
+ if (!m.getReturnType().equals(_m.getReturnType())) {
continue;
}
-
Type[] mTypes = m.getParameterTypes();
Type[] _mTypes = _m.getParameterTypes();
// compare number of arguments
- if (mTypes.length != _mTypes.length)
- {
+ if (mTypes.length != _mTypes.length) {
continue;
}
// compare argument types
boolean isEqual = true;
- for (int i = 0; i < mTypes.length; i++)
- {
- if (! mTypes[i].equals(_mTypes[i]))
- {
+ for (int i = 0; i < mTypes.length; i++) {
+ if (!mTypes[i].equals(_mTypes[i])) {
isEqual = false;
break;
}
}
-
- if (isEqual)
- {
+ if (isEqual) {
found = true;
break;
}
}
-
return found;
}
public DefinitionsDocument getWSDLAsDocument()
- throws IOException, XmlException
- {
+ throws IOException, XmlException {
return WSDLProcessor.parseWSDL(getWsWsdlLocation());
}
@@ -607,8 +509,7 @@
}
/**
- * @param hcFileName
- * The hcFileName to set.
+ * @param hcFileName The hcFileName to set.
*/
public void setHcFileName(String hcFileName) {
this.hcFileName = hcFileName;
@@ -622,8 +523,7 @@
}
/**
- * @param hcName
- * The hcName to set.
+ * @param hcName The hcName to set.
*/
public void setHcName(String hcName) {
this.hcName = hcName;
@@ -637,8 +537,7 @@
}
/**
- * @param securityRoles
- * The securityRoles to set.
+ * @param securityRoles The securityRoles to set.
*/
public void setSecurityRoles(SecurityRolesInfo securityRoles) {
this.securityRoles = securityRoles;
@@ -652,8 +551,7 @@
}
/**
- * @param siValue
- * The siRunAs to set.
+ * @param siValue The siRunAs to set.
*/
public void setSiValue(String siValue) {
this.siValue = siValue;
@@ -667,8 +565,7 @@
}
/**
- * @param soapBinding
- * The soapBinding to set.
+ * @param soapBinding The soapBinding to set.
*/
public void setSoapBinding(SOAPBindingInfo soapBinding) {
this.soapBinding = soapBinding;
@@ -682,8 +579,7 @@
}
/**
- * @param wsName
- * The wsName to set.
+ * @param wsName The wsName to set.
*/
public void setWsName(String wsName) {
this.wsName = wsName;
@@ -697,8 +593,7 @@
}
/**
- * @param wsServiceName
- * The wsServiceName to set.
+ * @param wsServiceName The wsServiceName to set.
*/
public void setWsServiceName(String wsServiceName) {
this.wsServiceName = wsServiceName;
@@ -712,8 +607,7 @@
}
/**
- * @param wsTargetNamespace
- * The wsTargetNamespace to set.
+ * @param wsTargetNamespace The wsTargetNamespace to set.
*/
public void setWsTargetNamespace(String wsTargetNamespace) {
this.wsTargetNamespace = wsTargetNamespace;
@@ -727,8 +621,7 @@
}
/**
- * @param wsEndpointInterface
- * The wsEndpointInterface to set.
+ * @param wsEndpointInterface The wsEndpointInterface to set.
*/
public void setWsEndpointInterface(String wsEndpointInterface) {
this.wsEndpointInterface = wsEndpointInterface;
@@ -742,8 +635,7 @@
}
/**
- * @param wsWsdlLocation
- * The wsWsdlLocation to set.
+ * @param wsWsdlLocation The wsWsdlLocation to set.
*/
public void setWsWsdlLocation(String wsWsdlLocation) {
this.wsWsdlLocation = wsWsdlLocation;
@@ -756,8 +648,7 @@
return Collections.unmodifiableCollection(methods);
}
- public void addMethod(WebServiceMETHODMetadata method)
- {
+ public void addMethod(WebServiceMETHODMetadata method) {
methods.add(method);
}
@@ -769,30 +660,23 @@
soapHandlers.add(soapHandler);
}
- public String getServiceImplementationBean()
- {
+ public String getServiceImplementationBean() {
return sibClassName;
}
- public String getServiceEndpointInterface()
- {
+ public String getServiceEndpointInterface() {
return seiClassName;
}
- private String getTargetNamespace(String fqClassName)
- {
- if ((null == fqClassName) || (0 == fqClassName.length()))
- {
+ private String getTargetNamespace(String fqClassName) {
+ if ((null == fqClassName) || (0 == fqClassName.length())) {
return fqClassName;
}
-
String[] tokens = fqClassName.split("\\.");
String targetNamespace = tokens[0];
- for (int i = 1; i <= tokens.length - 2; i++)
- {
+ for (int i = 1; i <= tokens.length - 2; i++) {
targetNamespace = tokens[i] + "." + targetNamespace;
}
-
return "http://" + targetNamespace;
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/ProcessorException.java Fri Oct 29 13:13:18 2004
@@ -18,16 +18,22 @@
* $Header:$
*/
-
/**
* A simple exception wrapper class used for processor failures.
* It subclasses runtime exception because user errors that result in code
* generation failures are reported through the APT messager class.
*/
-public class ProcessorException extends RuntimeException
-{
- public ProcessorException(String msg, Exception e) { super(msg, e); }
- public ProcessorException(String msg) { super(msg); }
- public ProcessorException(Exception e) { super("Code Generation Exception", e); }
+public class ProcessorException extends RuntimeException {
+ public ProcessorException(String msg, Exception e) {
+ super(msg, e);
+ }
+
+ public ProcessorException(String msg) {
+ super(msg);
+ }
+
+ public ProcessorException(Exception e) {
+ super("Code Generation Exception", e);
+ }
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java Fri Oct 29 13:13:18 2004
@@ -32,11 +32,10 @@
* AnnotationProcessor interface. It breaks the work of the process() method of the
* AnnotationProcessor down into two distinct phases, represented as abstract method
* of TwoPhaseAnnotationProcessor that are to be implemented by concrete subclasses.
- * <p>
* The two phases of processing are:
* <ul>
* <li>The <b>check</b> phase is used to validate input Declarations that have been
- * annotated with annotations claimed by the processor to ensure that it
+ * annotated with annotations claimed by the processor to ensure that it
* is semantically valid. If the presence of the input Declaration implies the need
* to add new files, and those files need to be visible during the check phase for
* other Declarations, then the AnnotationProcessorEnvironment's Filer API should be
@@ -50,7 +49,6 @@
* new files, however, such additions will not be visible during the check phase of
* any Declarations.
* </ul>
- * <p>
* The benefits of breaking process() down into check() and generate() phases are:
* <ol>
* <li>Makes it possible to perform the semantic validation of Declarations without
@@ -64,11 +62,9 @@
* of the AnnotationProcessorEnvironment and associated interfaces (Messager,
* Filer etc).
*/
-abstract public class TwoPhaseAnnotationProcessor implements AnnotationProcessor
-{
+abstract public class TwoPhaseAnnotationProcessor implements AnnotationProcessor {
public TwoPhaseAnnotationProcessor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env)
- {
+ AnnotationProcessorEnvironment env) {
_atds = atds;
_env = env;
}
@@ -76,8 +72,7 @@
/**
* Implements AnnotationProcessor.process() as two phases, "check" and "generate".
*/
- public void process()
- {
+ public void process() {
check();
generate();
}
@@ -86,13 +81,10 @@
* Performs semantic validation of input Declarations that are annotated with
* annotations claimed by this AnnotationProcessor.
*/
- public void check()
- {
- for (AnnotationTypeDeclaration atd : _atds)
- {
+ public void check() {
+ for (AnnotationTypeDeclaration atd : _atds) {
Collection<Declaration> decls = _env.getDeclarationsAnnotatedWith(atd);
- for (Declaration decl : decls)
- {
+ for (Declaration decl : decls) {
check(decl);
}
}
@@ -102,25 +94,20 @@
* Emits additional artifacts for input Declarations that are annotated with
* annotations claimed by this AnnotationProcessor.
*/
- public void generate() throws ProcessorException
- {
- for (AnnotationTypeDeclaration atd : _atds)
- {
+ public void generate() throws ProcessorException {
+ for (AnnotationTypeDeclaration atd : _atds) {
Collection<Declaration> decls = _env.getDeclarationsAnnotatedWith(atd);
- for (Declaration decl : decls)
- {
+ for (Declaration decl : decls) {
generate(decl);
}
}
}
-
+
/**
* The check method is responsible for all semantic validation of the input Declaration.
- * <p>
* All semantic warnings/errors associated with the input Declaration should
* be output during check via a Messager obtained from the
* AnnotationProcessorEnvironment.
- * <p>
* If the presence of the input Declaration implies the need to add new files,
* and those files need to be visible during the check phase for
* other Declarations, then the AnnotationProcessorEnvironment's Filer API should be
@@ -137,8 +124,7 @@
*/
abstract public void generate(Declaration decl);
- protected AnnotationProcessorEnvironment getAnnotationProcessorEnvironment()
- {
+ protected AnnotationProcessorEnvironment getAnnotationProcessorEnvironment() {
return _env;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java Fri Oct 29 13:13:18 2004
@@ -21,106 +21,91 @@
import com.sun.mirror.type.ArrayType;
import com.sun.mirror.type.PrimitiveType;
import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.type.VoidType;
+import com.sun.mirror.type.VoidType;
public class TypeMirrorUtil {
// returns a class object of the specified type.
- public static Class classForName(TypeMirror type) throws ClassNotFoundException
- {
-
- if( type instanceof PrimitiveType )
- {
- return getPrimitiveClass( ( (PrimitiveType) type).getKind() );
- }
- else if ( type instanceof VoidType )
- {
+ public static Class classForName(TypeMirror type) throws ClassNotFoundException {
+ if (type instanceof PrimitiveType) {
+ return getPrimitiveClass(((PrimitiveType) type).getKind());
+ } else if (type instanceof VoidType) {
return void.class;
- }
- else if ( type instanceof ArrayType )
- {
+ } else if (type instanceof ArrayType) {
Object[] typeOfArray = new Object[]{new Object()};
- int arrayDepth = arrayDepth((ArrayType)type,0,typeOfArray);
-
+ int arrayDepth = arrayDepth((ArrayType) type, 0, typeOfArray);
StringBuffer className = new StringBuffer();
- for( int i = 0 ; i < arrayDepth ; i++ ){
- className.append("[");
+ for (int i = 0; i < arrayDepth; i++) {
+ className.append("[");
}
-
- TypeMirror mirrorTypeOfArray = (TypeMirror)typeOfArray[0];
- if( mirrorTypeOfArray instanceof PrimitiveType ){
+ TypeMirror mirrorTypeOfArray = (TypeMirror) typeOfArray[0];
+ if (mirrorTypeOfArray instanceof PrimitiveType) {
// e.g. an array of int will be "[I".
- className.append( getTypeSignatureOfPrimitiveType( ((PrimitiveType)mirrorTypeOfArray).getKind()) );
- }else{
+ className.append(getTypeSignatureOfPrimitiveType(((PrimitiveType) mirrorTypeOfArray).getKind()));
+ } else {
// e.g. an array of String will be "[Ljava.lang.String;".
- className.append("L").append(((TypeMirror)typeOfArray[0]).toString()).append(";");
- }
-
- return Class.forName( className.toString() );
-
+ className.append("L").append(((TypeMirror) typeOfArray[0]).toString()).append(";");
+ }
+ return Class.forName(className.toString());
}
-
return Class.forName(type.toString());
-
}
private static Class getPrimitiveClass(PrimitiveType.Kind kind) {
-
// todo: change order of the cases for better performance.
- switch(kind){
- case BOOLEAN:
- return boolean.class;
- case BYTE:
- return byte.class;
- case CHAR:
- return char.class;
- case DOUBLE:
- return double.class;
- case FLOAT:
- return float.class;
- case INT:
- return int.class;
- case LONG:
- return long.class;
- case SHORT:
- return short.class;
+ switch (kind) {
+ case BOOLEAN:
+ return boolean.class;
+ case BYTE:
+ return byte.class;
+ case CHAR:
+ return char.class;
+ case DOUBLE:
+ return double.class;
+ case FLOAT:
+ return float.class;
+ case INT:
+ return int.class;
+ case LONG:
+ return long.class;
+ case SHORT:
+ return short.class;
}
// todo: throw ClassNotFoundException
return null;
}
- private static String getTypeSignatureOfPrimitiveType(PrimitiveType.Kind kind){
-
+ private static String getTypeSignatureOfPrimitiveType(PrimitiveType.Kind kind) {
// todo: change order of the cases for better performance.
- switch(kind){
- case BOOLEAN:
- return "Z";
- case BYTE:
- return "B";
- case CHAR:
- return "C";
- case DOUBLE:
- return "D";
- case FLOAT:
- return "F";
- case INT:
- return "I";
- case LONG:
- return "J";
- case SHORT:
- return "S";
+ switch (kind) {
+ case BOOLEAN:
+ return "Z";
+ case BYTE:
+ return "B";
+ case CHAR:
+ return "C";
+ case DOUBLE:
+ return "D";
+ case FLOAT:
+ return "F";
+ case INT:
+ return "I";
+ case LONG:
+ return "J";
+ case SHORT:
+ return "S";
}
// todo: throw ClassNotFoundException
return null;
}
- private static int arrayDepth( ArrayType type, int depth, Object[] typeOfArray){
- if ( type.getComponentType() instanceof ArrayType ){
- return arrayDepth((ArrayType)type.getComponentType(),++depth, typeOfArray);
- }else{
- typeOfArray[0] = type.getComponentType();
+ private static int arrayDepth(ArrayType type, int depth, Object[] typeOfArray) {
+ if (type.getComponentType() instanceof ArrayType) {
+ return arrayDepth((ArrayType) type.getComponentType(), ++depth, typeOfArray);
+ } else {
+ typeOfArray[0] = type.getComponentType();
}
return ++depth;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java Fri Oct 29 13:13:18 2004
@@ -30,74 +30,68 @@
// adhock. assume Metadata is not nested more than 5 times. :p
private static String[] TABS = new String[]{
- "",
- " ",
- " ",
- " ",
- " ",
- " "
- };
-
- public static void print ( WebServiceTYPEMetadata webServiceTYPEMetadata ){
- print( 0, webServiceTYPEMetadata );
- }
-
- public static void print ( int tab, WebServiceTYPEMetadata webServiceTYPEMetadata ){
- print( tab, "<TYPE > > >WebServiceTYPEMetadata");
- print( tab, "wsName" , webServiceTYPEMetadata.getWsName() );
- print( tab, "wsServiceName" , webServiceTYPEMetadata.getWsServiceName() );
- print( tab, "wsWsdlLocation" , webServiceTYPEMetadata.getWsWsdlLocation() );
- print( tab, "wsTargetNamespace" , webServiceTYPEMetadata.getWsTargetNamespace() );
- print( tab, "wsEndpointInterface" , webServiceTYPEMetadata.getWsEndpointInterface() );
- print( tab, "hcFileName" , webServiceTYPEMetadata.getHcFileName() );
- print( tab, "hcName" , webServiceTYPEMetadata.getHcName() );
+ "",
+ " ",
+ " ",
+ " ",
+ " ",
+ " "
+ };
+
+ public static void print(WebServiceTYPEMetadata webServiceTYPEMetadata) {
+ print(0, webServiceTYPEMetadata);
+ }
+
+ public static void print(int tab, WebServiceTYPEMetadata webServiceTYPEMetadata) {
+ print(tab, "<TYPE > > >WebServiceTYPEMetadata");
+ print(tab, "wsName", webServiceTYPEMetadata.getWsName());
+ print(tab, "wsServiceName", webServiceTYPEMetadata.getWsServiceName());
+ print(tab, "wsWsdlLocation", webServiceTYPEMetadata.getWsWsdlLocation());
+ print(tab, "wsTargetNamespace", webServiceTYPEMetadata.getWsTargetNamespace());
+ print(tab, "wsEndpointInterface", webServiceTYPEMetadata.getWsEndpointInterface());
+ print(tab, "hcFileName", webServiceTYPEMetadata.getHcFileName());
+ print(tab, "hcName", webServiceTYPEMetadata.getHcName());
//print( tab, "siRunAs" , webServiceTYPEMetadata.getSiRunAs() );
- print( tab, "serviceImplementationBean" , webServiceTYPEMetadata.getServiceImplementationBean() );
-
+ print(tab, "serviceImplementationBean", webServiceTYPEMetadata.getServiceImplementationBean());
print("");
-
tab++;
-
- print( tab, webServiceTYPEMetadata.getMethods() );
- print( tab, webServiceTYPEMetadata.getSoapBinding() );
- print( tab, webServiceTYPEMetadata.getSecurityRoles() );
-
+ print(tab, webServiceTYPEMetadata.getMethods());
+ print(tab, webServiceTYPEMetadata.getSoapBinding());
+ print(tab, webServiceTYPEMetadata.getSecurityRoles());
}
- public static void print ( Collection collection ){
+ public static void print(Collection collection) {
print(0, collection);
}
- public static void print ( int tab, Collection collection ){
- if(collection == null)
+ public static void print(int tab, Collection collection) {
+ if (collection == null)
return;
-
- for( Object element : collection ){
- if ( element instanceof WebServiceTYPEMetadata ) {
- print( tab, (WebServiceTYPEMetadata) element );
- }else if ( element instanceof WebServiceMETHODMetadata ) {
- print( tab, (WebServiceMETHODMetadata) element );
- }else if ( element instanceof WebServicePARAMETERMetadata ) {
- print( tab, (WebServicePARAMETERMetadata) element );
+ for (Object element : collection) {
+ if (element instanceof WebServiceTYPEMetadata) {
+ print(tab, (WebServiceTYPEMetadata) element);
+ } else if (element instanceof WebServiceMETHODMetadata) {
+ print(tab, (WebServiceMETHODMetadata) element);
+ } else if (element instanceof WebServicePARAMETERMetadata) {
+ print(tab, (WebServicePARAMETERMetadata) element);
}
}
}
- public static void print ( WebServiceMETHODMetadata webServiceMETHODMetadata ){
- print( 0, webServiceMETHODMetadata );
+ public static void print(WebServiceMETHODMetadata webServiceMETHODMetadata) {
+ print(0, webServiceMETHODMetadata);
}
- public static void print ( int tab, WebServiceMETHODMetadata webServiceMETHODMetadata ){
- if(webServiceMETHODMetadata == null)
+ public static void print(int tab, WebServiceMETHODMetadata webServiceMETHODMetadata) {
+ if (webServiceMETHODMetadata == null)
return;
-
- print( tab, "<METHOD > > > > > >WebServiceMETHODMetadata");
- print( tab, "wmOperationName", webServiceMETHODMetadata.getWmOperationName());
- print( tab, "wmAction", webServiceMETHODMetadata.getWmAction());
- print( tab, "oneway", webServiceMETHODMetadata.isOneWay() ? "true" : "false");
- print( tab, "wrName", webServiceMETHODMetadata.getWrName());
- print( tab, "javaMethodName", webServiceMETHODMetadata.getJavaMethodName());
- print( tab, "javaReturnType", webServiceMETHODMetadata.getJavaReturnType());
+ print(tab, "<METHOD > > > > > >WebServiceMETHODMetadata");
+ print(tab, "wmOperationName", webServiceMETHODMetadata.getWmOperationName());
+ print(tab, "wmAction", webServiceMETHODMetadata.getWmAction());
+ print(tab, "oneway", webServiceMETHODMetadata.isOneWay() ? "true" : "false");
+ print(tab, "wrName", webServiceMETHODMetadata.getWrName());
+ print(tab, "javaMethodName", webServiceMETHODMetadata.getJavaMethodName());
+ print(tab, "javaReturnType", webServiceMETHODMetadata.getJavaReturnType());
//print( tab, "DwRequestElement");
//print( tab, webServiceMETHODMetadata.getDwRequestElement() );
@@ -108,76 +102,68 @@
//print( tab, webServiceMETHODMetadata.getSecurityRoles() );
print("");
-
tab++;
-
- print( tab, webServiceMETHODMetadata.getParams() );
-
+ print(tab, webServiceMETHODMetadata.getParams());
}
- public static void print ( WebServicePARAMETERMetadata webServicePARAMETERMetadata ){
- print( 0, webServicePARAMETERMetadata );
+ public static void print(WebServicePARAMETERMetadata webServicePARAMETERMetadata) {
+ print(0, webServicePARAMETERMetadata);
}
- public static void print ( int tab, WebServicePARAMETERMetadata webServicePARAMETERMetadata ){
- if(webServicePARAMETERMetadata == null)
+ public static void print(int tab, WebServicePARAMETERMetadata webServicePARAMETERMetadata) {
+ if (webServicePARAMETERMetadata == null)
return;
-
- print( tab, "<PARAM > > > > > > > > >WebServicePARAMETERMetadata");
- print( tab, "wpName" , webServicePARAMETERMetadata.getWpName());
- print( tab, "wpMode" , webServicePARAMETERMetadata.getWpMode());
- print( tab, "wpHeader" , webServicePARAMETERMetadata.isWpHeader() ? "true" : "false" );
- print( tab, "javaType" , webServicePARAMETERMetadata.getJavaType());
+ print(tab, "<PARAM > > > > > > > > >WebServicePARAMETERMetadata");
+ print(tab, "wpName", webServicePARAMETERMetadata.getWpName());
+ print(tab, "wpMode", webServicePARAMETERMetadata.getWpMode());
+ print(tab, "wpHeader", webServicePARAMETERMetadata.isWpHeader() ? "true" : "false");
+ print(tab, "javaType", webServicePARAMETERMetadata.getJavaType());
//print( "defaultName", webServicePARAMETERMetadata.getDefaultName());
print("");
}
- public static void print ( SOAPBindingInfo soapBindingInfo ){
- print( 0, soapBindingInfo );
+ public static void print(SOAPBindingInfo soapBindingInfo) {
+ print(0, soapBindingInfo);
}
- public static void print ( int tab, SOAPBindingInfo soapBindingInfo ){
- if(soapBindingInfo == null)
+ public static void print(int tab, SOAPBindingInfo soapBindingInfo) {
+ if (soapBindingInfo == null)
return;
-
- print( tab, ">SOAPBindingInfo");
- print( tab, "style" , soapBindingInfo.getStyle() );
- print( tab, "use" , soapBindingInfo.getUse() );
- print( tab, "style" , soapBindingInfo.getParameterStyle() );
+ print(tab, ">SOAPBindingInfo");
+ print(tab, "style", soapBindingInfo.getStyle());
+ print(tab, "use", soapBindingInfo.getUse());
+ print(tab, "style", soapBindingInfo.getParameterStyle());
}
- public static void print ( SecurityRolesInfo securityRolesInfo ){
- print( 0, securityRolesInfo);
+ public static void print(SecurityRolesInfo securityRolesInfo) {
+ print(0, securityRolesInfo);
}
- public static void print ( int tab, SecurityRolesInfo securityRolesInfo ){
- if(securityRolesInfo == null)
+ public static void print(int tab, SecurityRolesInfo securityRolesInfo) {
+ if (securityRolesInfo == null)
return;
-
- print( tab, ">SecurityRolesInfo");
- print( tab, "rolesAllowed");
- for( String role : securityRolesInfo.getRolesAllowed()){
+ print(tab, ">SecurityRolesInfo");
+ print(tab, "rolesAllowed");
+ for (String role : securityRolesInfo.getRolesAllowed()) {
print(tab, " " + role);
}
- print( tab, "rolesReferenced");
- for( String role : securityRolesInfo.getRolesReferenced()){
+ print(tab, "rolesReferenced");
+ for (String role : securityRolesInfo.getRolesReferenced()) {
print(tab, " " + role);
}
-
}
- public static void print (int tab, String msg, Object data ) {
- print( tab, msg + " : " + data);
+ public static void print(int tab, String msg, Object data) {
+ print(tab, msg + " : " + data);
}
- public static void print (int tab, String msg ) {
- print( TABS[tab] + msg );
+ public static void print(int tab, String msg) {
+ print(TABS[tab] + msg);
}
- public static void print ( String msg ) {
- System.out.println( msg );
+ public static void print(String msg) {
+ System.out.println(msg);
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java Fri Oct 29 13:13:18 2004
@@ -42,13 +42,11 @@
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
-public class WsmAnnotationProcessor extends TwoPhaseAnnotationProcessor
-{
+public class WsmAnnotationProcessor extends TwoPhaseAnnotationProcessor {
/**
* Constructor.
*/
- public WsmAnnotationProcessor(Set<AnnotationTypeDeclaration> _atds, AnnotationProcessorEnvironment _env)
- {
+ public WsmAnnotationProcessor(Set<AnnotationTypeDeclaration> _atds, AnnotationProcessorEnvironment _env) {
super(_atds, _env);
}
@@ -56,36 +54,30 @@
* @see TwoPhaseAnnotationProcessor
*/
@Override
- public void check(Declaration decl)
- {
+ public void check(Declaration decl) {
// check type of declaration
- if (null == decl)
- {
+ if (null == decl) {
throw new ProcessorException("Declaration type \"null\" not allowed");
}
// check if we're interested
- if (! (decl instanceof ClassDeclaration) && ! (decl instanceof InterfaceDeclaration))
- {
+ if (!(decl instanceof ClassDeclaration) && !(decl instanceof InterfaceDeclaration)) {
return;
}
// verify @WebService annotation (being paranoid)
javax.jws.WebService ws = decl.getAnnotation(javax.jws.WebService.class);
- if (null == ws)
- {
+ if (null == ws) {
throw new ProcessorException("@WebService annotation missing in source file");
}
// service implementation bean
- if (0 == ws.endpointInterface().length())
- {
+ if (0 == ws.endpointInterface().length()) {
checkObjectModel((TypeDeclaration) decl, ws);
}
// service endpoint interface
- else
- {
+ else {
try {
Class seiClass = Class.forName(ws.endpointInterface());
/*
@@ -98,9 +90,8 @@
throw new ProcessorException("Failed to create object model for class: " + seiClass.getName());
// todo: proper error handling
}
-*/
- }
- catch (ClassNotFoundException e) {
+*/
+ } catch (ClassNotFoundException e) {
e.printStackTrace(); // todo: proper error handling
}
}
@@ -110,28 +101,25 @@
* @see TwoPhaseAnnotationProcessor
*/
@Override
- public void generate(Declaration decl)
- {
+ public void generate(Declaration decl) {
// jws-class file is the only artifact to be generated, which is
// done automatically as part of apt
}
/**
* Check object model for implementation beans.
+ *
* @param decl
* @param ws
* @return AnnotationModel
*/
- protected AnnotationModel checkObjectModel(TypeDeclaration decl, javax.jws.WebService ws)
- {
+ protected AnnotationModel checkObjectModel(TypeDeclaration decl, javax.jws.WebService ws) {
Collection<WebServiceMETHODMetadata> webMethods =
- new ArrayList<WebServiceMETHODMetadata>();
+ new ArrayList<WebServiceMETHODMetadata>();
// publish methods @WebMethod annotations
- for (MethodDeclaration methodDecl : decl.getMethods())
- {
- if (null != methodDecl.getAnnotation(javax.jws.WebMethod.class))
- {
+ for (MethodDeclaration methodDecl : decl.getMethods()) {
+ if (null != methodDecl.getAnnotation(javax.jws.WebMethod.class)) {
webMethods.add(getWebServiceMETHODMetadata(methodDecl));
}
}
@@ -141,30 +129,22 @@
try {
Collection<Annotation> annotations = getAnnotations(decl);
wstm = new WebServiceTYPEMetadata((javax.jws.WebService)
- AnnotationModel.getAnnotationOfType(
+ AnnotationModel.getAnnotationOfType(annotations,
+ javax.jws.WebService.class),
+ decl.getQualifiedName(),
annotations,
- javax.jws.WebService.class
- ),
- decl.getQualifiedName(),
- annotations,
- webMethods
- );
- }
- catch (Throwable t)
- {
+ webMethods);
+ } catch (Throwable t) {
t.printStackTrace(); // todo: proper error handling
}
return wstm;
}
- protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(
- MethodDeclaration decl)
- {
+ protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(MethodDeclaration decl) {
// get webMethod's webParams
List<WebServicePARAMETERMetadata> webParams =
- new ArrayList<WebServicePARAMETERMetadata>();
- for ( ParameterDeclaration paramDecl : decl.getParameters() )
- {
+ new ArrayList<WebServicePARAMETERMetadata>();
+ for (ParameterDeclaration paramDecl : decl.getParameters()) {
webParams.add(getWebServicePARAMETERMetadata(paramDecl));
}
@@ -172,70 +152,55 @@
WebServiceMETHODMetadata wsmm = null;
try {
Collection<Annotation> annotations = getAnnotations(decl);
- wsmm = new WebServiceMETHODMetadata(
- decl.getSimpleName(),
- TypeMirrorUtil.classForName(decl.getReturnType()),
- (0 < decl.getThrownTypes().size()),
- annotations,
- webParams
- );
- }
- catch (Throwable t)
- {
+ wsmm = new WebServiceMETHODMetadata(decl.getSimpleName(),
+ TypeMirrorUtil.classForName(decl.getReturnType()),
+ (0 < decl.getThrownTypes().size()),
+ annotations,
+ webParams);
+ } catch (Throwable t) {
t.printStackTrace(); // todo: proper error handling
}
return wsmm;
}
-
- protected WebServicePARAMETERMetadata getWebServicePARAMETERMetadata(
- ParameterDeclaration decl)
- {
+
+ protected WebServicePARAMETERMetadata getWebServicePARAMETERMetadata(ParameterDeclaration decl) {
// create & return webParam
WebServicePARAMETERMetadata wspm = null;
try {
Collection<Annotation> annotations = getAnnotations(decl);
- wspm = new WebServicePARAMETERMetadata(
- TypeMirrorUtil.classForName(decl.getType()),
- decl.getSimpleName(),
- annotations
- );
- }
- catch (Throwable t)
- {
+ wspm = new WebServicePARAMETERMetadata(TypeMirrorUtil.classForName(decl.getType()),
+ decl.getSimpleName(),
+ annotations);
+ } catch (Throwable t) {
t.printStackTrace(); // todo: proper error handling
}
return wspm;
}
-
- private Collection<Annotation> getAnnotations(Declaration decl)
- {
+
+ private Collection<Annotation> getAnnotations(Declaration decl) {
Collection<Annotation> annotations = new ArrayList<Annotation>();
- for ( AnnotationMirror am : decl.getAnnotationMirrors() )
- {
- AnnotationType at = am.getAnnotationType();
+ for (AnnotationMirror am : decl.getAnnotationMirrors()) {
+ AnnotationType at = am.getAnnotationType();
try {
Class clazz = Class.forName(at.getDeclaration().getQualifiedName());
Annotation a = decl.getAnnotation(clazz);
- if (null != a)
- {
+ if (null != a) {
annotations.add(a);
}
+ } catch (ClassNotFoundException e) {
}
- catch (ClassNotFoundException e) { }
}
return annotations;
}
-
- public static AnnotationModel getObjectModel(String name)
- {
+
+ public static AnnotationModel getObjectModel(String name) {
return objectModels.get(name);
}
- public static Set<String> getObjectModelNames()
- {
+ public static Set<String> getObjectModelNames() {
return objectModels.keySet();
}
private static Map<String, AnnotationModel> objectModels =
- new HashMap<String, AnnotationModel>();
+ new HashMap<String, AnnotationModel>();
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java Fri Oct 29 13:13:18 2004
@@ -29,11 +29,9 @@
import com.sun.mirror.apt.AnnotationProcessorFactory;
import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-public class WsmAnnotationProcessorFactory implements AnnotationProcessorFactory
-{
+public class WsmAnnotationProcessorFactory implements AnnotationProcessorFactory {
private static final Collection<String> supportedAnnotations =
- unmodifiableCollection(
- asList(new String[] {
+ unmodifiableCollection(asList(new String[]{
"javax.jws.WebService",
"javax.jws.WebMethod",
"javax.jws.WebParam",
@@ -48,19 +46,15 @@
private static final Collection<String> supportedOptions = emptySet();
- public Collection<String> supportedAnnotationTypes()
- {
+ public Collection<String> supportedAnnotationTypes() {
return supportedAnnotations;
}
- public Collection<String> supportedOptions()
- {
+ public Collection<String> supportedOptions() {
return supportedOptions;
}
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env)
- {
- return new WsmAnnotationProcessor(atds, env);
+ public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env) {
+ return new WsmAnnotationProcessor(atds, env);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java Fri Oct 29 13:13:18 2004
@@ -33,87 +33,69 @@
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-public class WsmReflectionAnnotationProcessor
-{
+public class WsmReflectionAnnotationProcessor {
private static WsmReflectionAnnotationProcessor _instance;
-
- private WsmReflectionAnnotationProcessor()
- {
+
+ private WsmReflectionAnnotationProcessor() {
super();
}
-
- public static WsmReflectionAnnotationProcessor getInstance()
- {
- if (null == _instance)
- {
+
+ public static WsmReflectionAnnotationProcessor getInstance() {
+ if (null == _instance) {
_instance = new WsmReflectionAnnotationProcessor();
}
-
return _instance;
}
/**
* Create object model from class.
+ *
* @param sibClass Service implementation bean class.
* @return
*/
- public AnnotationModel getObjectModel(Class sibClass)
- {
+ public AnnotationModel getObjectModel(Class sibClass) {
return getWebServiceTYPEMetadata(sibClass);
}
-
+
/**
* @param sibClass
* @return
*/
- protected WebServiceTYPEMetadata getWebServiceTYPEMetadata(Class sibClass)
- {
- if (null == sibClass)
- {
+ protected WebServiceTYPEMetadata getWebServiceTYPEMetadata(Class sibClass) {
+ if (null == sibClass) {
return null;
}
// check WebService annotation
WebService wsAnnotation = (WebService) sibClass.getAnnotation(WebService.class);
- if (null == wsAnnotation)
- {
+ if (null == wsAnnotation) {
return null;
}
// check endpointInterface
boolean hasServiceEndpointInterface = false;
- if ((null != wsAnnotation.endpointInterface()) && (0 < wsAnnotation.endpointInterface().length()))
- {
+ if ((null != wsAnnotation.endpointInterface()) && (0 < wsAnnotation.endpointInterface().length())) {
hasServiceEndpointInterface = true;
}
// webMethods
Collection<WebServiceMETHODMetadata> webMethods =
- new ArrayList<WebServiceMETHODMetadata>();
-
+ new ArrayList<WebServiceMETHODMetadata>();
Collection<Annotation> annotations;
- if (hasServiceEndpointInterface)
- {
+ if (hasServiceEndpointInterface) {
try {
Class seiClass = Class.forName(wsAnnotation.endpointInterface());
- for (Method method : Arrays.asList(seiClass.getMethods()))
- {
+ for (Method method : Arrays.asList(seiClass.getMethods())) {
webMethods.add(getWebServiceMETHODMetadata(method));
}
annotations = (Collection<Annotation>) Arrays.asList(seiClass.getAnnotations());
- }
- catch (ClassNotFoundException e)
- {
+ } catch (ClassNotFoundException e) {
return null;
}
- }
- else
- {
- for (Method method: sibClass.getMethods())
- {
+ } else {
+ for (Method method : sibClass.getMethods()) {
// add only annotated methods
- if (AnnotationModel.hasAnnotationType(Arrays.asList(method.getAnnotations()), WebMethod.class))
- {
+ if (AnnotationModel.hasAnnotationType(Arrays.asList(method.getAnnotations()), WebMethod.class)) {
webMethods.add(getWebServiceMETHODMetadata(method));
}
}
@@ -123,59 +105,45 @@
// create & return WebService
WebServiceTYPEMetadata wstm = null;
try {
- wstm = new WebServiceTYPEMetadata(
- (WebService) sibClass.getAnnotation(WebService.class),
- sibClass.getName(),
- annotations,
- webMethods
- );
+ wstm = new WebServiceTYPEMetadata((WebService) sibClass.getAnnotation(WebService.class),
+ sibClass.getName(),
+ annotations,
+ webMethods);
wstm.validate();
- }
- catch (Throwable t)
- {
+ } catch (Throwable t) {
t.printStackTrace(); // todo: proper error handling
wstm = null;
}
return wstm;
}
-
+
/**
* @param method
* @return
*/
- protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(Method method)
- {
+ protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(Method method) {
List<WebServicePARAMETERMetadata> webParams =
- new ArrayList<WebServicePARAMETERMetadata>();
+ new ArrayList<WebServicePARAMETERMetadata>();
// publish all params
Annotation[][] allAnnotations = method.getParameterAnnotations();
int offset = 0;
- for (Class paramType : method.getParameterTypes())
- {
- webParams.add(
- getWebServicePARAMETERMetadata(
- paramType,
+ for (Class paramType : method.getParameterTypes()) {
+ webParams.add(getWebServicePARAMETERMetadata(paramType,
offset,
- Arrays.asList(allAnnotations[offset])
- )
- );
+ Arrays.asList(allAnnotations[offset])));
offset++;
}
// create & return webMethod
WebServiceMETHODMetadata wsmm = null;
try {
- wsmm = new WebServiceMETHODMetadata(
- method.getName(),
- method.getReturnType(),
- (0 < method.getExceptionTypes().length),
- Arrays.asList(method.getAnnotations()),
- webParams
- );
- }
- catch (Throwable t)
- {
+ wsmm = new WebServiceMETHODMetadata(method.getName(),
+ method.getReturnType(),
+ (0 < method.getExceptionTypes().length),
+ Arrays.asList(method.getAnnotations()),
+ webParams);
+ } catch (Throwable t) {
t.printStackTrace(); // todo proper error handling
wsmm = null;
}
@@ -188,19 +156,14 @@
* @param annotations
* @return
*/
- protected WebServicePARAMETERMetadata getWebServicePARAMETERMetadata(Class paramType, int offset, List<Annotation> annotations)
- {
+ protected WebServicePARAMETERMetadata getWebServicePARAMETERMetadata(Class paramType, int offset, List<Annotation> annotations) {
// create & return webParam
WebServicePARAMETERMetadata wspm = null;
try {
- wspm = new WebServicePARAMETERMetadata(
- paramType,
- "in" + offset, // by default parameter should be IN
- annotations
- );
- }
- catch (Throwable t)
- {
+ wspm = new WebServicePARAMETERMetadata(paramType,
+ "in" + offset, // by default parameter should be IN
+ annotations);
+ } catch (Throwable t) {
t.printStackTrace(); // todo: proper error handling
wspm = null;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java Fri Oct 29 13:13:18 2004
@@ -56,34 +56,29 @@
import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
import org.xmlsoap.schemas.wsdl.soap.UseChoice;
-/*******************************************************************************
- *
- *
+/**
+ * ****************************************************************************
*/
public class WSDLProcessor {
- public static final String TRANSPORT =
- "http://schemas.xmlsoap.org/soap/http";
+ public static final String TRANSPORT =
+ "http://schemas.xmlsoap.org/soap/http";
- public static final String SOAPENCODING =
- "http://schemas.xmlsoap.org/soap/encoding/";
+ public static final String SOAPENCODING =
+ "http://schemas.xmlsoap.org/soap/encoding/";
public static final String WSDLNS = "http://schemas.xmlsoap.org/wsdl/soap/";
public static final String WSDLSOAPNS =
- "http://schemas.xmlsoap.org/wsdl/soap/";
-
+ "http://schemas.xmlsoap.org/wsdl/soap/";
public static WebServiceTYPEMetadata toWebServiceMetadata
- (DefinitionsDocument defDoc)
- throws IllegalAccessException, NoSuchFieldException
- {
-
+ (DefinitionsDocument defDoc)
+ throws IllegalAccessException, NoSuchFieldException {
WebServiceTYPEMetadata wsm = new WebServiceTYPEMetadata(null);
- Map<String, WebServiceMETHODMetadata> methodMap =
- new HashMap<String, WebServiceMETHODMetadata>();
+ Map<String, WebServiceMETHODMetadata> methodMap =
+ new HashMap<String, WebServiceMETHODMetadata>();
TDefinitions defs = defDoc.getDefinitions();
-
Map<String, TPart[]> messageMap = new HashMap<String, TPart[]>();
if (defs.sizeOfMessageArray() > 0) {
TMessage[] messages = defs.getMessageArray();
@@ -91,7 +86,6 @@
messageMap.put(msg.getName(), msg.getPartArray());
}
}
-
if (defs.sizeOfPortTypeArray() > 0) {
TPortType tP = defs.getPortTypeArray(0);
wsm.setWsName(tP.getName());
@@ -100,13 +94,10 @@
processTOperation(op, wsm, methodMap, messageMap);
}
}
-
if (defs.sizeOfBindingArray() > 0) {
TBinding tBind = defs.getBindingArray(0);
processTBinding(tBind, wsm, methodMap);
-
}
-
if (defs.sizeOfServiceArray() > 0) {
wsm.setWsServiceName(defs.getServiceArray(0).getName());
}
@@ -114,66 +105,53 @@
}
public static DefinitionsDocument fromWebServiceMetadata
- (WebServiceTYPEMetadata wsm)
- throws Exception
- {
+ (WebServiceTYPEMetadata wsm)
+ throws Exception {
String ns = wsm.getWsTargetNamespace();
-
DefinitionsDocument defDoc = DefinitionsDocument.Factory.newInstance();
TDefinitions tDefs = defDoc.addNewDefinitions();
-
TPortType tPT = tDefs.addNewPortType();
tPT.setName(wsm.getWsName());
-
TBinding tBind = tDefs.addNewBinding();
tBind.setName(tPT.getName() + "Binding");
tBind.setType(new QName(ns, tPT.getName()));
org.xmlsoap.schemas.wsdl.soap.BindingDocument bindDoc =
- org.xmlsoap.schemas.wsdl.soap.BindingDocument.Factory.newInstance();
+ org.xmlsoap.schemas.wsdl.soap.BindingDocument.Factory.newInstance();
org.xmlsoap.schemas.wsdl.soap.TBinding tSoapBind = bindDoc
- .addNewBinding();
-
+ .addNewBinding();
if (SOAPBinding.Style.DOCUMENT.equals(wsm.getSoapBinding().getStyle())) {
tSoapBind.setStyle(TStyleChoice.DOCUMENT);
- }
- else {
+ } else {
tSoapBind.setStyle(TStyleChoice.RPC);
}
tSoapBind.setTransport(TRANSPORT);
insertChild(tBind, bindDoc);
-
processMethodMetadata(wsm.getMethods(), tDefs, tPT, tBind, ns);
-
TService tServ = tDefs.addNewService();
tServ.setName(wsm.getWsServiceName());
TPort tPort = tServ.addNewPort();
tPort.setName(wsm.getWsName());
tPort.setBinding(new QName(ns, tBind.getName()));
-
org.xmlsoap.schemas.wsdl.soap.AddressDocument addrDoc =
- org.xmlsoap.schemas.wsdl.soap.AddressDocument.Factory.newInstance();
+ org.xmlsoap.schemas.wsdl.soap.AddressDocument.Factory.newInstance();
org.xmlsoap.schemas.wsdl.soap.TAddress tAddr = addrDoc.addNewAddress();
tAddr.setLocation("fake://FAKEURL");
insertChild(tPort, tAddr);
-
- return defDoc;
+ return defDoc;
}
private static void processTOperation(TOperation op,
- WebServiceTYPEMetadata wsm,
- Map<String,
- WebServiceMETHODMetadata> methodMap,
- Map<String, TPart[]> messageMap)
- {
+ WebServiceTYPEMetadata wsm,
+ Map<String,
+ WebServiceMETHODMetadata> methodMap,
+ Map<String, TPart[]> messageMap) {
String opName = op.getName();
TParam outputParam = op.getOutput();
Class returnType = Void.TYPE;
if (outputParam != null) {
TPart[] returnTypes = messageMap
- .get(outputParam.getMessage().getLocalPart());
-
+ .get(outputParam.getMessage().getLocalPart());
if (returnTypes.length > 0) {
-
String returnName = returnTypes[0].getName();
QName qReturnType = returnTypes[0].getType();
@@ -184,19 +162,16 @@
returnType = null;
}
}
- WebServiceMETHODMetadata wmm =
- new WebServiceMETHODMetadata(opName, returnType);
+ WebServiceMETHODMetadata wmm =
+ new WebServiceMETHODMetadata(opName, returnType);
//wmm.setJavaMethodName(opName);
wmm.setWmOperationName(opName);
methodMap.put(opName, wmm);
-
-
List paramOrder = op.getParameterOrder();
if (paramOrder != null) {
-
TParam inputParam = op.getInput();
TPart[] parameters = messageMap
- .get(inputParam.getMessage().getLocalPart());
+ .get(inputParam.getMessage().getLocalPart());
for (Object ord : paramOrder) {
/*
* NOTE jcolwell@bea.com 2004-Aug-31 -- assuming just a
@@ -206,11 +181,11 @@
for (TPart currentParam : parameters) {
if (ord.equals(currentParam.getName())) {
QName qParamType = currentParam.getType();
- WebServicePARAMETERMetadata wpm =
- new WebServicePARAMETERMetadata();
+ WebServicePARAMETERMetadata wpm =
+ new WebServicePARAMETERMetadata();
/* wpm.setJavaType(qParamType.getNamespaceURI() +
'.' + qParamType.getLocalPart());*/
- wpm.setWpName((String)ord);
+ wpm.setWpName((String) ord);
wpm.setWpMode(WebParam.Mode.IN);
wmm.addParam(wpm);
break;
@@ -223,62 +198,49 @@
private static void processTBinding(TBinding tBind,
WebServiceTYPEMetadata wsm,
- Map<String,
- WebServiceMETHODMetadata> methodMap)
- throws IllegalAccessException, NoSuchFieldException
- {
-
+ Map<String,
+ WebServiceMETHODMetadata> methodMap)
+ throws IllegalAccessException, NoSuchFieldException {
org.xmlsoap.schemas.wsdl.soap.TBinding[] soapBinding =
- getSOAPBinding(tBind);
-
+ getSOAPBinding(tBind);
SOAPBindingInfo soapInfo = new SOAPBindingInfo();
if (TStyleChoice.DOCUMENT.equals(soapBinding[0].getStyle())) {
soapInfo.setStyle(SOAPBinding.Style.DOCUMENT);
- }
- else {
+ } else {
soapInfo.setStyle(SOAPBinding.Style.RPC);
}
wsm.setSoapBinding(soapInfo);
TBindingOperation[] tBops = tBind.getOperationArray();
for (TBindingOperation tBop : tBops) {
-
WebServiceMETHODMetadata wmm = methodMap.get(tBop.getName());
-
org.xmlsoap.schemas.wsdl.soap.TOperation[] soapOperations =
- getSOAPOperations(tBop);
-
+ getSOAPOperations(tBop);
if (soapOperations.length > 0) {
wmm.setWmAction(soapOperations[0].getSoapAction());
-
-
- if(TStyleChoice.DOCUMENT.equals(soapOperations[0]
- .getStyle())) {
+ if (TStyleChoice.DOCUMENT.equals(soapOperations[0]
+ .getStyle())) {
soapInfo = new SOAPBindingInfo();
soapInfo.setStyle(SOAPBinding.Style.DOCUMENT);
- }
- else if (TStyleChoice.RPC.equals(soapOperations[0]
- .getStyle())) {
+ } else if (TStyleChoice.RPC.equals(soapOperations[0]
+ .getStyle())) {
soapInfo = new SOAPBindingInfo();
soapInfo.setStyle(SOAPBinding.Style.RPC);
}
}
-
TBindingOperationMessage tbMsg = tBop.getInput();
if (tbMsg == null) {
tbMsg = tBop.getOutput();
}
-
if (tbMsg != null) {
- org.xmlsoap.schemas.wsdl.soap.TBody[] bodies =
- getSOAPBody(tbMsg);
+ org.xmlsoap.schemas.wsdl.soap.TBody[] bodies =
+ getSOAPBody(tbMsg);
if (bodies.length > 0) {
if (wsm.getWsTargetNamespace() == null) {
wsm.setWsTargetNamespace(bodies[0].getNamespace());
}
if (UseChoice.LITERAL.equals(bodies[0].getUse())) {
soapInfo.setUse(SOAPBinding.Use.LITERAL);
- }
- else {
+ } else {
soapInfo.setUse(SOAPBinding.Use.ENCODED);
}
}
@@ -287,25 +249,19 @@
}
private static void processMethodMetadata
- (Collection<WebServiceMETHODMetadata> methods,
- TDefinitions defs,
- TPortType portType,
- TBinding bind,
- String namespace)
- {
-
+ (Collection<WebServiceMETHODMetadata> methods,
+ TDefinitions defs,
+ TPortType portType,
+ TBinding bind,
+ String namespace) {
for (WebServiceMETHODMetadata op : methods) {
-
String operationName = op.getWmOperationName();
String request = operationName + "Request";
String response = operationName + "Response";
-
TMessage tMsg = defs.addNewMessage();
tMsg.setName(request);
-
List<String> paramOrder = new ArrayList<String>();
processParameterMetadata(op.getParams(), paramOrder, tMsg);
-
if (!op.isOneWay()) {
tMsg = defs.addNewMessage();
tMsg.setName(response);
@@ -314,8 +270,7 @@
tPart.setType(class2QName(op.getJavaReturnType()));
//tPart.setElement(new QName("some", "element");
}
-
- TOperation tOp = portType.addNewOperation();
+ TOperation tOp = portType.addNewOperation();
tOp.setName(operationName);
tOp.setParameterOrder(paramOrder);
TParam input = tOp.addNewInput();
@@ -327,19 +282,18 @@
output.setMessage(new QName(namespace, response));
}
processBindingOperationMetadata(bind.addNewOperation(),
- op,
- namespace,
- operationName,
- request,
- response);
+ op,
+ namespace,
+ operationName,
+ request,
+ response);
}
}
private static void processParameterMetadata
- (Collection<WebServicePARAMETERMetadata> params,
- List<String> paramOrder,
- TMessage msg)
- {
+ (Collection<WebServicePARAMETERMetadata> params,
+ List<String> paramOrder,
+ TMessage msg) {
for (WebServicePARAMETERMetadata param : params) {
TPart tPart = msg.addNewPart();
tPart.setName(param.getWpName());
@@ -349,20 +303,17 @@
}
private static void processBindingOperationMetadata(TBindingOperation tBop,
- WebServiceMETHODMetadata op,
- String namespace,
- String operationName,
- String request,
- String response)
- {
-
+ WebServiceMETHODMetadata op,
+ String namespace,
+ String operationName,
+ String request,
+ String response) {
tBop.setName(operationName);
- org.xmlsoap.schemas.wsdl.soap.OperationDocument opDoc =
- org.xmlsoap.schemas.wsdl.soap.OperationDocument.Factory
- .newInstance();
- org.xmlsoap.schemas.wsdl.soap.TOperation tSoapOperation =
- opDoc.addNewOperation();
-
+ org.xmlsoap.schemas.wsdl.soap.OperationDocument opDoc =
+ org.xmlsoap.schemas.wsdl.soap.OperationDocument.Factory
+ .newInstance();
+ org.xmlsoap.schemas.wsdl.soap.TOperation tSoapOperation =
+ opDoc.addNewOperation();
tSoapOperation.setSoapAction(op.getWmAction());
// SOAPBindingInfo sb = op.getSoapBinding();
// if (sb != null && SOAPBinding.Style.DOCUMENT.equals(sb.getStyle())) {
@@ -372,8 +323,6 @@
// tSoapOperation.setStyle(TStyleChoice.RPC);
// }
insertChild(tBop, opDoc);
-
-
TBindingOperationMessage inBom = tBop.addNewInput();
TBindingOperationMessage outBom = tBop.addNewOutput();
inBom.setName(request);
@@ -383,8 +332,8 @@
* NOTE jcolwell@bea.com 2004-Aug-31 -- Using the same body
* for both the input and output, this may need to be changed.
*/
- org.xmlsoap.schemas.wsdl.soap.BodyDocument bodDoc =
- org.xmlsoap.schemas.wsdl.soap.BodyDocument.Factory.newInstance();
+ org.xmlsoap.schemas.wsdl.soap.BodyDocument bodDoc =
+ org.xmlsoap.schemas.wsdl.soap.BodyDocument.Factory.newInstance();
org.xmlsoap.schemas.wsdl.soap.TBody tBod = bodDoc.addNewBody();
// if (sb != null && SOAPBinding.Use.LITERAL.equals(sb.getUse())) {
@@ -404,14 +353,11 @@
List<String> encodingStyles = new ArrayList<String>();
encodingStyles.add(SOAPENCODING);
tBod.setEncodingStyle(encodingStyles);
-
insertChild(inBom, bodDoc);
insertChild(outBom, bodDoc);
}
-
- public static boolean insertChild(XmlObject parent, XmlObject child)
- {
+ public static boolean insertChild(XmlObject parent, XmlObject child) {
// might need to use copyXmlContents() instead if copyXml copies too much
XmlCursor kidCursor = child.newCursor();
XmlCursor parentCursor = parent.newCursor();
@@ -422,100 +368,83 @@
}
public static WebServiceTYPEMetadata loadWebServiceMetadataFromWSDL
- (String wsdlLocation)
- throws IOException,
- XmlException,
- IllegalAccessException,
- NoSuchFieldException
- {
+ (String wsdlLocation)
+ throws IOException,
+ XmlException,
+ IllegalAccessException,
+ NoSuchFieldException {
return toWebServiceMetadata(parseWSDL(wsdlLocation));
}
public static DefinitionsDocument parseWSDL(String wsdlLocation)
- throws IOException, MalformedURLException, XmlException
- {
+ throws IOException, MalformedURLException, XmlException {
if (wsdlLocation.indexOf("://") > 2) {
return parseWSDL(new URL(wsdlLocation));
- }
- else {
+ } else {
return parseWSDL(new File(wsdlLocation));
}
}
public static DefinitionsDocument parseWSDL(File wsdlFile)
- throws IOException, XmlException
- {
+ throws IOException, XmlException {
return DefinitionsDocument.Factory.parse(wsdlFile);
}
public static DefinitionsDocument parseWSDL(URL wsdlURL)
- throws IOException, MalformedURLException, XmlException
- {
+ throws IOException, MalformedURLException, XmlException {
return DefinitionsDocument.Factory.parse(wsdlURL);
}
public static org.xmlsoap.schemas.wsdl.soap.TOperation[]
- getSOAPOperations(TBindingOperation bo)
- throws IllegalAccessException, NoSuchFieldException
- {
+ getSOAPOperations(TBindingOperation bo)
+ throws IllegalAccessException, NoSuchFieldException {
return selectChildren(bo, org.xmlsoap.schemas.wsdl.soap.TOperation.class);
}
public static org.xmlsoap.schemas.wsdl.soap.TBinding[]
- getSOAPBinding(TBinding b)
- throws IllegalAccessException, NoSuchFieldException
- {
+ getSOAPBinding(TBinding b)
+ throws IllegalAccessException, NoSuchFieldException {
return selectChildren(b, org.xmlsoap.schemas.wsdl.soap.TBinding.class);
}
public static org.xmlsoap.schemas.wsdl.soap.TBody[]
- getSOAPBody(TBindingOperationMessage bom)
- throws IllegalAccessException, NoSuchFieldException
- {
+ getSOAPBody(TBindingOperationMessage bom)
+ throws IllegalAccessException, NoSuchFieldException {
return selectChildren(bom, org.xmlsoap.schemas.wsdl.soap.TBody.class);
}
public static org.xmlsoap.schemas.wsdl.soap.TAddress[]
- getSOAPAddress(TPort port)
- throws IllegalAccessException, NoSuchFieldException
- {
+ getSOAPAddress(TPort port)
+ throws IllegalAccessException, NoSuchFieldException {
return selectChildren(port, org.xmlsoap.schemas.wsdl.soap.TAddress.class);
}
- private static <T extends XmlObject> T[] selectChildren(XmlObject parent,
+ private static <T extends XmlObject> T[] selectChildren(XmlObject parent,
Class<T> childClass)
- throws IllegalAccessException, NoSuchFieldException
- {
-
+ throws IllegalAccessException, NoSuchFieldException {
// retrieve the SchemaType from the static type field
- SchemaType st = (SchemaType)childClass.getField("type").get(null);
-
+ SchemaType st = (SchemaType) childClass.getField("type").get(null);
XmlObject[] kids = parent.selectChildren(st.getDocumentElementName());
- T[] castKids = (T[])Array.newInstance(childClass, kids.length);
-
+ T[] castKids = (T[]) Array.newInstance(childClass, kids.length);
for (int j = 0; j < castKids.length; j++) {
-
castKids[j] = childClass.cast(kids[j]);
}
return castKids;
}
- public static QName class2QName(String typeName)
- {
+ public static QName class2QName(String typeName) {
if (typeName == null) {
return new QName("java", "UnknownType");
- }
- else {
+ } else {
// this cheesy impl won't work for inner classes,
// see more details below
int lastDot = typeName.lastIndexOf('.');
return new QName(typeName.substring(0, lastDot),
- typeName.substring(lastDot + 1));
+ typeName.substring(lastDot + 1));
}
}
- public static QName class2QName(Class type)
- {
+ public static QName class2QName(Class type) {
/*
* FIXME jcolwell@bea.com 2004-Aug-30 -- this method should be replaced
* by a fully functional mechanism for mapping Java types to XML.
@@ -524,11 +453,10 @@
*/
if (type == null) {
return new QName("java", "UnknownType");
- }
- else {
+ } else {
String packageName = type.getPackage().getName();
String className = type.getName();
- className = className.substring(packageName.length());
+ className = className.substring(packageName.length());
return new QName(packageName, className);
}
}
Modified: incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/Foo.jws
==============================================================================
--- incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/Foo.jws (original)
+++ incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/Foo.jws Fri Oct 29 13:13:18 2004
@@ -14,33 +14,29 @@
* limitations under the License.
*/
-
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@WebService(name = "Abacus",
- serviceName = "Cheetorama",
- targetNamespace = "http://www.superflaco.com/AnnotationTest")
- public class Foo {
+ serviceName = "Cheetorama",
+ targetNamespace = "http://www.superflaco.com/AnnotationTest")
+public class Foo {
- @WebMethod(operationName = "GoLoco", action="LocoAction")
- @WebResult
- public boolean getNutty(@WebParam int level,
- @WebParam(name="detail") String detail) {
-
- return (level > 5);
+ @WebMethod(operationName = "GoLoco", action = "LocoAction")
+ @WebResult
+ public boolean getNutty(@WebParam int level,
+ @WebParam(name = "detail") String detail) {
+ return (level > 5);
}
- @WebMethod @Oneway public void goHome(@WebParam(name="when") long time)
- {
-
+ @WebMethod @Oneway public void goHome(@WebParam(name = "when") long time) {
}
- }
+}
Modified: incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Bar.java
==============================================================================
--- incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Bar.java (original)
+++ incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Bar.java Fri Oct 29 13:13:18 2004
@@ -14,33 +14,29 @@
* limitations under the License.
*/
-
-import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@WebService(name = "Milk",
- serviceName = "Chocolate",
- targetNamespace = "http://www.superflaco.com/Cocoa")
- public class Bar {
+ serviceName = "Chocolate",
+ targetNamespace = "http://www.superflaco.com/Cocoa")
+public class Bar {
- @WebMethod(operationName = "EatCookie", action="ChompChomp")
- @WebResult
- public String eatDough(@WebParam int chipCount,
- @WebParam String flavor) {
-
+ @WebMethod(operationName = "EatCookie", action = "ChompChomp")
+ @WebResult
+ public String eatDough(@WebParam int chipCount,
+ @WebParam String flavor) {
return flavor + ((chipCount > 5) ? " is Yummy" : " is boring");
}
- @WebMethod @WebResult(name = "cookiesInside") public int openCookieJar()
- {
+ @WebMethod @WebResult(name = "cookiesInside") public int openCookieJar() {
return 123;
}
- }
+}
Modified: incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Foo.java
==============================================================================
--- incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Foo.java (original)
+++ incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/AnnotationBasedDeployment/Foo.java Fri Oct 29 13:13:18 2004
@@ -14,38 +14,33 @@
* limitations under the License.
*/
-
-import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
@WebService(name = "Abacus",
- serviceName = "Cheetorama",
- targetNamespace = "http://www.superflaco.com/AnnotationTest")
- public class Foo {
+ serviceName = "Cheetorama",
+ targetNamespace = "http://www.superflaco.com/AnnotationTest")
+public class Foo {
- @WebMethod(operationName = "GoLoco", action="LocoAction")
- @WebResult
- public boolean getNutty(@WebParam int level,
- @WebParam(name="detail") String detail) {
-
- return (level > 5);
+ @WebMethod(operationName = "GoLoco", action = "LocoAction")
+ @WebResult
+ public boolean getNutty(@WebParam int level,
+ @WebParam(name = "detail") String detail) {
+ return (level > 5);
}
- @WebMethod @WebResult(name = "howdy") public String goHome()
- {
- try {
- return "wutup!";
- }
- catch (Exception e) {
- return e.toString();
- }
+ @WebMethod @WebResult(name = "howdy") public String goHome() {
+ try {
+ return "wutup!";
+ } catch (Exception e) {
+ return e.toString();
+ }
}
- }
+}
Modified: incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/server-config.wsdd
==============================================================================
--- incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/server-config.wsdd (original)
+++ incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/server-config.wsdd Fri Oct 29 13:13:18 2004
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <globalConfiguration>
- <parameter name="adminPassword" value="admin"/>
- <parameter name="disablePrettyXML" value="true"/>
- <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
- <parameter name="sendXsiTypes" value="true"/>
- <!--<parameter name="sendMultiRefs" value="true"/>-->
- <parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler">
- <parameter name="scope" value="session"/>
- </handler>
- <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler">
- <parameter name="scope" value="session"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JWSHandler">
- <parameter name="scope" value="session"/>
- </handler>
- <!--<handler type="java:org.apache.axis.handlers.JWSHandler">
- <parameter name="scope" value="request"/>
- <parameter name="extension" value=".jwr"/>
- </handler>-->
- </requestFlow>
- </globalConfiguration>
- <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
- <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
- <service name="AdminService" provider="java:MSG">
- <parameter name="allowedMethods" value="AdminService"/>
- <parameter name="enableRemoteAdmin" value="false"/>
- <parameter name="className" value="org.apache.axis.utils.Admin"/>
- <namespace>http://xml.apache.org/axis/wsdd/</namespace>
- </service>
- <service name="Version" provider="java:RPC">
- <parameter name="allowedMethods" value="getVersion"/>
- <parameter name="className" value="org.apache.axis.Version"/>
- </service>
- <transport name="http">
- <requestFlow>
- <handler type="URLMapper"/>
- <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
- </requestFlow>
- <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
- <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
- <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>
- </transport>
- <transport name="local">
- <responseFlow>
- <handler type="LocalResponder"/>
- </responseFlow>
- </transport>
+ <globalConfiguration>
+ <parameter name="adminPassword" value="admin"/>
+ <parameter name="disablePrettyXML" value="true"/>
+ <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <!--<parameter name="sendMultiRefs" value="true"/>-->
+ <parameter name="sendXMLDeclaration" value="true"/>
+ <requestFlow>
+ <handler type="java:org.apache.beehive.wsm.axis.AnnotatedWebServiceDeploymentHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ <handler type="java:org.apache.beehive.wsm.axis.DropInDeploymentHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ <!--<handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="request"/>
+ <parameter name="extension" value=".jwr"/>
+ </handler>-->
+ </requestFlow>
+ </globalConfiguration>
+ <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="AdminService" provider="java:MSG">
+ <parameter name="allowedMethods" value="AdminService"/>
+ <parameter name="enableRemoteAdmin" value="false"/>
+ <parameter name="className" value="org.apache.axis.utils.Admin"/>
+ <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+ </service>
+ <service name="Version" provider="java:RPC">
+ <parameter name="allowedMethods" value="getVersion"/>
+ <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
+ <transport name="http">
+ <requestFlow>
+ <handler type="URLMapper"/>
+ <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+ </requestFlow>
+ <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
+ <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
+ <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>
+ </transport>
+ <transport name="local">
+ <responseFlow>
+ <handler type="LocalResponder"/>
+ </responseFlow>
+ </transport>
</deployment>
Modified: incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/web.xml
==============================================================================
--- incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/WEB-INF/web.xml Fri Oct 29 13:13:18 2004
@@ -2,83 +2,70 @@
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
<web-app>
-
- <display-name>Apache-Axis</display-name>
-
- <filter>
- <filter-name>ControlFilter</filter-name>
- <filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>ControlFilter</filter-name>
- <url-pattern>*.jws</url-pattern>
- </filter-mapping>
-
- <listener>
- <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
+ <display-name>Apache-Axis</display-name>
+ <filter>
+ <filter-name>ControlFilter</filter-name>
+ <filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ControlFilter</filter-name>
+ <url-pattern>*.jws</url-pattern>
+ </filter-mapping>
+ <listener>
+ <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
org.apache.axis.transport.http.AxisServlet
- </servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>AdminServlet</servlet-name>
- <display-name>Axis Admin Servlet</display-name>
- <servlet-class>
+ </servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>AdminServlet</servlet-name>
+ <display-name>Axis Admin Servlet</display-name>
+ <servlet-class>
org.apache.axis.transport.http.AdminServlet
- </servlet-class>
- <load-on-startup>100</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SOAPMonitorService</servlet-name>
- <display-name>SOAPMonitorService</display-name>
- <servlet-class>
+ </servlet-class>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>SOAPMonitorService</servlet-name>
+ <display-name>SOAPMonitorService</display-name>
+ <servlet-class>
org.apache.axis.monitor.SOAPMonitorService
- </servlet-class>
- <init-param>
- <param-name>SOAPMonitorPort</param-name>
- <param-value>5001</param-value>
- </init-param>
- <load-on-startup>100</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/servlet/AxisServlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>*.jws</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SOAPMonitorService</servlet-name>
- <url-pattern>/SOAPMonitor</url-pattern>
- </servlet-mapping>
-
- <!-- uncomment this if you want the admin servlet -->
- <!--
- <servlet-mapping>
- <servlet-name>AdminServlet</servlet-name>
- <url-pattern>/servlet/AdminServlet</url-pattern>
- </servlet-mapping>
- -->
-
+ </servlet-class>
+ <init-param>
+ <param-name>SOAPMonitorPort</param-name>
+ <param-value>5001</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/servlet/AxisServlet</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>*.jws</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SOAPMonitorService</servlet-name>
+ <url-pattern>/SOAPMonitor</url-pattern>
+ </servlet-mapping>
+
+ <!-- uncomment this if you want the admin servlet -->
+ <!--
+ <servlet-mapping>
+ <servlet-name>AdminServlet</servlet-name>
+ <url-pattern>/servlet/AdminServlet</url-pattern>
+ </servlet-mapping>
+ -->
<session-config>
<!-- Default to 5 minute session timeouts -->
<session-timeout>5</session-timeout>
@@ -87,21 +74,17 @@
<!-- currently the W3C havent settled on a media type for WSDL;
http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
for now we go with the basic 'it's XML' response -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.jws</welcome-file>
- </welcome-file-list>
-
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.jws</welcome-file>
+ </welcome-file-list>
</web-app>
Modified: incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/index.html
==============================================================================
--- incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/index.html (original)
+++ incubator/beehive/trunk/wsm/test/webapps/AnnotatedAxis/index.html Fri Oct 29 13:13:18 2004
@@ -1,45 +1,55 @@
<html>
-
-<head>
-<meta http-equiv="Content-Type"
-content="text/html; charset=iso-8859-1">
-<title>Apache-Axis</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<p>Hello! <em>Welcome</em> to Apache-Axis -- now with Annotations!.</p>
-
-<p>What do you want to do today?</p>
-
-<ul>
- <li><a href="happyaxis.jsp">Validate</a>
- the local installation's configuration<br>
- <i>see below if this does not work.</i></li>
- <li><a href="servlet/AxisServlet">View</a>
- the list of deployed Web services</li>
- <li><a href="Foo.jws?method=GoLoco&in0=99&detail=randomText">
+ <head>
+ <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+ <title>Apache-Axis</title>
+ </head>
+ <body bgcolor="#FFFFFF">
+ <h1 align="center">Apache-AXIS</h1>
+ <p>Hello!
+ <em>Welcome</em> to Apache-Axis -- now with Annotations!.
+ </p>
+ <p>What do you want to do today?</p>
+ <ul>
+ <li>
+ <a href="happyaxis.jsp">Validate</a>
+ the local installation's configuration
+ <br>
+ <i>see below if this does not work.</i>
+ </li>
+ <li>
+ <a href="servlet/AxisServlet">View</a>
+ the list of deployed Web services
+ </li>
+ <li>
+ <a href="Foo.jws?method=GoLoco&in0=99&detail=randomText">
Call a local endpoint</a> by its Annotated name (or see its
- <a href="Foo.jws?wsdl">WSDL</a>).
- <li><a href="http://xml.apache.org/axis">Visit</a>
- the Apache-Axis Home Page</li>
-</ul>
+
+ <a href="Foo.jws?wsdl">WSDL</a>).
+
+ <li>
+ <a href="http://xml.apache.org/axis">Visit</a>
+ the Apache-Axis Home Page
+ </li>
+ </ul>
This is a prototype implementation of JSR-181 intended to simply explore how difficult it is to make the existing AXIS JWS system support Annotations. This is not a complete implementation of JSR-181 but it does cover many of the key features. One should also keep in mind that there is no intention that this code be considered as anything more than a somewhat functional draft whipped up in just a few days. Comments and criticism are welcome especially considering that the author only started looking at the internals of AXIS on August 10, 2004 and may have misunderstood how it actually functions.
-<h3>Validating Axis</h3>
+
+ <h3>Validating Axis</h3>
If the "happyaxis" validation page displays an exception instead of a
status page, the likely cause is that you have multiple XML parsers in
your classpath. Clean up your classpath by eliminating extraneous parsers.
-<p>
+
+ <p>
If you have problems getting Axis to work, consult the Axis
-<a
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?AxisProjectPages">Wiki</a>
+
+ <a
+ href="http://nagoya.apache.org/wiki/apachewiki.cgi?AxisProjectPages">Wiki</a>
and then try the Axis user mailing list.
-</body>
+
+ </body>
</html>