Author: kstam
Date: Fri Jan 21 18:47:42 2011
New Revision: 1061965
URL: http://svn.apache.org/viewvc?rev=1061965&view=rev
Log:
JUDDI-252, upgrading to use JAXWS-2.0 which is implemented by CXF 2.3.
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
juddi/trunk/juddi-cxf/pom.xml
juddi/trunk/juddiv3-samples/pom.xml
juddi/trunk/juddiv3-war/pom.xml
juddi/trunk/uddi-tck/pom.xml
juddi/trunk/uddi-ws/pom.xml
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java?rev=1061965&r1=1061964&r2=1061965&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
Fri Jan 21 18:47:42 2011
@@ -65,9 +65,9 @@ public class RMITransport extends Transp
private void initContext() throws NamingException,
ConfigurationException {
Properties env = new Properties();
UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
- String factoryInitial =
manager.getClientConfig().getConfiguration().getString(Property.UDDI_PROXY_FACTORY_INITIAL);
- String factoryURLPkgs =
manager.getClientConfig().getConfiguration().getString(Property.UDDI_PROXY_FACTORY_URL_PKS);
- String factoryNamingProvider =
manager.getClientConfig().getConfiguration().getString(Property.UDDI_PROXY_PROVIDER_URL);
+ String factoryInitial =
manager.getClientConfig().getHomeNode().getFactoryInitial();
+ String factoryURLPkgs =
manager.getClientConfig().getHomeNode().getFactoryURLPkgs();
+ String factoryNamingProvider =
manager.getClientConfig().getHomeNode().getFactoryNamingProvider();
if (factoryInitial!=null && factoryInitial!="")
env.setProperty(Property.UDDI_PROXY_FACTORY_INITIAL, factoryInitial);
if (factoryURLPkgs!=null && factoryURLPkgs!="")
env.setProperty(Property.UDDI_PROXY_FACTORY_URL_PKS, factoryURLPkgs);
if (factoryNamingProvider!=null && factoryNamingProvider!="")
env.setProperty(Property.UDDI_PROXY_PROVIDER_URL, factoryNamingProvider);
Modified: juddi/trunk/juddi-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-cxf/pom.xml?rev=1061965&r1=1061964&r2=1061965&view=diff
==============================================================================
--- juddi/trunk/juddi-cxf/pom.xml (original)
+++ juddi/trunk/juddi-cxf/pom.xml Fri Jan 21 18:47:42 2011
@@ -23,7 +23,7 @@
<packaging>pom</packaging>
<properties>
- <cxf.version>2.1.9</cxf.version>
+ <cxf.version>2.3.1</cxf.version>
</properties>
<dependencies>
<dependency>
@@ -64,6 +64,7 @@
<version>${project.parent.version}</version>
<type>war</type>
</dependency>
+
</dependencies>
<build>
<!--
Modified: juddi/trunk/juddiv3-samples/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-samples/pom.xml?rev=1061965&r1=1061964&r2=1061965&view=diff
==============================================================================
--- juddi/trunk/juddiv3-samples/pom.xml (original)
+++ juddi/trunk/juddiv3-samples/pom.xml Fri Jan 21 18:47:42 2011
@@ -26,7 +26,7 @@
<name>jUDDI Service Registration Examples</name>
<packaging>war</packaging>
<properties>
- <cxf.version>2.1.3</cxf.version>
+ <cxf.version>2.3.1</cxf.version>
</properties>
<dependencies>
<dependency>
Modified: juddi/trunk/juddiv3-war/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1061965&r1=1061964&r2=1061965&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Fri Jan 21 18:47:42 2011
@@ -27,7 +27,7 @@
<name>jUDDI base-war Deployment</name>
<url>http://maven.apache.org</url>
<properties>
- <cxf.version>2.1.9</cxf.version>
+ <cxf.version>2.3.1</cxf.version>
</properties>
<dependencies>
<dependency>
Modified: juddi/trunk/uddi-tck/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/pom.xml?rev=1061965&r1=1061964&r2=1061965&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/pom.xml (original)
+++ juddi/trunk/uddi-tck/pom.xml Fri Jan 21 18:47:42 2011
@@ -35,32 +35,45 @@
<groupId>org.apache.juddi</groupId>
<artifactId>uddi-tck-base</artifactId>
<version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddi-core</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>juddi-client</artifactId>
<version>${project.parent.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>juddi-tomcat</artifactId>
<version>${project.parent.version}</version>
<type>zip</type>
- <scope>test</scope>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.juddi</groupId>
+
<artifactId>juddi-core-openjpa</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- for JAXWS
+ running into JUDDI-451 for CXF
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.3.1</version>
</dependency>
- <!--
- for RMI <dependency> <groupId>jboss</groupId>
+ -->
+ <!-- so using the SUN reference implementation for now -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.1.4</version>
+ </dependency>
+
+ <!-- for RMI -->
+ <dependency> <groupId>jboss</groupId>
<artifactId>jbossall-client</artifactId>
<version>4.2.2.GA</version>
<scope>test</scope> </dependency>
- -->
+
</dependencies>
<build>
<plugins>
Modified: juddi/trunk/uddi-ws/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/pom.xml?rev=1061965&r1=1061964&r2=1061965&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/pom.xml (original)
+++ juddi/trunk/uddi-ws/pom.xml Fri Jan 21 18:47:42 2011
@@ -54,20 +54,18 @@
</profile>
</profiles>
<dependencies>
+ <!-- the JAXWS specification -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
</dependency>
+ <!-- -->
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.2</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
