You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/03/16 13:44:34 UTC
svn commit: r518973 - in /incubator/yoko/trunk: bindings/
bindings/src/test/java/org/apache/yoko/bindings/corba/
tools/src/main/java/org/apache/yoko/tools/processors/wsdl/
Author: bravi
Date: Fri Mar 16 06:44:33 2007
New Revision: 518973
URL: http://svn.apache.org/viewvc?view=rev&rev=518973
Log:
[YOKO-245] - Removing redundant service definition in the CorbaTypeTest and also adding a default corba address location in the wsdltoidl tool.
Modified:
incubator/yoko/trunk/bindings/pom.xml
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java
incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTestServer.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/pom.xml?view=diff&rev=518973&r1=518972&r2=518973
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Fri Mar 16 06:44:33 2007
@@ -195,28 +195,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>generate-type-test-corba-service</id>
- <phase>generate-test-resources</phase>
- <configuration>
- <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <tasks>
- <property name="generated.target" value="${basedir}/target/generated" />
- <property name="generated.src.test" value="${generated.target}/src/test/java" />
- <property name="generated.resources.test" value="${generated.target}/src/test/resources" />
- <property name="generated.wsdl.test" value="${generated.resources.test}/" />
- <property name="test.resources.dir" location="${basedir}/src/test/resources" />
-
- <mkdir dir="${generated.resources.test}/wsdl/type_test" />
- <xslt style="${test.resources.dir}/wsdl/type_test/type_test_wsdl_service.xsl"
- in="${generated.resources.test}/wsdl/type_test/type_test_corba_binding.wsdl"
- out="${generated.resources.test}/wsdl/type_test/type_test_corba.wsdl" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
@@ -263,7 +241,7 @@
<corbabinding>true</corbabinding>
<extraargs>
<extraarg>-o</extraarg>
- <extraarg>type_test_corba_binding.wsdl</extraarg>
+ <extraarg>type_test_corba.wsdl</extraarg>
<extraarg>-b</extraarg>
<extraarg>TypeTestCORBABinding</extraarg>
<extraarg>-verbose</extraarg>
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient.java?view=diff&rev=518973&r1=518972&r2=518973
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractTypeTestClient.java Fri Mar 16 06:44:33 2007
@@ -33,7 +33,7 @@
import org.apache.type_test.corba.TypeTestPortType;
import org.apache.type_test.corba.TypeTestTester;
-import org.apache.type_test.corba.CORBAService;
+import org.apache.type_test.corba.TypeTestCORBAService;
import org.apache.type_test.types1.NMTokenEnum;
import org.apache.type_test.types1.StringEnum;
@@ -41,7 +41,7 @@
import junit.framework.TestCase;
public abstract class AbstractTypeTestClient extends TestCase implements TypeTestTester {
- protected static org.apache.type_test.corba.TypeTestPortType client;
+ protected static TypeTestPortType client;
protected boolean perfTestOnly;
@@ -56,8 +56,8 @@
public static void initClient(Class clz, QName serviceName, QName portName, String wsdlPath)
throws Exception {
URL wsdlLocation = clz.getResource(wsdlPath);
- org.apache.type_test.corba.CORBAService service =
- new org.apache.type_test.corba.CORBAService(wsdlLocation, serviceName);
+ TypeTestCORBAService service =
+ new TypeTestCORBAService(wsdlLocation, serviceName);
client = service.getPort(portName, org.apache.type_test.corba.TypeTestPortType.class);
assertNotNull("Could not create corba client", client);
}
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java?view=diff&rev=518973&r1=518972&r2=518973
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTest.java Fri Mar 16 06:44:33 2007
@@ -28,8 +28,8 @@
public class CorbaTypeTest extends AbstractTypeTestClient1 {
protected static final String WSDL_PATH = "/wsdl/type_test/type_test_corba.wsdl";
- protected static final QName SERVICE_NAME = new QName("http://apache.org/type_test/corba", "CORBAService");
- protected static final QName PORT_NAME = new QName("http://apache.org/type_test/corba", "CORBAPort");
+ protected static final QName SERVICE_NAME = new QName("http://apache.org/type_test/corba", "TypeTestCORBAService");
+ protected static final QName PORT_NAME = new QName("http://apache.org/type_test/corba", "TypeTestCORBAPort");
static boolean serverStarted = false;
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTestServer.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTestServer.java?view=diff&rev=518973&r1=518972&r2=518973
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTestServer.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeTestServer.java Fri Mar 16 06:44:33 2007
@@ -31,7 +31,7 @@
public void _start() {
Object implementor = new CORBATypeTestImpl();
- String address = "corbaloc::localhost:40012/type_test";
+ String address = "file:./TypeTest.ref";
Endpoint.publish(address, implementor);
serverReady = true;
}
@@ -60,7 +60,7 @@
return serverReady;
}
- @WebService(serviceName = "CORBAService", portName = "CORBAPort",
+ @WebService(serviceName = "TypeTestCORBAService", portName = "TypeTestCORBAPort",
endpointInterface = "org.apache.type_test.corba.TypeTestPortType",
targetNamespace = "http://apache.org/type_test/corba")
class CORBATypeTestImpl extends TypeTestImpl implements TypeTestPortType {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java?view=diff&rev=518973&r1=518972&r2=518973
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java Fri Mar 16 06:44:33 2007
@@ -308,15 +308,16 @@
}
String interfaceName = portType.getQName().getLocalPart();
- String serviceName = mangleInterfaceName(interfaceName) + "CORBAService";
- String portName = mangleInterfaceName(interfaceName) + "CORBAPort";
-
String bName = getMappedBindingName(interfaceName);
+ interfaceName = mangleInterfaceName(interfaceName);
+ String serviceName = interfaceName + "CORBAService";
+ String portName = interfaceName + "CORBAPort";
+
if (bName == null) {
bName = bindingName;
}
if (bName == null) {
- bName = mangleInterfaceName(interfaceName) + "CORBABinding";
+ bName = interfaceName + "CORBABinding";
}
String prefix = definition.getPrefix(definition.getTargetNamespace());
@@ -349,7 +350,7 @@
CorbaConstants.NE_CORBA_ADDRESS);
// TODO: Use an address from the command line or a random one if none has been
// specified.
- addressType.setLocation("...");
+ addressType.setLocation("file:./" + interfaceName + ".ref");
servicePort.addExtensibilityElement(addressType);
} catch (WSDLException ex) {
throw new Exception("Failed to create CORBA address for service", ex);