You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/08/12 17:38:39 UTC
svn commit: r431044 - in /incubator/tuscany/java/sca:
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/
bindings/binding.celtix/
bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/
core/src/main/java/org/apache...
Author: jboynes
Date: Sat Aug 12 08:38:38 2006
New Revision: 431044
URL: http://svn.apache.org/viewvc?rev=431044&view=rev
Log:
move WSDL regsitry from SPI to WSDL IDL module
Added:
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java (contents, props changed)
- copied, changed from r431038, incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java (contents, props changed)
- copied, changed from r431038, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
incubator/tuscany/java/sca/idl/wsdl/src/test/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/
incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java (contents, props changed)
- copied, changed from r431038, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/
incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl (contents, props changed)
- copied, changed from r431038, incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/wsdl/
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java
incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/services/
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml
incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java
incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/TuscanyWSDLManager.java
incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
incubator/tuscany/java/sca/idl/wsdl/pom.xml
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
incubator/tuscany/java/sca/spi/pom.xml
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingLoader.java Sat Aug 12 08:38:38 2006
@@ -43,7 +43,7 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.LoaderUtil;
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
import org.osoa.sca.annotations.Scope;
import org.xml.sax.InputSource;
Modified: incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml Sat Aug 12 08:38:38 2006
@@ -58,6 +58,12 @@
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
<!-- Celtix -->
<dependency>
Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/BusServiceImpl.java Sat Aug 12 08:38:38 2006
@@ -21,7 +21,8 @@
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
+
import org.objectweb.celtix.Bus;
import org.objectweb.celtix.BusException;
import org.osoa.sca.annotations.Destroy;
Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/TuscanyWSDLManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/TuscanyWSDLManager.java?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/TuscanyWSDLManager.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/TuscanyWSDLManager.java Sat Aug 12 08:38:38 2006
@@ -26,7 +26,8 @@
import javax.wsdl.factory.WSDLFactory;
import org.w3c.dom.Element;
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
+
import org.objectweb.celtix.wsdl.WSDLManager;
/**
Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java Sat Aug 12 08:38:38 2006
@@ -34,7 +34,7 @@
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
import org.osoa.sca.annotations.Constructor;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/java/sca/idl/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/pom.xml?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/idl/wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/idl/wsdl/pom.xml Sat Aug 12 08:38:38 2006
@@ -44,5 +44,14 @@
<version>1.5.2</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java Sat Aug 12 08:38:38 2006
@@ -36,7 +36,6 @@
import org.apache.tuscany.spi.loader.LoaderUtil;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.InvalidValueException;
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
/**
* Loads a WSDL interface definition from an XML-based assembly file
Copied: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java (from r431038, incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java?p2=incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java&p1=incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java&r1=431038&r2=431044&rev=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java (original)
+++ incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java Sat Aug 12 08:38:38 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi.services.wsdl;
+package org.apache.tuscany.idl.wsdl;
import java.io.IOException;
import java.net.URL;
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java (from r431038, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java?p2=incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java&r1=431038&r2=431044&rev=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java Sat Aug 12 08:38:38 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.services.wsdl;
+package org.apache.tuscany.idl.wsdl;
import java.io.IOException;
import java.net.URI;
@@ -35,8 +35,6 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
-
/**
* The default implementation of the runtime WSDL registry
*
@@ -105,7 +103,7 @@
String definitionNamespace = definition.getTargetNamespace();
if (namespace != null && !namespace.equals(definitionNamespace)) {
throw new WSDLException(WSDLException.CONFIGURATION_ERROR,
- namespace + " != " + definition.getTargetNamespace());
+ namespace + " != " + definition.getTargetNamespace());
}
monitor.cachingDefinition(definitionNamespace, location);
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java (from r431038, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java?p2=incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java&r1=431038&r2=431044&rev=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java Sat Aug 12 08:38:38 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.services.wsdl;
+package org.apache.tuscany.idl.wsdl;
import java.io.IOException;
import java.net.URL;
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
import junit.framework.TestCase;
+import junit.framework.Assert;
/**
* Verifies the default WSDL registry implementation
@@ -41,30 +42,29 @@
}
};
private WSDLDefinitionRegistryImpl wsdlRegistry;
- private ClassLoader rl;
+ private ClassLoader cl;
+ private URL exampleWsdl;
public void testLoadFromAbsoluteWSDLLocation() {
try {
- Definition def = wsdlRegistry.loadDefinition(
- NS + ' ' + rl.getResource("org/apache/tuscany/core/services/wsdl/example.wsdl"), rl);
- assertNotNull(def.getPortType(new QName(NS, "HelloWorld")));
+ Definition def = wsdlRegistry.loadDefinition(NS + ' ' + exampleWsdl, cl);
+ Assert.assertNotNull(def.getPortType(new QName(NS, "HelloWorld")));
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
} catch (WSDLException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
public void testLoadFromRelativeWSDLLocation() {
try {
- Definition def =
- wsdlRegistry.loadDefinition(NS + " org/apache/tuscany/core/services/wsdl/example.wsdl", rl);
- assertNotNull(def.getPortType(new QName(NS, "HelloWorld")));
+ Definition def = wsdlRegistry.loadDefinition(NS + " org/apache/tuscany/idl/wsdl/example.wsdl", cl);
+ Assert.assertNotNull(def.getPortType(new QName(NS, "HelloWorld")));
} catch (IOException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
} catch (WSDLException e) {
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
@@ -72,7 +72,8 @@
super.setUp();
wsdlRegistry = new WSDLDefinitionRegistryImpl();
wsdlRegistry.setMonitor(NULL_MONITOR);
- rl = getClass().getClassLoader();
+ exampleWsdl = getClass().getResource("example.wsdl");
+ cl = getClass().getClassLoader();
}
}
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl (from r431038, incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl?p2=incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl&p1=incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/services/wsdl/example.wsdl&r1=431038&r2=431044&rev=431044&view=diff
==============================================================================
(empty)
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/pom.xml?rev=431044&r1=431043&r2=431044&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/pom.xml (original)
+++ incubator/tuscany/java/sca/spi/pom.xml Sat Aug 12 08:38:38 2006
@@ -42,12 +42,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.5.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org