JBossWS SVN: r12294 - in framework/branches/jbossws-framework-3.1.2: src/main/java/org/jboss/wsf/framework and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 16:25:53 -0400 (Thu, 20 May 2010)
New Revision: 12294
Added:
framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/management/DefaultJMSEndpointResolver.java
Modified:
framework/branches/jbossws-framework-3.1.2/pom.xml
framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
Log:
[JBPAPP-4359]
Modified: framework/branches/jbossws-framework-3.1.2/pom.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/pom.xml 2010-05-20 20:24:18 UTC (rev 12293)
+++ framework/branches/jbossws-framework-3.1.2/pom.xml 2010-05-20 20:25:53 UTC (rev 12294)
@@ -28,6 +28,7 @@
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jbossxb.version>1.0.0.SP1</jbossxb.version>
+ <jms.api.version>1.1</jms.api.version>
</properties>
<!-- Dependencies -->
@@ -97,6 +98,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>${jms.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${jbossxb.version}</version>
Modified: framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2010-05-20 20:24:18 UTC (rev 12293)
+++ framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2010-05-20 20:25:53 UTC (rev 12294)
@@ -30,6 +30,7 @@
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
import org.jboss.wsf.framework.management.ServerConfigFactoryImpl;
import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory;
+import org.jboss.wsf.framework.management.DefaultJMSEndpointResolver;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.SPIProvider;
@@ -47,6 +48,7 @@
import org.jboss.wsf.spi.management.EndpointMetricsFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.management.JMSEndpointResolver;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
@@ -112,6 +114,10 @@
{
returnType = (T)loadService(spiType, ServerConfigFactoryImpl.class.getName());
}
+ else if (JMSEndpointResolver.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultJMSEndpointResolver.class.getName());
+ }
// SPI provided by either container or stack integration
Copied: framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/management/DefaultJMSEndpointResolver.java (from rev 11816, framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultJMSEndpointResolver.java)
===================================================================
--- framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/management/DefaultJMSEndpointResolver.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/management/DefaultJMSEndpointResolver.java 2010-05-20 20:25:53 UTC (rev 12294)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.management;
+
+import java.util.Iterator;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.JMSEndpointResolver;
+
+/**
+ * Default resolver for JMS endpoints
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 19-Mar-2010
+ *
+ */
+public class DefaultJMSEndpointResolver implements JMSEndpointResolver
+{
+ private String fromName;
+
+ public void setDestination(Destination destination)
+ {
+ if (destination instanceof Queue)
+ setFromName(destination, true);
+ else if (destination instanceof Topic)
+ setFromName(destination, false);
+ }
+
+ protected void setFromName(Destination destination, boolean queue)
+ {
+ try
+ {
+ fromName = queue ? "queue/" + ((Queue)destination).getQueueName() : "topic/" + ((Topic)destination).getTopicName();
+ }
+ catch (JMSException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+ while (endpoints.hasNext())
+ {
+ Endpoint aux = endpoints.next();
+ String jmsProp = aux.getName().getKeyProperty("jms");
+ if (jmsProp != null && jmsProp.equals(fromName))
+ {
+ endpoint = aux;
+ break;
+ }
+ }
+ return endpoint;
+ }
+}
14 years, 7 months
JBossWS SVN: r12293 - in spi/branches/jbossws-spi-1.1.2: src/main/java/org/jboss/wsf/spi/management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 16:24:18 -0400 (Thu, 20 May 2010)
New Revision: 12293
Added:
spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/management/JMSEndpointResolver.java
Modified:
spi/branches/jbossws-spi-1.1.2/pom.xml
Log:
[JBPAPP-4359]
Modified: spi/branches/jbossws-spi-1.1.2/pom.xml
===================================================================
--- spi/branches/jbossws-spi-1.1.2/pom.xml 2010-05-20 16:46:56 UTC (rev 12292)
+++ spi/branches/jbossws-spi-1.1.2/pom.xml 2010-05-20 20:24:18 UTC (rev 12293)
@@ -29,6 +29,7 @@
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
<jbossxb.version>1.0.0.SP1</jbossxb.version>
+ <jms.api.version>1.1</jms.api.version>
</properties>
<!-- Dependencies -->
@@ -54,6 +55,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>${jms.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.1</version>
Copied: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/management/JMSEndpointResolver.java (from rev 11815, spi/trunk/src/main/java/org/jboss/wsf/spi/management/JMSEndpointResolver.java)
===================================================================
--- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/management/JMSEndpointResolver.java (rev 0)
+++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/management/JMSEndpointResolver.java 2010-05-20 20:24:18 UTC (rev 12293)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management;
+
+import javax.jms.Destination;
+
+/**
+ * An endpoint resolver for JMS endpoints
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 19-Mar-2010
+ *
+ */
+public interface JMSEndpointResolver extends EndpointResolver
+{
+ public void setDestination(Destination destination);
+}
14 years, 7 months
JBossWS SVN: r12292 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: jaxws/samples/dar and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 12:46:56 -0400 (Thu, 20 May 2010)
New Revision: 12292
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
Log:
Remove todo
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 13:31:41 UTC (rev 12291)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 16:46:56 UTC (rev 12292)
@@ -31,18 +31,16 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
+import junit.framework.Test;
+
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.ObjectNameFactory;
-import junit.framework.Test;
-
/**
* A web service client that connects to a MDB endpoint.
*
@@ -55,24 +53,9 @@
public static Test suite() throws Exception
{
- //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
- return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxrpc-samples-jmstransport-as6.sar" : "jaxrpc-samples-jmstransport.sar");
+ return new JBossWSTestSetup(JMSTransportTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxrpc-samples-jmstransport-as6.sar" : "jaxrpc-samples-jmstransport.sar");
}
- private static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
/**
* Send the message to the specified queue
*/
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-05-20 13:31:41 UTC (rev 12291)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-05-20 16:46:56 UTC (rev 12292)
@@ -45,26 +45,11 @@
public static Test suite()
{
- //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
- return new JBossWSTestSetup(AddressingClientTestCase.class, isHornetQAvailable()
+ return new JBossWSTestSetup(AddressingClientTestCase.class, JBossWSTestHelper.isTargetJBoss6()
? "jaxws-samples-dar-queue-as6.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar"
: "jaxws-samples-dar-queue.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar");
}
- private static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
public void testSync() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/dar?wsdl");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2010-05-20 13:31:41 UTC (rev 12291)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2010-05-20 16:46:56 UTC (rev 12292)
@@ -34,12 +34,10 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import junit.framework.Test;
-import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -57,23 +55,9 @@
public static Test suite()
{
//TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
- return new JBossWSTestSetup(JMSClientTestCase.class, isHornetQAvailable() ? "jaxws-samples-dar-jms-client-test-as6.sar,jaxws-samples-dar-jms.jar" : "jaxws-samples-dar-jms-client-test.sar,jaxws-samples-dar-jms.jar");
+ return new JBossWSTestSetup(JMSClientTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxws-samples-dar-jms-client-test-as6.sar,jaxws-samples-dar-jms.jar" : "jaxws-samples-dar-jms-client-test.sar,jaxws-samples-dar-jms.jar");
}
- private static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
public void test() throws Exception
{
String url = "http://" + getServerHost() + ":8080/dar-jms-client/JMSClient";
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 13:31:41 UTC (rev 12291)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-05-20 16:46:56 UTC (rev 12292)
@@ -35,7 +35,6 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -43,7 +42,6 @@
import junit.framework.Test;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -60,24 +58,9 @@
public static Test suite() throws Exception
{
- //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore
- return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-samples-jmstransport-as6.jar" : "jaxws-samples-jmstransport.sar");
+ return new JBossWSTestSetup(JMSTransportTestCase.class, JBossWSTestHelper.isTargetJBoss6() ? "jaxws-samples-jmstransport-as6.jar" : "jaxws-samples-jmstransport.sar");
}
- private static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
public void testPublishedContract() throws Exception
{
//test the published contract using the 2nd port, which is an http one
14 years, 7 months
JBossWS SVN: r12290 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 09:26:41 -0400 (Thu, 20 May 2010)
New Revision: 12290
Added:
common/tags/jbossws-common-1.1.0.SP5/
Log:
[JBPAPP-3576] Tagging jbossws-common 1.1.0.SP5
Copied: common/tags/jbossws-common-1.1.0.SP5 (from rev 12289, common/branches/jbossws-common-1.1.0)
14 years, 7 months
JBossWS SVN: r12288 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 09:18:51 -0400 (Thu, 20 May 2010)
New Revision: 12288
Added:
spi/tags/jbossws-spi-1.1.2.SP3/
Log:
Tagging jbossws-spi-1.1.2.SP3
Copied: spi/tags/jbossws-spi-1.1.2.SP3 (from rev 12287, spi/branches/jbossws-spi-1.1.2)
14 years, 7 months
JBossWS SVN: r12287 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 09:08:55 -0400 (Thu, 20 May 2010)
New Revision: 12287
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Update / synch libs with EAP 5.1
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-05-20 13:04:52 UTC (rev 12286)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2010-05-20 13:08:55 UTC (rev 12287)
@@ -111,11 +111,11 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
@@ -135,7 +135,7 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
@@ -152,7 +152,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-lgpl</artifactId>
+ <artifactId>wstx</artifactId>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-05-20 13:04:52 UTC (rev 12286)
+++ stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2010-05-20 13:08:55 UTC (rev 12287)
@@ -21,13 +21,13 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
</dependencies>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-05-20 13:04:52 UTC (rev 12286)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-05-20 13:08:55 UTC (rev 12287)
@@ -59,8 +59,8 @@
<codehaus.jettison.version>1.1</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jaxb.api.version>2.1.9.patch02</jaxb.api.version>
- <jaxb.impl.version>2.1.9.patch02</jaxb.impl.version>
+ <jaxb.api.version>2.1</jaxb.api.version>
+ <jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
<jboss.remoting.version>2.5.2.SP3</jboss.remoting.version>
@@ -70,7 +70,7 @@
<juddi.version>2.0.1</juddi.version>
<sun.fastinfoset.version>1.2.7</sun.fastinfoset.version>
<sun.jaxws.version>2.1.7</sun.jaxws.version>
- <woodstox.version>3.2.8</woodstox.version>
+ <woodstox.version>3.2.9</woodstox.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.4.3</xmlsec.version>
<xalan.version>2.7.1.patch02</xalan.version>
@@ -149,7 +149,7 @@
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -214,17 +214,17 @@
</exclusions>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.impl.version}</version>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
+ <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${jaxb.impl.version}</version>
</dependency>
@@ -309,7 +309,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-lgpl</artifactId>
+ <artifactId>wstx</artifactId>
<version>${woodstox.version}</version>
</dependency>
<dependency>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 13:04:52 UTC (rev 12286)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 13:08:55 UTC (rev 12287)
@@ -33,9 +33,9 @@
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
- <include>sun-jaxb:jaxb-api:jar</include>
- <include>sun-jaxb:jaxb-impl:jar</include>
- <include>sun-jaxb:jaxb-xjc:jar</include>
+ <include>javax.xml.bind:jaxb-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
<include>com.sun.xml.ws:jaxws-tools:jar</include>
<include>com.sun.xml.ws:jaxws-rt:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
@@ -51,15 +51,9 @@
<include>com.sun.xml.stream.buffer:streambuffer:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
<include>org.apache:xmlsec:jar</include>
+ <include>org.codehaus.woodstox:wstx:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</binaries>
</moduleSet>
14 years, 7 months
JBossWS SVN: r12286 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-20 09:04:52 -0400 (Thu, 20 May 2010)
New Revision: 12286
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Update / synch with EAP 5.1 lib
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-20 12:56:11 UTC (rev 12285)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2010-05-20 13:04:52 UTC (rev 12286)
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <artifactId>wstx</artifactId>
</dependency>
<dependency>
<groupId>sun-fi</groupId>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-20 12:56:11 UTC (rev 12285)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2010-05-20 13:04:52 UTC (rev 12286)
@@ -136,7 +136,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <artifactId>wstx</artifactId>
</dependency>
<dependency>
<groupId>org.objectweb.asm</groupId>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-20 12:56:11 UTC (rev 12285)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-05-20 13:04:52 UTC (rev 12286)
@@ -59,7 +59,7 @@
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.12</jaxb.impl.version>
+ <jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jaxws.api.version>2.1.3</jaxws.api.version>
<juddi.version>2.0.1</juddi.version>
@@ -434,7 +434,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
+ <artifactId>wstx</artifactId>
<version>${wstx.version}</version>
</dependency>
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 12:56:11 UTC (rev 12285)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 13:04:52 UTC (rev 12286)
@@ -50,6 +50,7 @@
<include>sun-fi:FastInfoset:jar</include>
<include>org.apache:xmlsec:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
+ <include>org.codehaus.woodstox:wstx:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -66,13 +67,6 @@
<include>stax:stax-api</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.codehaus.woodstox:wstx-asl:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</binaries>
</moduleSet>
14 years, 7 months
JBossWS SVN: r12285 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-05-20 08:56:11 -0400 (Thu, 20 May 2010)
New Revision: 12285
Added:
stack/native/branches/dlofthouse/821/
Log:
Recover old commit
Copied: stack/native/branches/dlofthouse/821 (from rev 821, tags/jbossws-1.0.3.GA)
14 years, 7 months