JBossWS SVN: r19002 - stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 16:48:08 -0400 (Thu, 16 Oct 2014)
New Revision: 19002
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java
Log:
[JBWS-3831] Fix to use WSS4J 1.6.x class
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java 2014-10-16 20:43:59 UTC (rev 19001)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java 2014-10-16 20:48:08 UTC (rev 19002)
@@ -1,6 +1,6 @@
package org.jboss.test.ws.jaxws.samples.wsse.policy.oasis;
-public class SAMLValidator extends org.apache.wss4j.dom.validate.SamlAssertionValidator
+public class SAMLValidator extends org.apache.ws.security.validate.SamlAssertionValidator
{
public SAMLValidator() {
super();
9 years, 6 months
JBossWS SVN: r19001 - in stack/cxf/branches/jbossws-cxf-4.3.x: modules/testsuite/cxf-tests/scripts and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 16:43:59 -0400 (Thu, 16 Oct 2014)
New Revision: 19001
Added:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java
Log:
Merged revisions 18947 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r18947 | asoldano | 2014-09-24 10:50:43 +0200 (Wed, 24 Sep 2014) | 2 lines
[JBWS-3831] Use custom SAML validator
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.3.x
___________________________________________________________________
Modified: svnmerge-integrated
- /stack/cxf/trunk:1-18594,18609-18612,18616-18619,18621,18625-18652,18656-18658,18661,18663,18665-18668,18671-18683,18685-18687,18689-18693,18695,18698,18701,18703-18704,18706-18710,18712-18713,18715,18717-18721,18726-18730,18732,18735-18737,18742,18745-18746,18750-18752,18755-18759,18762,18770,18777-18779,18781-18787,18796,18798,18805-18808,18811-18814,18816,18822-18824,18832-18835,18837,18839-18840,18842-18843,18845,18847-18848,18852,18856-18857,18859-18864,18866,18883-18884
+ /stack/cxf/trunk:1-18594,18609-18612,18616-18619,18621,18625-18652,18656-18658,18661,18663,18665-18668,18671-18683,18685-18687,18689-18693,18695,18698,18701,18703-18704,18706-18710,18712-18713,18715,18717-18721,18726-18730,18732,18735-18737,18742,18745-18746,18750-18752,18755-18759,18762,18770,18777-18779,18781-18787,18796,18798,18805-18808,18811-18814,18816,18822-18824,18832-18835,18837,18839-18840,18842-18843,18845,18847-18848,18852,18856-18857,18859-18864,18866,18883-18884,18947
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/jaspi:18054-18409
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18609,18616-18619,18629,18695,18710,18715,18798,18814,18816,18847,18852,18856,18860-18864,18866,18883-18884
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/jaspi:18054-18409
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18609,18616-18619,18629,18695,18710,18715,18798,18814,18816,18847,18852,18856,18860-18864,18866,18883-18884,18947
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-10-16 16:06:24 UTC (rev 19000)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-10-16 20:43:59 UTC (rev 19001)
@@ -199,6 +199,7 @@
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service23*Impl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF">
<include name="wsdl/*.xsd"/>
Copied: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java (from rev 18947, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java 2014-10-16 20:43:59 UTC (rev 19001)
@@ -0,0 +1,9 @@
+package org.jboss.test.ws.jaxws.samples.wsse.policy.oasis;
+
+public class SAMLValidator extends org.apache.wss4j.dom.validate.SamlAssertionValidator
+{
+ public SAMLValidator() {
+ super();
+ setRequireBearerSignature(false);
+ }
+}
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java 2014-10-16 16:06:24 UTC (rev 19000)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java 2014-10-16 20:43:59 UTC (rev 19001)
@@ -24,6 +24,8 @@
import javax.ejb.Stateless;
import javax.jws.WebService;
+import org.apache.cxf.annotations.EndpointProperties;
+import org.apache.cxf.annotations.EndpointProperty;
import org.jboss.ws.api.annotation.WebContext;
@WebService
@@ -35,6 +37,10 @@
endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface"
)
@Stateless
+@EndpointProperties(value = {
+ @EndpointProperty(key = "ws-security.saml1.validator", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator")
+ }
+)
@WebContext(urlPattern = "SecurityService2311")
public class Service2311Impl implements ServiceIface
{
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java 2014-10-16 16:06:24 UTC (rev 19000)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java 2014-10-16 20:43:59 UTC (rev 19001)
@@ -41,6 +41,7 @@
@EndpointProperty(key = "ws-security.signature.username", value = "bob"),
@EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"),
@EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"),
+ @EndpointProperty(key = "ws-security.saml2.validator", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator"),
@EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback")
}
)
9 years, 6 months
JBossWS SVN: r19000 - stack/cxf/branches/jbossws-cxf-4.3.x.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 12:06:24 -0400 (Thu, 16 Oct 2014)
New Revision: 19000
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
Log:
[JBWS-3844] Move to Apache CXF 2.7.13
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-10-16 15:32:35 UTC (rev 18999)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-10-16 16:06:24 UTC (rev 19000)
@@ -72,7 +72,7 @@
<wildfly800.version>8.0.0.Final</wildfly800.version>
<wildfly810.version>8.1.0.Final</wildfly810.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
- <cxf.version>2.7.12</cxf.version>
+ <cxf.version>2.7.13</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -106,7 +106,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.7</xmlsec.version>
- <wss4j.version>1.6.16</wss4j.version>
+ <wss4j.version>1.6.17</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.0.7.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>
9 years, 6 months
JBossWS SVN: r18999 - stack/cxf/branches/jbossws-cxf-4.3.x.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 11:32:35 -0400 (Thu, 16 Oct 2014)
New Revision: 18999
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
Log:
Use latest ASILs
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-10-16 15:30:08 UTC (rev 18998)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-10-16 15:32:35 UTC (rev 18999)
@@ -64,9 +64,9 @@
<jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
<jbossws.common.version>2.3.1.Final</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
- <jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version>
- <jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version>
- <jbossws.wildfly810.version>4.3.1.Final</jbossws.wildfly810.version>
+ <jbossws.jboss720.version>4.3.2-SNAPSHOT</jbossws.jboss720.version>
+ <jbossws.wildfly800.version>4.3.2-SNAPSHOT</jbossws.wildfly800.version>
+ <jbossws.wildfly810.version>4.3.2-SNAPSHOT</jbossws.wildfly810.version>
<jbossws.native.version>4.2.0.Final</jbossws.native.version>
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
9 years, 6 months
JBossWS SVN: r18998 - container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 11:30:08 -0400 (Thu, 16 Oct 2014)
New Revision: 18998
Modified:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
Log:
[JBWS-3842] Fix regression
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 15:27:33 UTC (rev 18997)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 15:30:08 UTC (rev 18998)
@@ -38,7 +38,6 @@
import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.as.webservices.service.HandlerChainService;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -86,9 +85,8 @@
final HandlerChainService service = new HandlerChainService(handlerChainType, handlerChainId, protocolBindings);
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> handlerChainServiceBuilder = target.addService(handlerChainServiceName, service);
- final Injector<UnifiedHandlerMetaData> injector = service.getHandlersInjector();
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, handlerChainServiceName, address, HANDLER)) {
- handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, injector);
+ handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, service.getHandlersInjector());
}
ServiceController<?> controller = handlerChainServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
9 years, 6 months
JBossWS SVN: r18997 - container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 11:27:33 -0400 (Thu, 16 Oct 2014)
New Revision: 18997
Modified:
container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
Log:
[JBWS-3842] Fix regression
Modified: container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 15:25:55 UTC (rev 18996)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 15:27:33 UTC (rev 18997)
@@ -38,7 +38,6 @@
import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.as.webservices.service.HandlerChainService;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -86,9 +85,8 @@
final HandlerChainService service = new HandlerChainService(handlerChainType, handlerChainId, protocolBindings);
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> handlerChainServiceBuilder = target.addService(handlerChainServiceName, service);
- final Injector<UnifiedHandlerMetaData> injector = service.getHandlersInjector();
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, handlerChainServiceName, address, HANDLER)) {
- handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, injector);
+ handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, service.getHandlersInjector());
}
ServiceController<?> controller = handlerChainServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
9 years, 6 months
JBossWS SVN: r18996 - in container/wildfly80/branches: jbossws-wildfly800-4.3.x and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 11:25:55 -0400 (Thu, 16 Oct 2014)
New Revision: 18996
Added:
container/wildfly80/branches/jbossws-wildfly800-4.3.x/
container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml
container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml
container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml
Removed:
container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml
container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml
container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml
Log:
Creating 4.3.x maintenance branch for WFLY 800 ASIL
Deleted: container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml
===================================================================
--- container/wildfly80/tags/jbossws-wildfly800-4.3.0.Final/pom.xml 2014-03-14 08:39:56 UTC (rev 18513)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml 2014-10-16 15:25:55 UTC (rev 18996)
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2014, Red Hat, Inc., 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-parent</artifactId>
- <version>1.1.0.GA</version>
- </parent>
-
- <name>JBossWS WildFly 8.0.0.Final Integration Parent</name>
- <description>JBossWS WildFly 8.0.0.Final Integration Parent</description>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-wildfly800-parent</artifactId>
- <version>4.3.0.CR2</version>
- <packaging>pom</packaging>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/wildfly80/tags/j...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/wildfly80/tags/jbos...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/wildfly80/tags/jbossws...</url>
- </scm>
-
- <modules>
- <module>server-integration</module>
- <module>tests-integration</module>
- </modules>
-
- <properties>
- <jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0.CR1</jbossws.spi.version>
- <jbossws.common.version>2.3.0.CR2</jbossws.common.version>
- <jboss.msc.version>1.2.0.Final</jboss.msc.version>
- <wildfly.version>8.0.0.Final</wildfly.version>
- <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>
- <marshalling.river.version>1.4.3.Final</marshalling.river.version>
- <remote.naming.version>2.0.0.Final</remote.naming.version>
- <javax.mail.version>1.5.1</javax.mail.version>
- <ejb.client.version>2.0.0.Final</ejb.client.version>
- <ejb3.ext.api.version>2.1.0</ejb3.ext.api.version>
- <jboss.common.core.version>2.2.22.GA</jboss.common.core.version>
- <javassist.version>3.18.1-GA</javassist.version>
- <xerces.version>2.9.1-jbossas-2</xerces.version>
- <remoting.version>4.0.0.Final</remoting.version>
- <remoting.jmx.version>2.0.0.Final</remoting.jmx.version>
- <jbossxb.version>2.0.3.GA</jbossxb.version>
- <hornetq.version>2.4.1.Final</hornetq.version>
- <xnio.version>3.2.0.Final</xnio.version>
- <jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version>
- <jboss.logging.tools.version>1.2.0.Final</jboss.logging.tools.version>
- <junit.version>4.10</junit.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.msc</groupId>
- <artifactId>jboss-msc</artifactId>
- <version>${jboss.msc.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly.security</groupId>
- <artifactId>wildfly-security-manager</artifactId>
- <version>${wildfly.security-manager.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-controller-client</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-security</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-server</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-ee</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-ejb3</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-web-common</artifactId>
- <version>${wildfly.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling-river</artifactId>
- <version>${marshalling.river.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-remote-naming</artifactId>
- <version>${remote.naming.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>${javax.mail.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-ejb-client</artifactId>
- <version>${ejb.client.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>${ejb3.ext.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${jboss.common.core.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${jbossxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.wutka</groupId>
- <artifactId>dtdparser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.remotingjmx</groupId>
- <artifactId>remoting-jmx</artifactId>
- <version>${remoting.jmx.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logmanager</groupId>
- <artifactId>jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>${remoting.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-client</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-server</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core-client</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-server</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-api</artifactId>
- <version>${jbossws.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <version>${jboss.jaxws.api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- <version>${xnio.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- <version>${xnio.version}</version>
- </dependency>
-
-<!-- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>-->
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
- projects that depend on this project.-->
- <scope>provided</scope>
- <optional>true</optional>
- <version>${jboss.logging.tools.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
- projects that depend on this project.-->
- <scope>provided</scope>
- <optional>true</optional>
- <version>${jboss.logging.tools.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-subsystem-test</artifactId>
- <type>pom</type>
- <scope>test</scope>
- <version>${wildfly.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
Copied: container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml (from rev 18515, container/wildfly80/tags/jbossws-wildfly800-4.3.0.Final/pom.xml)
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml (rev 0)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/pom.xml 2014-10-16 15:25:55 UTC (rev 18996)
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2014, Red Hat, Inc., 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.1.0.GA</version>
+ </parent>
+
+ <name>JBossWS WildFly 8.0.0.Final Integration Parent</name>
+ <description>JBossWS WildFly 8.0.0.Final Integration Parent</description>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly800-parent</artifactId>
+ <version>4.3.2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/wildfly80/tags/j...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/wildfly80/tags/jbos...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/wildfly80/tags/jbossws...</url>
+ </scm>
+
+ <modules>
+ <module>server-integration</module>
+ <module>tests-integration</module>
+ </modules>
+
+ <properties>
+ <jbossws.api.version>1.0.2.Final</jbossws.api.version>
+ <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
+ <jbossws.common.version>2.3.0.Final</jbossws.common.version>
+ <jboss.msc.version>1.2.0.Final</jboss.msc.version>
+ <wildfly.version>8.0.0.Final</wildfly.version>
+ <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>
+ <marshalling.river.version>1.4.3.Final</marshalling.river.version>
+ <remote.naming.version>2.0.0.Final</remote.naming.version>
+ <javax.mail.version>1.5.1</javax.mail.version>
+ <ejb.client.version>2.0.0.Final</ejb.client.version>
+ <ejb3.ext.api.version>2.1.0</ejb3.ext.api.version>
+ <jboss.common.core.version>2.2.22.GA</jboss.common.core.version>
+ <javassist.version>3.18.1-GA</javassist.version>
+ <xerces.version>2.9.1-jbossas-2</xerces.version>
+ <remoting.version>4.0.0.Final</remoting.version>
+ <remoting.jmx.version>2.0.0.Final</remoting.jmx.version>
+ <jbossxb.version>2.0.3.GA</jbossxb.version>
+ <hornetq.version>2.4.1.Final</hornetq.version>
+ <xnio.version>3.2.0.Final</xnio.version>
+ <jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version>
+ <jboss.logging.tools.version>1.2.0.Final</jboss.logging.tools.version>
+ <junit.version>4.10</junit.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.msc</groupId>
+ <artifactId>jboss-msc</artifactId>
+ <version>${jboss.msc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly.security</groupId>
+ <artifactId>wildfly-security-manager</artifactId>
+ <version>${wildfly.security-manager.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-controller-client</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-security</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-server</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-ee</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-ejb3</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-web-common</artifactId>
+ <version>${wildfly.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ <version>${marshalling.river.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ <version>${remote.naming.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>${javax.mail.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ <version>${ejb.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>${ejb3.ext.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${jboss.common.core.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jbossxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.wutka</groupId>
+ <artifactId>dtdparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.remotingjmx</groupId>
+ <artifactId>remoting-jmx</artifactId>
+ <version>${remoting.jmx.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>${remoting.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-server</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-server</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-api</artifactId>
+ <version>${jbossws.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <version>${jboss.jaxws.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ <version>${xnio.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ <version>${xnio.version}</version>
+ </dependency>
+
+<!-- <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>-->
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
+ projects that depend on this project.-->
+ <scope>provided</scope>
+ <optional>true</optional>
+ <version>${jboss.logging.tools.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
+ projects that depend on this project.-->
+ <scope>provided</scope>
+ <optional>true</optional>
+ <version>${jboss.logging.tools.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-subsystem-test</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ <version>${wildfly.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Deleted: container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml
===================================================================
--- container/wildfly80/tags/jbossws-wildfly800-4.3.0.Final/server-integration/pom.xml 2014-03-14 08:39:56 UTC (rev 18513)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml 2014-10-16 15:25:55 UTC (rev 18996)
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-wildfly800-parent</artifactId>
- <version>4.3.0.CR2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <name>JBossWS JBoss WildFly 8.0.0.Final Server Side Integration</name>
- <description>JBossWS WildFly 8.0.0.Final Server Side Integration</description>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-wildfly800-server-integration</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.msc</groupId>
- <artifactId>jboss-msc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly.security</groupId>
- <artifactId>wildfly-security-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-ee</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-ejb3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-web-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-subsystem-test</artifactId>
- <type>pom</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <fork>true</fork>
- <source>1.7</source>
- <target>1.7</target>
- <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml (from rev 18515, container/wildfly80/tags/jbossws-wildfly800-4.3.0.Final/server-integration/pom.xml)
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml (rev 0)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/server-integration/pom.xml 2014-10-16 15:25:55 UTC (rev 18996)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly800-parent</artifactId>
+ <version>4.3.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>JBossWS JBoss WildFly 8.0.0.Final Server Side Integration</name>
+ <description>JBossWS WildFly 8.0.0.Final Server Side Integration</description>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly800-server-integration</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.msc</groupId>
+ <artifactId>jboss-msc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.security</groupId>
+ <artifactId>wildfly-security-manager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-ee</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-ejb3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-web-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-subsystem-test</artifactId>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <fork>true</fork>
+ <source>1.7</source>
+ <target>1.7</target>
+ <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml
===================================================================
--- container/wildfly80/tags/jbossws-wildfly800-4.3.0.Final/tests-integration/pom.xml 2014-03-14 08:39:56 UTC (rev 18513)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml 2014-10-16 15:25:55 UTC (rev 18996)
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-wildfly800-parent</artifactId>
- <version>4.3.0.CR2</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <name>JBossWS JBoss WildFly 8.0.0.Final Tests Side Integration</name>
- <description>JBossWS WildFly 8.0.0.Final Tests Side Integration</description>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-wildfly800-tests-integration</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-controller-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-security</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>jboss-marshalling-river</artifactId>
- </dependency>
- <!-- dependencies for running tests -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-remote-naming</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-ejb-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.remoting3</groupId>
- <artifactId>jboss-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.remotingjmx</groupId>
- <artifactId>remoting-jmx</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-core-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.xnio</groupId>
- <artifactId>xnio-nio</artifactId>
- </dependency>
- </dependencies>
-
-</project>
Copied: container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml (from rev 18515, container/wildfly80/tags/jbossws-wildfly800-4.3.0.Final/tests-integration/pom.xml)
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml (rev 0)
+++ container/wildfly80/branches/jbossws-wildfly800-4.3.x/tests-integration/pom.xml 2014-10-16 15:25:55 UTC (rev 18996)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly800-parent</artifactId>
+ <version>4.3.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>JBossWS JBoss WildFly 8.0.0.Final Tests Side Integration</name>
+ <description>JBossWS WildFly 8.0.0.Final Tests Side Integration</description>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-wildfly800-tests-integration</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-controller-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-security</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>jboss-marshalling-river</artifactId>
+ </dependency>
+ <!-- dependencies for running tests -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remotingjmx</groupId>
+ <artifactId>remoting-jmx</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-nio</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
9 years, 6 months
JBossWS SVN: r18995 - container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 11:21:10 -0400 (Thu, 16 Oct 2014)
New Revision: 18995
Modified:
container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
Log:
[JBWS-3842] Fix regression
Modified: container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 14:16:39 UTC (rev 18994)
+++ container/jboss72/branches/jbossws-jboss720-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 15:21:10 UTC (rev 18995)
@@ -38,7 +38,6 @@
import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.as.webservices.service.HandlerChainService;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -86,9 +85,8 @@
final HandlerChainService service = new HandlerChainService(handlerChainType, handlerChainId, protocolBindings);
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> handlerChainServiceBuilder = target.addService(handlerChainServiceName, service);
- final Injector<UnifiedHandlerMetaData> injector = service.getHandlersInjector();
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, handlerChainServiceName, address, HANDLER)) {
- handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, injector);
+ handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, service.getHandlersInjector()); //get a new injector instance each time
}
ServiceController<?> controller = handlerChainServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
9 years, 6 months
JBossWS SVN: r18994 - container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 10:16:39 -0400 (Thu, 16 Oct 2014)
New Revision: 18994
Modified:
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
Log:
[JBWS-3842] Fix regression
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 14:14:50 UTC (rev 18993)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 14:16:39 UTC (rev 18994)
@@ -38,7 +38,6 @@
import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.as.webservices.service.HandlerChainService;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -86,9 +85,8 @@
final HandlerChainService service = new HandlerChainService(handlerChainType, handlerChainId, protocolBindings);
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> handlerChainServiceBuilder = target.addService(handlerChainServiceName, service);
- final Injector<UnifiedHandlerMetaData> injector = service.getHandlersInjector();
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, handlerChainServiceName, address, HANDLER)) {
- handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, injector);
+ handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, service.getHandlersInjector()); //get a new injector instance each time
}
ServiceController<?> controller = handlerChainServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
9 years, 6 months
JBossWS SVN: r18993 - container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 10:14:50 -0400 (Thu, 16 Oct 2014)
New Revision: 18993
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
Log:
[JBWS-3842] Fix regression
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 13:25:22 UTC (rev 18992)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-10-16 14:14:50 UTC (rev 18993)
@@ -38,7 +38,6 @@
import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.as.webservices.service.HandlerChainService;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -86,9 +85,8 @@
final HandlerChainService service = new HandlerChainService(handlerChainType, handlerChainId, protocolBindings);
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> handlerChainServiceBuilder = target.addService(handlerChainServiceName, service);
- final Injector<UnifiedHandlerMetaData> injector = service.getHandlersInjector();
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, handlerChainServiceName, address, HANDLER)) {
- handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, injector);
+ handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, service.getHandlersInjector()); //get a new injector instance each time
}
ServiceController<?> controller = handlerChainServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
9 years, 6 months