You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2002/07/18 22:55:11 UTC
cvs commit: xml-axis/java/test/wsdl/wrapped City_BBBBindingImpl.java City_BBBTestCase.java
scheu 2002/07/18 13:55:11
Modified: java/src/org/apache/axis/wsdl/toJava
JavaGeneratorFactory.java
java/test/functional TestJAXMSamples.java
java/test/wsdl/datatypes DataTypesTestCase.java
DataTypes_BindingImpl.java
java/test/wsdl/extensibility
ExtensibilityQueryBindingImpl.java
ExtensibilityQueryTestCase.java
java/test/wsdl/qualify Qualify_BindingImpl.java
Qualify_ServiceTestCase.java
java/test/wsdl/wrapped City_BBBBindingImpl.java
City_BBBTestCase.java
Log:
TCK expects the Service Endpoint Interface (SEI) to match
the portType for the Doc/Lit Tests...per the spec.
Small change to Axis to always use the portType name as the SEI.
Changed the affected tests.
Revision Changes Path
1.14 +5 -10 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JavaGeneratorFactory.java 16 Jul 2002 18:32:46 -0000 1.13
+++ JavaGeneratorFactory.java 18 Jul 2002 20:55:11 -0000 1.14
@@ -536,19 +536,14 @@
SymTabEntry entry = (SymTabEntry) v.elementAt(i);
if (entry instanceof BindingEntry) {
// The SEI (Service Endpoint Interface) name
- // is normally the portType name.
- // But the binding info MIGHT force the SEI
- // name to be the binding name.
+ // is always the portType name.
BindingEntry bEntry = (BindingEntry) entry;
String seiName = null;
- if (bEntry.hasLiteral() && symbolTable.isWrapped()) {
- seiName = bEntry.getName();
- }
- else {
- PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(
+
+ PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(
bEntry.getBinding().getPortType().getQName());
- seiName = ptEntry.getName();
- } bEntry.setDynamicVar(JavaBindingWriter.INTERFACE_NAME, seiName);
+ seiName = ptEntry.getName();
+ bEntry.setDynamicVar(JavaBindingWriter.INTERFACE_NAME, seiName);
}
}
}
1.13 +1 -0 xml-axis/java/test/functional/TestJAXMSamples.java
Index: TestJAXMSamples.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestJAXMSamples.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestJAXMSamples.java 18 Jul 2002 20:05:36 -0000 1.12
+++ TestJAXMSamples.java 18 Jul 2002 20:55:11 -0000 1.13
@@ -85,6 +85,7 @@
throw new Exception("Fault returned from test: " + t);
}
}
+
public void testUddiPing() throws Exception {
try {
log.info("Testing JAXM UddiPing sample.");
1.3 +6 -6 xml-axis/java/test/wsdl/datatypes/DataTypesTestCase.java
Index: DataTypesTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/datatypes/DataTypesTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataTypesTestCase.java 12 Mar 2002 20:45:04 -0000 1.2
+++ DataTypesTestCase.java 18 Jul 2002 20:55:11 -0000 1.3
@@ -12,7 +12,7 @@
super(name);
}
public void test1DataTypesSoapSayHello() {
- DataTypes_Binding binding;
+ DataTypes_Port binding;
try {
binding = new DataTypes_ServiceLocator().getDataTypes();
}
@@ -32,7 +32,7 @@
}
public void test2DataTypesSoapSayHelloName() {
- DataTypes_Binding binding;
+ DataTypes_Port binding;
try {
binding = new DataTypes_ServiceLocator().getDataTypes();
}
@@ -52,7 +52,7 @@
}
public void test3DataTypesSoapGetIntArray() {
- DataTypes_Binding binding;
+ DataTypes_Port binding;
try {
binding = new DataTypes_ServiceLocator().getDataTypes();
}
@@ -80,7 +80,7 @@
}
public void test4DataTypesSoapGetMode() {
- DataTypes_Binding binding;
+ DataTypes_Port binding;
try {
binding = new DataTypes_ServiceLocator().getDataTypes();
}
@@ -100,7 +100,7 @@
}
public void test5DataTypesSoapGetOrder() {
- DataTypes_Binding binding;
+ DataTypes_Port binding;
try {
binding = new DataTypes_ServiceLocator().getDataTypes();
}
@@ -120,7 +120,7 @@
}
public void test6DataTypesSoapGetOrders() {
- DataTypes_Binding binding;
+ DataTypes_Port binding;
try {
binding = new DataTypes_ServiceLocator().getDataTypes();
}
1.2 +1 -1 xml-axis/java/test/wsdl/datatypes/DataTypes_BindingImpl.java
Index: DataTypes_BindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/datatypes/DataTypes_BindingImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataTypes_BindingImpl.java 12 Mar 2002 16:13:37 -0000 1.1
+++ DataTypes_BindingImpl.java 18 Jul 2002 20:55:11 -0000 1.2
@@ -7,7 +7,7 @@
package test.wsdl.datatypes;
-public class DataTypes_BindingImpl implements DataTypes_Binding {
+public class DataTypes_BindingImpl implements DataTypes_Port {
public java.lang.String sayHello() throws java.rmi.RemoteException {
return "Hello World!";
}
1.10 +1 -1 xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java
Index: ExtensibilityQueryBindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtensibilityQueryBindingImpl.java 3 Jul 2002 18:19:29 -0000 1.9
+++ ExtensibilityQueryBindingImpl.java 18 Jul 2002 20:55:11 -0000 1.10
@@ -39,7 +39,7 @@
import java.rmi.RemoteException;
-public class ExtensibilityQueryBindingImpl implements ExtensibilityQueryBinding {
+public class ExtensibilityQueryBindingImpl implements ExtensibilityQueryPortType {
private final static String[] books = new String[] { "The Grid", "The Oxford Dictionary" };
private final static String[] subjects = new String[] { "Computer Science", "English" };
1.6 +1 -1 xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
Index: ExtensibilityQueryTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExtensibilityQueryTestCase.java 11 Jun 2002 14:54:03 -0000 1.5
+++ ExtensibilityQueryTestCase.java 18 Jul 2002 20:55:11 -0000 1.6
@@ -25,7 +25,7 @@
super(name);
}
public void testQuery() {
- ExtensibilityQueryBinding binding;
+ ExtensibilityQueryPortType binding;
try {
ExtensibilityQueryLocator locator = new ExtensibilityQueryLocator();
binding = locator.getExtensibilityQueryPort();
1.4 +1 -1 xml-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java
Index: Qualify_BindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Qualify_BindingImpl.java 29 May 2002 14:30:02 -0000 1.3
+++ Qualify_BindingImpl.java 18 Jul 2002 20:55:11 -0000 1.4
@@ -73,7 +73,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-public class Qualify_BindingImpl implements test.wsdl.qualify.Qualify_Binding {
+public class Qualify_BindingImpl implements test.wsdl.qualify.Qualify_Port {
public static final String namespace = "urn:qualifyTest";
1.4 +2 -2 xml-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java
Index: Qualify_ServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Qualify_ServiceTestCase.java 29 May 2002 14:30:02 -0000 1.3
+++ Qualify_ServiceTestCase.java 18 Jul 2002 20:55:11 -0000 1.4
@@ -88,7 +88,7 @@
public void test1QualifySimple() {
Qualify_ServiceLocator locator = new Qualify_ServiceLocator();
- Qualify_Binding binding;
+ Qualify_Port binding;
try {
binding = locator.getQualify();
} catch (javax.xml.rpc.ServiceException jre) {
@@ -148,7 +148,7 @@
public void test2QualifyFormOverride() {
Qualify_ServiceLocator locator = new Qualify_ServiceLocator();
- test.wsdl.qualify.Qualify_Binding binding;
+ test.wsdl.qualify.Qualify_Port binding;
try {
binding = locator.getQualify();
} catch (javax.xml.rpc.ServiceException jre) {
1.3 +2 -2 xml-axis/java/test/wsdl/wrapped/City_BBBBindingImpl.java
Index: City_BBBBindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/wrapped/City_BBBBindingImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- City_BBBBindingImpl.java 18 Jul 2002 20:00:38 -0000 1.2
+++ City_BBBBindingImpl.java 18 Jul 2002 20:55:11 -0000 1.3
@@ -7,10 +7,10 @@
package test.wsdl.wrapped;
-import test.wsdl.wrapped.City_BBBBinding;
+import test.wsdl.wrapped.City_BBBPortType;
import test.wsdl.wrapped.Attraction;
-public class City_BBBBindingImpl implements City_BBBBinding {
+public class City_BBBBindingImpl implements City_BBBPortType {
public static final String OID_STRING = "Attraction@cityCF::1028:1028";
public Attraction getAttraction(String attname) throws java.rmi.RemoteException {
1.3 +3 -3 xml-axis/java/test/wsdl/wrapped/City_BBBTestCase.java
Index: City_BBBTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/wrapped/City_BBBTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- City_BBBTestCase.java 18 Jul 2002 20:00:38 -0000 1.2
+++ City_BBBTestCase.java 18 Jul 2002 20:55:11 -0000 1.3
@@ -12,7 +12,7 @@
super(name);
}
public void test1CityBBBPortGetAttraction() {
- City_BBBBinding binding;
+ City_BBBPortType binding;
try {
binding = new City_BBBLocator().getCity_BBBPort();
}
@@ -32,7 +32,7 @@
}
public void test2CityBBBPortGetAttractions() {
- City_BBBBinding binding;
+ City_BBBPortType binding;
try {
binding = new City_BBBLocator().getCity_BBBPort();
}
@@ -56,7 +56,7 @@
}
public void test3CityBBBPortGetAttractions() {
- City_BBBBinding binding;
+ City_BBBPortType binding;
try {
binding = new City_BBBLocator().getCity_BBBPort();
}