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 2005/02/14 21:03:22 UTC
svn commit: r153838 - in incubator/beehive/trunk/wsm:
drt/tests/org/apache/beehive/wsm/axis/
drt/tests/org/apache/beehive/wsm/jsr181/model/
drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/
drt/tests/org/apache/beehive/wsm/jsr181/wsdl/
src/runtime/org/apache/beehive/wsm/axis/databinding/
src/runtime/org/apache/beehive/wsm/axis/util/encoding/
src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/
Author: mmerz
Date: Mon Feb 14 12:03:16 2005
New Revision: 153838
URL: http://svn.apache.org/viewcvs?view=rev&rev=153838
Log:
XMLBeanTypeLookUp -> XmlBeanTypeLookup
Contributor: Daryoush Mehrtash
Added:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
- copied, changed from r153836, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/ABC.java
Removed:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/ABC.java
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.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/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/wsdl/WSDL2AnnotatedJavaTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemLookUpService.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Mon Feb 14 12:03:16 2005
@@ -29,13 +29,13 @@
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ParameterDesc;
import org.apache.axis.description.ServiceDesc;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
/**
* ****************************************************************************
@@ -60,7 +60,7 @@
ServiceDesc sd;
public void setUp() throws Exception {
- Jsr181TypeMetadata wsm = makeFakeMetadata();
+ BeehiveWsTypeMetadata wsm = makeFakeMetadata();
sd = AxisHook.createServiceDesc(wsm, null);
}
@@ -125,8 +125,8 @@
}
}
- protected Jsr181TypeMetadata makeFakeMetadata() throws Exception {
- Jsr181TypeMetadata wstm = new Jsr181TypeMetadataImpl();
+ protected BeehiveWsTypeMetadata makeFakeMetadata() throws Exception {
+ BeehiveWsTypeMetadata wstm = new Jsr181TypeMetadataImpl();
wstm.setClassName(WS_CLASS.getName());
wstm.setWsName(WS_NAME);
/*
@@ -141,13 +141,13 @@
return wstm;
}
- protected Jsr181MethodMetadata makeFakeOnewayMethod() {
- Jsr181MethodMetadata wsmm =
+ protected BeehiveWsMethodMetadata makeFakeOnewayMethod() {
+ BeehiveWsMethodMetadata wsmm =
new Jsr181MethodMetadataImpl(WM_JAVAONEWAYMETHODNAME, Void.TYPE);
wsmm.setWmOperationName(WM_ONEWAY + WM_OPERATION);
wsmm.setWmAction(WM_ONEWAY + WM_ACTION);
wsmm.setOneWay(true);
- Jsr181ParameterMetadata wspm = new Jsr181ParameterMetadataImpl();
+ BeehiveWsParameterMetadata wspm = new Jsr181ParameterMetadataImpl();
wspm.setWpName(WM_ONEWAYPARAM);
wspm.setWpMode(WebParam.Mode.IN);
wspm.setJavaType(Boolean.class);
@@ -155,14 +155,14 @@
return wsmm;
}
- protected Jsr181MethodMetadata makeFakeMethod() {
- Jsr181MethodMetadata wsmm =
+ protected BeehiveWsMethodMetadata makeFakeMethod() {
+ BeehiveWsMethodMetadata wsmm =
new Jsr181MethodMetadataImpl(WM_JAVAMETHODNAME, String.class);
wsmm.setWmOperationName(WM_OPERATION);
wsmm.setWmAction(WM_ACTION);
wsmm.setWrName(WM_RESULT);
wsmm.setOneWay(false);
- Jsr181ParameterMetadata wspm = new Jsr181ParameterMetadataImpl();
+ BeehiveWsParameterMetadata wspm = new Jsr181ParameterMetadataImpl();
wspm.setWpName(WM_TWOWAYPARAM);
wspm.setWpMode(WebParam.Mode.INOUT);
wspm.setJavaType(javax.xml.rpc.holders.IntHolder.class);
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar2TestCase.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Feb 14 12:03:16 2005
@@ -34,13 +34,13 @@
protected static final String CLASSNAME = "web.Bar2";
protected static final String SRCFILENAME = "web/Bar2.jws";
- protected Jsr181TypeMetadata objectModel;
+ protected BeehiveWsTypeMetadata objectModel;
- protected Jsr181MethodMetadata getMethod(String methodName) {
+ protected BeehiveWsMethodMetadata getMethod(String methodName) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
+ for (BeehiveWsMethodMetadata method : ((BeehiveWsTypeMetadata) objectModel).getMethods()) {
if (methodName.equals(method.getWmOperationName())) {
return method;
}
@@ -48,16 +48,16 @@
return null;
}
- protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
+ protected BeehiveWsParameterMetadata getParam(String methodName, int pos) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- Collection<Jsr181MethodMetadata> webMethods =
- ((Jsr181TypeMetadata) objectModel).getMethods();
- for (Jsr181MethodMetadata method : webMethods) {
+ Collection<? extends BeehiveWsMethodMetadata> webMethods =
+ ((BeehiveWsTypeMetadata) objectModel).getMethods();
+ for (BeehiveWsMethodMetadata method : webMethods) {
if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (Jsr181ParameterMetadata param : method.getParams()) {
+ for (BeehiveWsParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Bar3TestCase.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Feb 14 12:03:16 2005
@@ -34,13 +34,13 @@
protected static final String CLASSNAME = "web.Bar3";
protected static final String SRCFILENAME = "web/Bar3.jws";
- protected Jsr181TypeMetadata objectModel;
+ protected BeehiveWsTypeMetadata objectModel;
- protected Jsr181MethodMetadata getMethod(String methodName) {
+ protected BeehiveWsMethodMetadata getMethod(String methodName) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
+ for (BeehiveWsMethodMetadata method : ((BeehiveWsTypeMetadata) objectModel).getMethods()) {
if (methodName.equals(method.getWmOperationName())) {
return method;
}
@@ -48,16 +48,16 @@
return null;
}
- protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
+ protected BeehiveWsParameterMetadata getParam(String methodName, int pos) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- Collection<Jsr181MethodMetadata> webMethods =
- ((Jsr181TypeMetadata) objectModel).getMethods();
- for (Jsr181MethodMetadata method : webMethods) {
+ Collection<? extends BeehiveWsMethodMetadata> webMethods =
+ ((BeehiveWsTypeMetadata) objectModel).getMethods();
+ for (BeehiveWsMethodMetadata method : webMethods) {
if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (Jsr181ParameterMetadata param : method.getParams()) {
+ for (BeehiveWsParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/BarTestCase.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Feb 14 12:03:16 2005
@@ -34,7 +34,7 @@
protected static final String CLASSNAME = "web.Bar";
protected static final String[] SRCFILENAMES = {"web/Bar.jws"};
- protected Jsr181TypeMetadata objectModel;
+ protected BeehiveWsTypeMetadata 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",
- ((Jsr181TypeMetadata) objectModel).getWsName());
+ ((BeehiveWsTypeMetadata) objectModel).getWsName());
assertEquals("Invalid wsTargetNamespace;",
"http://www.superflaco.com/AnnotationEndpointInterfaceTest",
- ((Jsr181TypeMetadata) objectModel).getWsTargetNamespace());
+ ((BeehiveWsTypeMetadata) objectModel).getWsTargetNamespace());
}
public void testWebMethodGoLoco() throws Exception {
- Jsr181MethodMetadata method = getMethod("GoLoco");
+ BeehiveWsMethodMetadata 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 {
- Jsr181MethodMetadata method = getMethod("goHome");
+ BeehiveWsMethodMetadata 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 {
- Jsr181MethodMetadata method = getMethod("dropMoney");
+ BeehiveWsMethodMetadata 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;
- Jsr181ParameterMetadata param = getParam("GoLocoCheetorama", paramNo);
+ BeehiveWsParameterMetadata 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;
- Jsr181ParameterMetadata param = getParam("GoLocoCheetorama", paramNo);
+ BeehiveWsParameterMetadata 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;
- Jsr181ParameterMetadata param = getParam("goHome", paramNo);
+ BeehiveWsParameterMetadata 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;
- Jsr181ParameterMetadata param = getParam("dropMoney", paramNo);
+ BeehiveWsParameterMetadata 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 Jsr181MethodMetadata getMethod(String methodName) {
+ protected BeehiveWsMethodMetadata getMethod(String methodName) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
+ for (BeehiveWsMethodMetadata method : ((BeehiveWsTypeMetadata) objectModel).getMethods()) {
if (methodName.equals(method.getWmOperationName())) {
return method;
}
@@ -135,16 +135,16 @@
return null;
}
- protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
+ protected BeehiveWsParameterMetadata getParam(String methodName, int pos) {
if ((null == methodName) || (null == objectModel)) {
return null;
}
- Collection<Jsr181MethodMetadata> webMethods =
- ((Jsr181TypeMetadata) objectModel).getMethods();
- for (Jsr181MethodMetadata method : webMethods) {
+ Collection<? extends BeehiveWsMethodMetadata> webMethods =
+ ((BeehiveWsTypeMetadata) objectModel).getMethods();
+ for (BeehiveWsMethodMetadata method : webMethods) {
if (methodName.equals(method.getWmOperationName())) {
int i = 0;
- for (Jsr181ParameterMetadata param : method.getParams()) {
+ for (BeehiveWsParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/FooTestCase.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Feb 14 12:03:16 2005
@@ -31,7 +31,7 @@
protected static final String CLASSNAME = "web.Foo";
protected static final String SRCFILENAME = "web/Foo.jws";
- protected Jsr181TypeMetadata objectModel;
+ protected BeehiveWsTypeMetadata 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",
- ((Jsr181TypeMetadata) objectModel).getWsName());
+ ((BeehiveWsTypeMetadata) objectModel).getWsName());
// todo test endpointInterface
assertEquals("Invalid wsTargetNamespace;",
"http://www.superflaco.com/AnnotationTest",
- ((Jsr181TypeMetadata) objectModel).getWsTargetNamespace());
+ ((BeehiveWsTypeMetadata) objectModel).getWsTargetNamespace());
}
public void testWebMethodGoLoco() throws Exception {
- Jsr181MethodMetadata method = getMethod("GoLoco");
+ BeehiveWsMethodMetadata 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 {
- Jsr181MethodMetadata method = getMethod("goHome");
+ BeehiveWsMethodMetadata 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;
- Jsr181ParameterMetadata param = getParam("GoLoco", paramNo);
+ BeehiveWsParameterMetadata 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;
- Jsr181ParameterMetadata param = getParam("GoLoco", paramNo);
+ BeehiveWsParameterMetadata 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;
- Jsr181ParameterMetadata param = getParam("goHome", paramNo);
+ BeehiveWsParameterMetadata 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 Jsr181MethodMetadata getMethod(String methodName) {
- for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
+ protected BeehiveWsMethodMetadata getMethod(String methodName) {
+ for (BeehiveWsMethodMetadata method : ((BeehiveWsTypeMetadata) objectModel).getMethods()) {
if (method.getWmOperationName().equals(methodName)) {
return method;
}
@@ -109,11 +109,11 @@
return null;
}
- protected Jsr181ParameterMetadata getParam(String methodName, int pos) {
- for (Jsr181MethodMetadata method : ((Jsr181TypeMetadata) objectModel).getMethods()) {
+ protected BeehiveWsParameterMetadata getParam(String methodName, int pos) {
+ for (BeehiveWsMethodMetadata method : ((BeehiveWsTypeMetadata) objectModel).getMethods()) {
if (method.getWmOperationName().equals(methodName)) {
int i = 0;
- for (Jsr181ParameterMetadata param : method.getParams()) {
+ for (BeehiveWsParameterMetadata param : method.getParams()) {
if (i == pos) {
return param;
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Feb 14 12:03:16 2005
@@ -21,8 +21,8 @@
import com.sun.tools.apt.Main;
import org.apache.beehive.wsm.jsr181.model.BarTestCase;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
//import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/**
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Feb 14 12:03:16 2005
@@ -20,8 +20,8 @@
import com.sun.tools.apt.Main;
import org.apache.beehive.wsm.jsr181.model.FooTestCase;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
//import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/**
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java?view=diff&r1=153837&r2=153838
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDL2AnnotatedJavaTest.java Mon Feb 14 12:03:16 2005
@@ -43,13 +43,13 @@
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ParameterDesc;
import org.apache.axis.description.ServiceDesc;
-import org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181ParameterMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.Jsr181TypeMetadataImpl;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-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.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181MethodMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181ParameterMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.wsdl.XmlBeanWSDLProcessor;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -79,11 +79,11 @@
//FileInputStream src = new FileInputStream("temp.wsdl");
StringBufferInputStream src = new StringBufferInputStream(theWSDL);
WSDLProcessor wsdlProc = new XmlBeanWSDLProcessor();
- Jsr181TypeMetadata om = wsdlProc.createObjectModel(src);
+ BeehiveWsTypeMetadata om = wsdlProc.createObjectModel(src);
- Collection<Jsr181MethodMetadata> methods =om.getMethods();
+ Collection<? extends BeehiveWsMethodMetadata> methods =om.getMethods();
System.out.println("Size of my mehtod list: " + om.getMethods().size());
- for(Jsr181MethodMetadata method : methods) {
+ for(BeehiveWsMethodMetadata method : methods) {
System.out.println("NEXT METHOD NAME: " + method.getJavaMethodName());
}
Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java?view=diff&r1=153837&r2=153838
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java Mon Feb 14 12:03:16 2005
@@ -36,11 +36,11 @@
import org.apache.axis.description.OperationDesc;
import org.apache.axis.description.ParameterDesc;
import org.apache.axis.description.ServiceDesc;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-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.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
+import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
+import org.apache.beehive.wsm.jsr181.model.jsr181.Jsr181TypeMetadataImpl;
+import org.apache.beehive.wsm.jsr181.model.wsdl.XmlBeanWSDLProcessor;
//import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
/*******************************************************************************
@@ -53,8 +53,8 @@
private static final String BEEHIVE_HOME = System.getProperty("beehive.home");
private static final String CLASSNAME = "org.apache.beehive.wsm.jsr181.wsdl.StarWars";
- Jsr181TypeMetadata serverModel;
- Jsr181TypeMetadata clientModel;
+ BeehiveWsTypeMetadata serverModel;
+ BeehiveWsTypeMetadata clientModel;
public void setUp() throws Exception {
File f = new File(BEEHIVE_HOME,
@@ -89,21 +89,21 @@
public void testMethodLevelSettings() throws Exception {
- Collection<Jsr181MethodMetadata> serverMethods = serverModel
+ Collection<? extends BeehiveWsMethodMetadata> serverMethods = serverModel
.getMethods();
- Collection<Jsr181MethodMetadata> clientMethods = clientModel
+ Collection<? extends BeehiveWsMethodMetadata> clientMethods = clientModel
.getMethods();
assertEquals(serverMethods.size(), clientMethods.size());
- for (Jsr181MethodMetadata wmm : serverMethods) {
+ for (BeehiveWsMethodMetadata wmm : serverMethods) {
- List<Jsr181ParameterMetadata> params = wmm.getParams();
+ List<BeehiveWsParameterMetadata> params = wmm.getParams();
Class[] paramClasses = new Class[params.size()];
int pcIndex = 0;
- for (Jsr181ParameterMetadata param : params) {
+ for (BeehiveWsParameterMetadata param : params) {
paramClasses[pcIndex] = param.getJavaType();
}
- Jsr181MethodMetadata clientMethod = clientModel
+ BeehiveWsMethodMetadata clientMethod = clientModel
.getMethod(wmm.getWmOperationName(), paramClasses);
boolean paramStylesMatch = (clientModel.getSoapBinding().getParameterStyle()
== serverModel.getSoapBinding().getParameterStyle());
@@ -119,8 +119,8 @@
}
}
- private void compareMethodMetadata(Jsr181MethodMetadata server,
- Jsr181MethodMetadata client)
+ private void compareMethodMetadata(BeehiveWsMethodMetadata server,
+ BeehiveWsMethodMetadata client)
throws Exception {
assertEquals(server.getWmOperationName(), client.getWmOperationName());
@@ -133,15 +133,15 @@
}
private void compareParameterMetadata
- (List<Jsr181ParameterMetadata> serverParams,
- List<Jsr181ParameterMetadata> clientParams) {
+ (List<BeehiveWsParameterMetadata> serverParams,
+ List<BeehiveWsParameterMetadata> clientParams) {
assertEquals(serverParams.size(), clientParams.size());
- Iterator<Jsr181ParameterMetadata> servIt = serverParams.iterator();
- Iterator<Jsr181ParameterMetadata> clientIt = clientParams.iterator();
+ Iterator<BeehiveWsParameterMetadata> servIt = serverParams.iterator();
+ Iterator<BeehiveWsParameterMetadata> clientIt = clientParams.iterator();
while (servIt.hasNext() && clientIt.hasNext()) {
- Jsr181ParameterMetadata srvParam = servIt.next();
- Jsr181ParameterMetadata clParam = clientIt.next();
+ BeehiveWsParameterMetadata srvParam = servIt.next();
+ BeehiveWsParameterMetadata clParam = clientIt.next();
assertEquals(srvParam.getJavaType(), clParam.getJavaType());
assertEquals(srvParam.getWpMode(), clParam.getWpMode());
assertEquals(srvParam.getWpName(), clParam.getWpName());
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemLookUpService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemLookUpService.java?view=diff&r1=153837&r2=153838
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemLookUpService.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemLookUpService.java Mon Feb 14 12:03:16 2005
@@ -26,7 +26,7 @@
import javax.xml.rpc.encoding.XMLType;
import org.apache.beehive.wsm.databinding.BindingLookupService;
-import org.apache.beehive.wsm.databinding.xmlbeans.XMLBeanTypeLookUp;
+import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanTypeLookup;
@@ -37,7 +37,7 @@
*
*/
public SystemLookUpService(org.apache.axis.encoding.TypeMapping tm) {
- lookupServiceList.add(new XMLBeanTypeLookUp());
+ lookupServiceList.add(new XmlBeanTypeLookup());
lookupServiceList.add(new AxisTypeLookUp(tm));
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java?view=diff&r1=153837&r2=153838
==============================================================================
--- 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 Mon Feb 14 12:03:16 2005
@@ -31,7 +31,6 @@
import org.apache.axis.encoding.SerializationContext;
import org.apache.axis.encoding.Serializer;
import org.apache.axis.wsdl.fromJava.Types;
-import org.apache.beehive.wsm.databinding.xmlbeans.XMLBeanTypeLookUp;
import org.apache.beehive.wsm.wsdl.Schema;
import org.apache.beehive.wsm.wsdl.Utilities;
import org.apache.xmlbeans.SchemaField;
Copied: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java (from r153836, incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/ABC.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java?view=diff&rev=153838&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/ABC.java&r1=153836&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java&r2=153838
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/ABC.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java Mon Feb 14 12:03:16 2005
@@ -33,9 +33,9 @@
-public class XMLBeanTypeLookUp implements BindingLookupService {
- static Logger logger = Logger.getLogger(XMLBeanTypeLookUp.class);
- static XMLBeanTypeLookUp theLookup = new XMLBeanTypeLookUp();
+public class XmlBeanTypeLookup implements BindingLookupService {
+ static Logger logger = Logger.getLogger(XmlBeanTypeLookup.class);
+ static XmlBeanTypeLookup theLookup = new XmlBeanTypeLookup();
public QName class2qname( Class cls) {
if (XmlObject.class.isAssignableFrom(cls)) {