You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2004/11/15 22:53:23 UTC
svn commit: rev 71514 - in incubator/beehive/trunk/wsm: drt/tests/org/apache/beehive/wsm/jsr181/model 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 src/runtime/org/apache/beehive/wsm/axis src/runtime/org/apache/beehive/wsm/jsr181/model 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
Author: mmerz
Date: Mon Nov 15 13:53:22 2004
New Revision: 71514
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
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/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/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/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/src/runtime/org/apache/beehive/wsm/axis/AxisHook.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/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/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/reflection/WsmReflectionAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
Log:
Convert object model to interfaces.
Contributor: Daryoush Mehrtash
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 Mon Nov 15 13:53:22 2004
@@ -34,13 +34,13 @@
protected static final String CLASSNAME = "Bar2";
protected static final String SRCFILENAME = "Bar2.java";
- protected AnnotationModel objectModel;
+ protected AnnotationMetadata objectModel;
- protected WebServiceMETHODMetadata getMethod(String methodName) {
+ protected Jsr181MethodMetadata getMethod(String methodName) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
if (methodName.equals(method.getWmOperationName())) {
return method;
}
@@ -48,16 +48,16 @@
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- Collection<WebServiceMETHODMetadata> webMethods =
- ((WebServiceTYPEMetadata) objectModel).getMethods();
- for (WebServiceMETHODMetadata method : webMethods) {
+ Collection<Jsr181MethodMetadata> webMethods =
+ ((Jsr181TypeMetadata) objectModel).getMethods();
+ for (Jsr181MethodMetadata method : webMethods) {
if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams()) {
+ for (Jsr181ParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
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 Mon Nov 15 13:53:22 2004
@@ -34,13 +34,13 @@
protected static final String CLASSNAME = "Bar3";
protected static final String SRCFILENAME = "Bar3.java";
- protected AnnotationModel objectModel;
+ protected AnnotationMetadata objectModel;
- protected WebServiceMETHODMetadata getMethod(String methodName) {
+ protected Jsr181MethodMetadata getMethod(String methodName) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
if (methodName.equals(method.getWmOperationName())) {
return method;
}
@@ -48,16 +48,16 @@
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- Collection<WebServiceMETHODMetadata> webMethods =
- ((WebServiceTYPEMetadata) objectModel).getMethods();
- for (WebServiceMETHODMetadata method : webMethods) {
+ Collection<Jsr181MethodMetadata> webMethods =
+ ((Jsr181TypeMetadata) objectModel).getMethods();
+ for (Jsr181MethodMetadata method : webMethods) {
if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams()) {
+ for (Jsr181ParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
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 Mon Nov 15 13:53:22 2004
@@ -34,7 +34,7 @@
protected static final String CLASSNAME = "Bar";
protected static final String[] SRCFILENAMES = {"Bar.java", "Bar2.java", "Bar3.java", "Cheetorama.java"};
- protected AnnotationModel objectModel;
+ protected AnnotationMetadata objectModel;
public void testObjectModel() throws Exception {
assertNotNull("Failed to retrieve object model;", objectModel);
@@ -42,14 +42,14 @@
public void testWebServiceAbacus() throws Exception {
assertEquals("Invalid wsName;", "Abacus",
- ((WebServiceTYPEMetadata) objectModel).getWsName());
+ ((Jsr181TypeMetadata) objectModel).getWsName());
assertEquals("Invalid wsTargetNamespace;",
"http://www.superflaco.com/AnnotationEndpointInterfaceTest",
- ((WebServiceTYPEMetadata) objectModel).getWsTargetNamespace());
+ ((Jsr181TypeMetadata) objectModel).getWsTargetNamespace());
}
public void testWebMethodGoLoco() throws Exception {
- WebServiceMETHODMetadata method = getMethod("GoLoco");
+ Jsr181MethodMetadata method = getMethod("GoLoco");
assertNull("WebMethod GoLoco() must be null", method);
method = getMethod("GoLocoCheetorama");
assertNotNull("Cannot find WebMethod GoLocoCheetorama();", method);
@@ -62,7 +62,7 @@
}
public void testWebMethodGoHome() throws Exception {
- WebServiceMETHODMetadata method = getMethod("goHome");
+ Jsr181MethodMetadata method = getMethod("goHome");
assertNotNull("Cannot find WebMethod goHome();", method);
assertEquals("Invalid wmAction;", "", method.getWmAction());
assertTrue("Cannot find @Oneway;", method.isOneWay());
@@ -73,7 +73,7 @@
}
public void testWebMethodDropMoney() throws Exception {
- WebServiceMETHODMetadata method = getMethod("dropMoney");
+ Jsr181MethodMetadata method = getMethod("dropMoney");
assertNotNull("Cannot find WebMethod dropMoney();", method);
assertEquals("Invalid wmAction;", "", method.getWmAction());
assertFalse("Unexpected @Oneway;", method.isOneWay());
@@ -85,7 +85,7 @@
public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -95,7 +95,7 @@
public void testWebParamGoLocoSecond() throws Exception {
final int paramNo = 1;
- WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -105,7 +105,7 @@
public void testWebParamGoHomeFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("goHome", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -115,7 +115,7 @@
public void testWebParamDropMoneyFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("dropMoney", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -123,11 +123,11 @@
param.getJavaType());
}
- protected WebServiceMETHODMetadata getMethod(String methodName) {
+ protected Jsr181MethodMetadata getMethod(String methodName) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
if (methodName.equals(method.getWmOperationName())) {
return method;
}
@@ -135,16 +135,16 @@
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
+ protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- Collection<WebServiceMETHODMetadata> webMethods =
- ((WebServiceTYPEMetadata) objectModel).getMethods();
- for (WebServiceMETHODMetadata method : webMethods) {
+ Collection<Jsr181MethodMetadata> webMethods =
+ ((Jsr181TypeMetadata) objectModel).getMethods();
+ for (Jsr181MethodMetadata method : webMethods) {
if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams()) {
+ for (Jsr181ParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
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 Mon Nov 15 13:53:22 2004
@@ -31,7 +31,7 @@
protected static final String CLASSNAME = "Foo";
protected static final String SRCFILENAME = "Foo.java";
- protected AnnotationModel objectModel;
+ protected AnnotationMetadata objectModel;
public void testObjectModel() throws Exception {
assertNotNull("Failed to retrieve object model;", objectModel);
@@ -39,17 +39,17 @@
public void testWebServiceAbacus() throws Exception {
assertEquals("Invalid wsName;", "Abacus",
- ((WebServiceTYPEMetadata) objectModel).getWsName());
+ ((Jsr181TypeMetadata) objectModel).getWsName());
// todo test endpointInterface
assertEquals("Invalid wsTargetNamespace;",
"http://www.superflaco.com/AnnotationTest",
- ((WebServiceTYPEMetadata) objectModel).getWsTargetNamespace());
+ ((Jsr181TypeMetadata) objectModel).getWsTargetNamespace());
}
public void testWebMethodGoLoco() throws Exception {
- WebServiceMETHODMetadata method = getMethod("GoLoco");
+ Jsr181MethodMetadata method = getMethod("GoLoco");
assertNotNull("Cannot find WebMethod GoLoco();", method);
assertEquals("Invalid wmAction;", "LocoAction", method.getWmAction());
assertFalse("Unexpected @Oneway;", method.isOneWay());
@@ -60,7 +60,7 @@
}
public void testWebMethodGoHome() throws Exception {
- WebServiceMETHODMetadata method = getMethod("goHome");
+ Jsr181MethodMetadata method = getMethod("goHome");
assertNotNull("Cannot find WebMethod goHome();", method);
assertEquals("Invalid wmAction;", "", method.getWmAction());
assertTrue("Cannot find @Oneway;", method.isOneWay());
@@ -72,7 +72,7 @@
public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -82,7 +82,7 @@
public void testWebParamGoLocoSecond() throws Exception {
final int paramNo = 1;
- WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -92,7 +92,7 @@
public void testWebParamGoHomeFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("goHome", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -100,8 +100,8 @@
param.getJavaType());
}
- protected WebServiceMETHODMetadata getMethod(String methodName) {
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ protected Jsr181MethodMetadata getMethod(String methodName) {
+ for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
if (method.getWmOperationName().equals(methodName)) {
return method;
}
@@ -109,11 +109,11 @@
return null;
}
- protected WebServicePARAMETERMetadata getParam(String methodName, int pos) {
- for (WebServiceMETHODMetadata method : ((WebServiceTYPEMetadata) objectModel).getMethods()) {
+ protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
+ for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
if (method.getWmOperationName().equals(methodName)) {
int i = 0;
- for (WebServicePARAMETERMetadata param : method.getParams()) {
+ for (Jsr181ParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
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 Mon Nov 15 13:53:22 2004
@@ -20,7 +20,7 @@
import com.sun.tools.apt.Main;
import org.apache.beehive.wsm.jsr181.model.BarTestCase;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/**
@@ -69,7 +69,7 @@
@Override
public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -84,7 +84,7 @@
@Override
public void testWebParamDropMoneyFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("dropMoney", paramNo);
+ Jsr181ParameterMetadata 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(),
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 Mon Nov 15 13:53:22 2004
@@ -20,7 +20,7 @@
import com.sun.tools.apt.Main;
import org.apache.beehive.wsm.jsr181.model.FooTestCase;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/**
@@ -67,7 +67,7 @@
@Override
public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
+ Jsr181ParameterMetadata 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(),
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 Mon Nov 15 13:53:22 2004
@@ -19,8 +19,8 @@
*/
import org.apache.beehive.wsm.jsr181.model.BarTestCase;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.beehive.wsm.jsr181.processor.apt.WebServiceMetadataViewer;
/**
@@ -34,7 +34,7 @@
public void setUp() throws Exception {
Class clazz = Class.forName(CLASSNAME);
objectModel = WsmReflectionAnnotationProcessor.getInstance().getObjectModel(clazz);
- WebServiceMetadataViewer.print((WebServiceTYPEMetadata) objectModel);
+ WebServiceMetadataViewer.print((Jsr181TypeMetadata) objectModel);
}
@Override
@@ -49,7 +49,7 @@
@Override
public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("GoLocoCheetorama", paramNo);
+ Jsr181ParameterMetadata 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(),
@@ -64,7 +64,7 @@
@Override
public void testWebParamDropMoneyFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("dropMoney", paramNo);
+ Jsr181ParameterMetadata 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(),
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 Mon Nov 15 13:53:22 2004
@@ -19,6 +19,7 @@
*/
import org.apache.beehive.wsm.jsr181.model.FooTestCase;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
/**
@@ -46,7 +47,7 @@
@Override
public void testWebParamGoLocoFirst() throws Exception {
final int paramNo = 0;
- WebServicePARAMETERMetadata param = getParam("GoLoco", paramNo);
+ Jsr181ParameterMetadata 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(),
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 Mon Nov 15 13:53:22 2004
@@ -20,6 +20,8 @@
import java.io.File;
import junit.framework.TestCase;
+
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.xmlbeans.XmlOptions;
import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
import org.xmlsoap.schemas.wsdl.TBinding;
@@ -149,7 +151,7 @@
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);
+ Jsr181TypeMetadata wsm = WSDLProcessor.toWebServiceMetadata(doc);
assertEquals("Cheetorama", wsm.getWsServiceName());
assertEquals("Abacus", wsm.getWsName());
assertEquals("http://www.superflaco.com/AnnotationTest",
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 Mon Nov 15 13:53:22 2004
@@ -53,10 +53,11 @@
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;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
@@ -67,7 +68,7 @@
*/
public class AxisHook {
- public static ServiceDesc createServiceDesc(WebServiceTYPEMetadata wsm,
+ public static ServiceDesc createServiceDesc(Jsr181TypeMetadata wsm,
ClassLoader cl)
throws ClassNotFoundException,
NoSuchMethodException,
@@ -88,9 +89,9 @@
sd.setDefaultNamespace(targetNamespace);
SOAPBindingInfo sbi = wsm.getSoapBinding();
configureSoapBinding(sd, sbi);
- Collection<WebServiceMETHODMetadata> methods = wsm.getMethods();
+ Collection<Jsr181MethodMetadata> methods = wsm.getMethods();
List<String> allowedMethods = new ArrayList<String>();
- for (WebServiceMETHODMetadata meth : methods) {
+ for (Jsr181MethodMetadata meth : methods) {
String operationName = meth.getWmOperationName();
if (operationName != null && operationName.length() > 0) {
OperationDesc od = new OperationDesc();
@@ -110,9 +111,9 @@
od.setReturnClass(returnType);
//od.setReturnHeader(
}
- List<WebServicePARAMETERMetadata> parameters = meth.getParams();
+ List<Jsr181ParameterMetadata> parameters = meth.getParams();
List<Class> paramClasses = new ArrayList<Class>();
- for (WebServicePARAMETERMetadata param : parameters) {
+ for (Jsr181ParameterMetadata param : parameters) {
ParameterDesc pd = new ParameterDesc();
pd.setQName(new QName(param.getWpTargetNamespace(),
param.getWpName()));
Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationMetadata.java
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationMetadata.java Mon Nov 15 13:53:22 2004
@@ -0,0 +1,17 @@
+/*
+ * Created on Nov 15, 2004
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.apache.beehive.wsm.jsr181.model;
+
+/**
+ * @author Daryoush
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface AnnotationMetadata {
+ public abstract void validate() throws ValidationException;
+}
\ No newline at end of file
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 Mon Nov 15 13:53:22 2004
@@ -21,7 +21,7 @@
import java.lang.annotation.Annotation;
import java.util.Collection;
-public abstract class AnnotationModel {
+public abstract class AnnotationModel implements AnnotationMetadata {
public static boolean hasAnnotationType(Collection<Annotation> annotations, Class<? extends Annotation> annotationType) {
if ((null != annotations) && (null != annotationType) && (0 < annotations.size())) {
Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java Mon Nov 15 13:53:22 2004
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$Factory
+ */
+
+package org.apache.beehive.wsm.jsr181.model;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Daryoush
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface Jsr181MethodMetadata extends AnnotationMetadata {
+ public abstract boolean isOneWay();
+
+ public abstract void setOneWay(boolean oneway);
+
+ public abstract SecurityRolesInfo getSecurityRoles();
+
+ public abstract void setSecurityRoles(SecurityRolesInfo securityRoles);
+
+ public abstract String getWmAction();
+
+ public abstract void setWmAction(String wmAction);
+
+ public abstract String getWmOperationName();
+
+ public abstract void setWmOperationName(String wmOperationName);
+
+ public abstract String getWrName();
+
+ public abstract void setWrName(String wrName);
+
+ public abstract String getWrTargetNamespace();
+
+ public abstract void setWrTargetNamespace(String wrTargetNamespace);
+
+ public abstract List<Jsr181ParameterMetadata> getParams();
+
+ public abstract void addParams(
+ Collection< ? extends Jsr181ParameterMetadata> parameters);
+
+ public abstract void addParam(Jsr181ParameterMetadata parameter);
+
+ public abstract String getJavaMethodName();
+
+ public abstract Class getJavaReturnType();
+}
\ No newline at end of file
Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java Mon Nov 15 13:53:22 2004
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$Factory
+ */
+package org.apache.beehive.wsm.jsr181.model;
+
+
+import javax.jws.WebParam;
+
+/**
+ * @author Daryoush
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface Jsr181ParameterMetadata extends AnnotationMetadata {
+ public abstract boolean isWpHeader();
+
+ public abstract void setWpHeader(boolean wpHeader);
+
+ public abstract WebParam.Mode getWpMode();
+
+ public abstract void setWpMode(WebParam.Mode wpMode);
+
+ public abstract String getWpName();
+
+ public abstract void setWpName(String wpName);
+
+ public abstract String getWpTargetNamespace();
+
+ public abstract void setWpTargetNamespace(String wpTargetNamespace);
+
+ public abstract Class getJavaType();
+
+ public abstract void setJavaType(Class javaType);
+}
\ No newline at end of file
Added: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadata.java Mon Nov 15 13:53:22 2004
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$Factory
+ */
+package org.apache.beehive.wsm.jsr181.model;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.xmlbeans.XmlException;import javax.jws.HandlerChain;
+import javax.jws.WebService;
+import javax.jws.security.SecurityIdentity;
+import javax.jws.security.SecurityRoles;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPMessageHandler;
+import javax.jws.soap.SOAPMessageHandlers;
+
+import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
+
+
+/**
+ * @author Daryoush
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface Jsr181TypeMetadata extends AnnotationMetadata {
+ /**
+ * 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 abstract void initHandlersFromChainConfig(URL chainConfigURL,
+ String chainName) throws Exception;
+
+ public abstract DefinitionsDocument getWSDLAsDocument() throws IOException,
+ XmlException;
+
+ /**
+ * @return Returns the hcFileName.
+ */
+ public abstract String getHcFileName();
+
+ /**
+ * @param hcFileName The hcFileName to set.
+ */
+ public abstract void setHcFileName(String hcFileName);
+
+ /**
+ * @return Returns the hcName.
+ */
+ public abstract String getHcName();
+
+ /**
+ * @param hcName The hcName to set.
+ */
+ public abstract void setHcName(String hcName);
+
+ /**
+ * @return Returns the securityRoles.
+ */
+ public abstract SecurityRolesInfo getSecurityRoles();
+
+ /**
+ * @param securityRoles The securityRoles to set.
+ */
+ public abstract void setSecurityRoles(SecurityRolesInfo securityRoles);
+
+ /**
+ * @return Returns the siRunAs.
+ */
+ public abstract String getSiValue();
+
+ /**
+ * @param siValue The siRunAs to set.
+ */
+ public abstract void setSiValue(String siValue);
+
+ /**
+ * @return Returns the soapBinding.
+ */
+ public abstract SOAPBindingInfo getSoapBinding();
+
+ /**
+ * @param soapBinding The soapBinding to set.
+ */
+ public abstract void setSoapBinding(SOAPBindingInfo soapBinding);
+
+ /**
+ * @return Returns the wsName.
+ */
+ public abstract String getWsName();
+
+ /**
+ * @param wsName The wsName to set.
+ */
+ public abstract void setWsName(String wsName);
+
+ /**
+ * @return Returns the wsServiceName.
+ */
+ public abstract String getWsServiceName();
+
+ /**
+ * @param wsServiceName The wsServiceName to set.
+ */
+ public abstract void setWsServiceName(String wsServiceName);
+
+ /**
+ * @return Returns the wsTargetNamespace.
+ */
+ public abstract String getWsTargetNamespace();
+
+ /**
+ * @param wsTargetNamespace The wsTargetNamespace to set.
+ */
+ public abstract void setWsTargetNamespace(String wsTargetNamespace);
+
+ /**
+ * @return Returns the wsEndpointInterface.
+ */
+ public abstract String getWsEndpointInterface();
+
+ /**
+ * @param wsEndpointInterface The wsEndpointInterface to set.
+ */
+ public abstract void setWsEndpointInterface(String wsEndpointInterface);
+
+ /**
+ * @return Returns the wsWsdlLocation.
+ */
+ public abstract String getWsWsdlLocation();
+
+ /**
+ * @param wsWsdlLocation The wsWsdlLocation to set.
+ */
+ public abstract void setWsWsdlLocation(String wsWsdlLocation);
+
+ /**
+ * @return Returns the methods.
+ */
+ public abstract Collection<Jsr181MethodMetadata> getMethods();
+
+ public abstract void addMethod(Jsr181MethodMetadata method);
+
+ public abstract List<SOAPMessageHandlerInfo> getSoapHandlers();
+
+ public abstract void addSOAPHandler(SOAPMessageHandlerInfo soapHandler);
+
+ public abstract String getServiceImplementationBean();
+
+ public abstract String getServiceEndpointInterface();
+}
\ No newline at end of file
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 Mon Nov 15 13:53:22 2004
@@ -30,12 +30,12 @@
import javax.jws.WebResult;
import javax.jws.security.SecurityRoles;
-public class WebServiceMETHODMetadata extends AnnotationModel {
+public class WebServiceMETHODMetadata implements Jsr181MethodMetadata {
private String wmOperationName;
private String wmAction;
private boolean oneway = false;
- private List<WebServicePARAMETERMetadata> params =
- new ArrayList<WebServicePARAMETERMetadata>();
+ private List<Jsr181ParameterMetadata> params =
+ new ArrayList<Jsr181ParameterMetadata>();
private String wrName;
private String wrTargetNamespace;
private SecurityRolesInfo securityRoles;
@@ -56,7 +56,7 @@
Class javaReturnType,
boolean throwsExceptions,
Collection<Annotation> annotations,
- List<? extends WebServicePARAMETERMetadata> webParams) throws Exception {
+ List<? extends Jsr181ParameterMetadata> webParams) throws Exception {
super();
// check parameters
@@ -98,7 +98,7 @@
}
// prohibit @Oneway with "OUT" and "INOUT" parameters
if (null != webParams) {
- for (WebServicePARAMETERMetadata param : webParams) {
+ for (Jsr181ParameterMetadata param : webParams) {
if ((WebParam.Mode.OUT == param.getWpMode()) ||
(WebParam.Mode.INOUT == param.getWpMode())) {
// todo needs to be proper Exception subclass
@@ -211,17 +211,17 @@
this.wrTargetNamespace = wrTargetNamespace;
}
- public List<WebServicePARAMETERMetadata> getParams() {
+ public List<Jsr181ParameterMetadata> getParams() {
return Collections.unmodifiableList(params);
}
- public void addParams(Collection<? extends WebServicePARAMETERMetadata> parameters) {
+ public void addParams(Collection<? extends Jsr181ParameterMetadata> parameters) {
if (null != parameters) {
params.addAll(parameters);
}
}
- public void addParam(WebServicePARAMETERMetadata parameter) {
+ public void addParam(Jsr181ParameterMetadata parameter) {
if (null != parameter) {
params.add(parameter);
}
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 Mon Nov 15 13:53:22 2004
@@ -23,7 +23,7 @@
import javax.jws.WebParam;
-public class WebServicePARAMETERMetadata extends AnnotationModel {
+public class WebServicePARAMETERMetadata implements Jsr181ParameterMetadata {
private String wpName;
private String wpTargetNamespace;
private WebParam.Mode wpMode;
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 Mon Nov 15 13:53:22 2004
@@ -48,14 +48,14 @@
import org.w3c.dom.NodeList;
import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-public class WebServiceTYPEMetadata extends AnnotationModel {
+public class WebServiceTYPEMetadata implements Jsr181TypeMetadata {
private String wsName;
private String wsServiceName;
private String wsWsdlLocation;
private String wsTargetNamespace;
private String wsEndpointInterface;
- private Collection<WebServiceMETHODMetadata> methods =
- new ArrayList<WebServiceMETHODMetadata>();
+ private Collection<Jsr181MethodMetadata> methods =
+ new ArrayList<Jsr181MethodMetadata>();
private SOAPBindingInfo soapBinding;
private String hcFileName;
private String hcName;
@@ -94,7 +94,7 @@
public WebServiceTYPEMetadata(WebService sibWsAnnotation,
String sibClassName,
Collection<Annotation> annotations,
- Collection<? extends WebServiceMETHODMetadata> webMethods) throws Exception {
+ Collection<? extends Jsr181MethodMetadata> webMethods) throws Exception {
super();
// check required parameter: sibWsAnnotation
@@ -165,7 +165,7 @@
}
// set WebServiceMETHODMetadata and back fill JSR-181 default values
- for (WebServiceMETHODMetadata wsmm : webMethods) {
+ for (Jsr181MethodMetadata wsmm : webMethods) {
// JSR-181 defaults: fill in default for tergetNamespace from @WebService
String wrTargetNamespace = wsmm.getWrTargetNamespace();
if ((null == wrTargetNamespace) || (0 == wrTargetNamespace.length())) {
@@ -173,7 +173,7 @@
}
// JSR-181 defaults: fill in default for tergetNamespace from @WebService
- for (WebServicePARAMETERMetadata wspm : wsmm.getParams()) {
+ for (Jsr181ParameterMetadata wspm : wsmm.getParams()) {
String wpTargetNamespace = wspm.getWpTargetNamespace();
if ((null == wpTargetNamespace) || (0 == wpTargetNamespace.length())) {
wspm.setWpTargetNamespace(getWsTargetNamespace());
@@ -747,11 +747,11 @@
/**
* @return Returns the methods.
*/
- public Collection<WebServiceMETHODMetadata> getMethods() {
+ public Collection<Jsr181MethodMetadata> getMethods() {
return Collections.unmodifiableCollection(methods);
}
- public void addMethod(WebServiceMETHODMetadata method) {
+ public void addMethod(Jsr181MethodMetadata method) {
methods.add(method);
}
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 Mon Nov 15 13:53:22 2004
@@ -20,11 +20,12 @@
import java.util.Collection;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
import org.apache.beehive.wsm.jsr181.model.SecurityRolesInfo;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
public class WebServiceMetadataViewer {
@@ -38,11 +39,11 @@
" "
};
- public static void print(WebServiceTYPEMetadata webServiceTYPEMetadata) {
+ public static void print(Jsr181TypeMetadata webServiceTYPEMetadata) {
print(0, webServiceTYPEMetadata);
}
- public static void print(int tab, WebServiceTYPEMetadata webServiceTYPEMetadata) {
+ public static void print(int tab, Jsr181TypeMetadata webServiceTYPEMetadata) {
print(tab, "<TYPE > > >WebServiceTYPEMetadata");
print(tab, "wsName", webServiceTYPEMetadata.getWsName());
print(tab, "wsServiceName", webServiceTYPEMetadata.getWsServiceName());
@@ -68,21 +69,21 @@
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);
+ if (element instanceof Jsr181TypeMetadata) {
+ print(tab, (Jsr181TypeMetadata) element);
+ } else if (element instanceof Jsr181MethodMetadata) {
+ print(tab, (Jsr181MethodMetadata) element);
+ } else if (element instanceof Jsr181ParameterMetadata) {
+ print(tab, (Jsr181ParameterMetadata) element);
}
}
}
- public static void print(WebServiceMETHODMetadata webServiceMETHODMetadata) {
+ public static void print(Jsr181MethodMetadata webServiceMETHODMetadata) {
print(0, webServiceMETHODMetadata);
}
- public static void print(int tab, WebServiceMETHODMetadata webServiceMETHODMetadata) {
+ public static void print(int tab, Jsr181MethodMetadata webServiceMETHODMetadata) {
if (webServiceMETHODMetadata == null)
return;
print(tab, "<METHOD > > > > > >WebServiceMETHODMetadata");
@@ -106,11 +107,11 @@
print(tab, webServiceMETHODMetadata.getParams());
}
- public static void print(WebServicePARAMETERMetadata webServicePARAMETERMetadata) {
+ public static void print(Jsr181ParameterMetadata webServicePARAMETERMetadata) {
print(0, webServicePARAMETERMetadata);
}
- public static void print(int tab, WebServicePARAMETERMetadata webServicePARAMETERMetadata) {
+ public static void print(int tab, Jsr181ParameterMetadata webServicePARAMETERMetadata) {
if (webServicePARAMETERMetadata == null)
return;
print(tab, "<PARAM > > > > > > > > >WebServicePARAMETERMetadata");
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 Mon Nov 15 13:53:22 2004
@@ -36,7 +36,12 @@
import com.sun.mirror.declaration.ParameterDeclaration;
import com.sun.mirror.declaration.TypeDeclaration;
import com.sun.mirror.type.AnnotationType;
+import com.sun.org.apache.bcel.internal.generic.JsrInstruction;
+
+import org.apache.beehive.wsm.jsr181.model.AnnotationMetadata;
import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
@@ -128,9 +133,9 @@
* @param ws
* @return AnnotationModel
*/
- protected AnnotationModel checkObjectModel(TypeDeclaration decl, javax.jws.WebService ws) {
- Collection<WebServiceMETHODMetadata> webMethods =
- new ArrayList<WebServiceMETHODMetadata>();
+ protected AnnotationMetadata checkObjectModel(TypeDeclaration decl, javax.jws.WebService ws) {
+ Collection<Jsr181MethodMetadata> webMethods =
+ new ArrayList<Jsr181MethodMetadata>();
// publish methods @WebMethod annotations
for (MethodDeclaration methodDecl : decl.getMethods()) {
@@ -155,10 +160,10 @@
return wstm;
}
- protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(MethodDeclaration decl) {
+ protected Jsr181MethodMetadata getWebServiceMETHODMetadata(MethodDeclaration decl) {
// get webMethod's webParams
- List<WebServicePARAMETERMetadata> webParams =
- new ArrayList<WebServicePARAMETERMetadata>();
+ List<Jsr181ParameterMetadata> webParams =
+ new ArrayList<Jsr181ParameterMetadata>();
for (ParameterDeclaration paramDecl : decl.getParameters()) {
webParams.add(getWebServicePARAMETERMetadata(paramDecl));
}
@@ -178,7 +183,7 @@
return wsmm;
}
- protected WebServicePARAMETERMetadata getWebServicePARAMETERMetadata(ParameterDeclaration decl) {
+ protected Jsr181ParameterMetadata getWebServicePARAMETERMetadata(ParameterDeclaration decl) {
// create & return webParam
WebServicePARAMETERMetadata wspm = null;
try {
@@ -208,7 +213,7 @@
return annotations;
}
- public static AnnotationModel getObjectModel(String name) {
+ public static AnnotationMetadata getObjectModel(String name) {
return objectModels.get(name);
}
@@ -216,6 +221,6 @@
return objectModels.keySet();
}
- private static Map<String, AnnotationModel> objectModels =
- new HashMap<String, AnnotationModel>();
+ private static Map<String, AnnotationMetadata> objectModels =
+ new HashMap<String, AnnotationMetadata>();
}
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 Mon Nov 15 13:53:22 2004
@@ -28,10 +28,14 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
+import org.apache.beehive.wsm.jsr181.model.AnnotationMetadata;
import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
public class WsmReflectionAnnotationProcessor {
private static WsmReflectionAnnotationProcessor _instance;
@@ -53,7 +57,7 @@
* @param sibClass Service implementation bean class.
* @return
*/
- public AnnotationModel getObjectModel(Class sibClass) {
+ public AnnotationMetadata getObjectModel(Class sibClass) {
return getWebServiceTYPEMetadata(sibClass);
}
@@ -61,7 +65,7 @@
* @param sibClass
* @return
*/
- protected WebServiceTYPEMetadata getWebServiceTYPEMetadata(Class sibClass) {
+ protected Jsr181TypeMetadata getWebServiceTYPEMetadata(Class sibClass) {
if (null == sibClass) {
return null;
}
@@ -79,8 +83,8 @@
}
// webMethods
- Collection<WebServiceMETHODMetadata> webMethods =
- new ArrayList<WebServiceMETHODMetadata>();
+ Collection<Jsr181MethodMetadata> webMethods =
+ new ArrayList<Jsr181MethodMetadata>();
Collection<Annotation> annotations;
if (hasServiceEndpointInterface) {
try {
@@ -103,7 +107,7 @@
}
// create & return WebService
- WebServiceTYPEMetadata wstm = null;
+ Jsr181TypeMetadata wstm = null;
try {
wstm = new WebServiceTYPEMetadata((WebService) sibClass.getAnnotation(WebService.class),
sibClass.getName(),
@@ -121,9 +125,9 @@
* @param method
* @return
*/
- protected WebServiceMETHODMetadata getWebServiceMETHODMetadata(Method method) {
- List<WebServicePARAMETERMetadata> webParams =
- new ArrayList<WebServicePARAMETERMetadata>();
+ protected Jsr181MethodMetadata getWebServiceMETHODMetadata(Method method) {
+ List<Jsr181ParameterMetadata> webParams =
+ new ArrayList<Jsr181ParameterMetadata>();
// publish all params
Annotation[][] allAnnotations = method.getParameterAnnotations();
@@ -136,7 +140,7 @@
}
// create & return webMethod
- WebServiceMETHODMetadata wsmm = null;
+ Jsr181MethodMetadata wsmm = null;
try {
wsmm = new WebServiceMETHODMetadata(method.getName(),
method.getReturnType(),
@@ -156,9 +160,9 @@
* @param annotations
* @return
*/
- protected WebServicePARAMETERMetadata getWebServicePARAMETERMetadata(Class paramType, int offset, List<Annotation> annotations) {
+ protected Jsr181ParameterMetadata getWebServicePARAMETERMetadata(Class paramType, int offset, List<Annotation> annotations) {
// create & return webParam
- WebServicePARAMETERMetadata wspm = null;
+ Jsr181ParameterMetadata wspm = null;
try {
wspm = new WebServicePARAMETERMetadata(paramType,
"in" + offset, // by default parameter should be IN
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 Mon Nov 15 13:53:22 2004
@@ -33,10 +33,14 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.namespace.QName;
+import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
@@ -72,12 +76,12 @@
public static final String WSDLSOAPNS =
"http://schemas.xmlsoap.org/wsdl/soap/";
- public static WebServiceTYPEMetadata toWebServiceMetadata
+ public static Jsr181TypeMetadata toWebServiceMetadata
(DefinitionsDocument defDoc)
throws IllegalAccessException, NoSuchFieldException {
- WebServiceTYPEMetadata wsm = new WebServiceTYPEMetadata(null);
- Map<String, WebServiceMETHODMetadata> methodMap =
- new HashMap<String, WebServiceMETHODMetadata>();
+ Jsr181TypeMetadata wsm = new WebServiceTYPEMetadata(null);
+ Map<String, Jsr181MethodMetadata> methodMap =
+ new HashMap<String, Jsr181MethodMetadata>();
TDefinitions defs = defDoc.getDefinitions();
Map<String, TPart[]> messageMap = new HashMap<String, TPart[]>();
if (defs.sizeOfMessageArray() > 0) {
@@ -105,7 +109,7 @@
}
public static DefinitionsDocument fromWebServiceMetadata
- (WebServiceTYPEMetadata wsm)
+ (Jsr181TypeMetadata wsm)
throws Exception {
String ns = wsm.getWsTargetNamespace();
DefinitionsDocument defDoc = DefinitionsDocument.Factory.newInstance();
@@ -141,9 +145,9 @@
}
private static void processTOperation(TOperation op,
- WebServiceTYPEMetadata wsm,
+ Jsr181TypeMetadata wsm,
Map<String,
- WebServiceMETHODMetadata> methodMap,
+ Jsr181MethodMetadata> methodMap,
Map<String, TPart[]> messageMap) {
String opName = op.getName();
TParam outputParam = op.getOutput();
@@ -162,7 +166,7 @@
returnType = null;
}
}
- WebServiceMETHODMetadata wmm =
+ Jsr181MethodMetadata wmm =
new WebServiceMETHODMetadata(opName, returnType);
//wmm.setJavaMethodName(opName);
wmm.setWmOperationName(opName);
@@ -181,7 +185,7 @@
for (TPart currentParam : parameters) {
if (ord.equals(currentParam.getName())) {
QName qParamType = currentParam.getType();
- WebServicePARAMETERMetadata wpm =
+ Jsr181ParameterMetadata wpm =
new WebServicePARAMETERMetadata();
/* wpm.setJavaType(qParamType.getNamespaceURI() +
'.' + qParamType.getLocalPart());*/
@@ -197,9 +201,9 @@
}
private static void processTBinding(TBinding tBind,
- WebServiceTYPEMetadata wsm,
+ Jsr181TypeMetadata wsm,
Map<String,
- WebServiceMETHODMetadata> methodMap)
+ Jsr181MethodMetadata> methodMap)
throws IllegalAccessException, NoSuchFieldException {
org.xmlsoap.schemas.wsdl.soap.TBinding[] soapBinding =
getSOAPBinding(tBind);
@@ -212,7 +216,7 @@
wsm.setSoapBinding(soapInfo);
TBindingOperation[] tBops = tBind.getOperationArray();
for (TBindingOperation tBop : tBops) {
- WebServiceMETHODMetadata wmm = methodMap.get(tBop.getName());
+ Jsr181MethodMetadata wmm = methodMap.get(tBop.getName());
org.xmlsoap.schemas.wsdl.soap.TOperation[] soapOperations =
getSOAPOperations(tBop);
if (soapOperations.length > 0) {
@@ -249,12 +253,12 @@
}
private static void processMethodMetadata
- (Collection<WebServiceMETHODMetadata> methods,
+ (Collection<Jsr181MethodMetadata> methods,
TDefinitions defs,
TPortType portType,
TBinding bind,
String namespace) {
- for (WebServiceMETHODMetadata op : methods) {
+ for (Jsr181MethodMetadata op : methods) {
String operationName = op.getWmOperationName();
String request = operationName + "Request";
String response = operationName + "Response";
@@ -291,10 +295,10 @@
}
private static void processParameterMetadata
- (Collection<WebServicePARAMETERMetadata> params,
+ (Collection<Jsr181ParameterMetadata> params,
List<String> paramOrder,
TMessage msg) {
- for (WebServicePARAMETERMetadata param : params) {
+ for (Jsr181ParameterMetadata param : params) {
TPart tPart = msg.addNewPart();
tPart.setName(param.getWpName());
tPart.setType(class2QName(param.getJavaType()));
@@ -303,7 +307,7 @@
}
private static void processBindingOperationMetadata(TBindingOperation tBop,
- WebServiceMETHODMetadata op,
+ Jsr181MethodMetadata op,
String namespace,
String operationName,
String request,
@@ -367,7 +371,7 @@
return kidCursor.copyXml(parentCursor);
}
- public static WebServiceTYPEMetadata loadWebServiceMetadataFromWSDL
+ public static Jsr181TypeMetadata loadWebServiceMetadataFromWSDL
(String wsdlLocation)
throws IOException,
XmlException,