[jbossws-commits] JBossWS SVN: r19497 - in stack/cxf/trunk: modules/client and 9 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Feb 23 16:23:55 EST 2015
Author: asoldano
Date: 2015-02-23 16:23:55 -0500 (Mon, 23 Feb 2015)
New Revision: 19497
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/common/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
stack/cxf/trunk/pom.xml
Log:
[JBWS-3871] Remove dependency on org.jboss:jboss-common-core
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/client/pom.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -247,10 +247,6 @@
<!-- jboss provided -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/main/module.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/main/module.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -56,7 +56,6 @@
<module name="org.jboss.msc"/>
<module name="org.jboss.vfs"/>
<module name="org.jboss.logging"/>
- <module name="org.jboss.common-core" />
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.common" services="import" />
<module name="org.jboss.ws.spi" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/common/main/module.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/common/main/module.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -44,7 +44,6 @@
<module name="org.jboss.ws.api"/>
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.logging"/>
- <module name="org.jboss.common-core"/>
<module name="org.apache.xerces" services="import"/>
<module name="org.jboss.jaxbintros"/>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -65,7 +65,6 @@
<include path="META-INF"/>
</imports>
</module>
- <module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
<module name="org.picketbox" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -64,7 +64,6 @@
<module name="org.jboss.msc"/>
<module name="org.jboss.vfs"/>
<module name="org.jboss.logging"/>
- <module name="org.jboss.common-core" />
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.common" services="import" />
<module name="org.jboss.ws.spi" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -44,7 +44,6 @@
<module name="org.jboss.ws.api"/>
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.logging"/>
- <module name="org.jboss.common-core"/>
<module name="org.apache.xerces" services="import"/>
<module name="org.jboss.jaxbintros"/>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -65,7 +65,6 @@
<include path="META-INF"/>
</imports>
</module>
- <module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
<module name="org.picketbox" />
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/server/pom.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -199,10 +199,6 @@
<!-- jboss provided -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2015-02-23 21:23:55 UTC (rev 19497)
@@ -47,7 +47,6 @@
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http.HTTPTransportFactory;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -133,12 +132,12 @@
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
{
- throw new NotImplementedException();
+ throw new RuntimeException();
}
public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
{
- throw new NotImplementedException();
+ throw new RuntimeException();
}
/**
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2015-02-23 21:23:55 UTC (rev 19497)
@@ -29,6 +29,7 @@
import org.jboss.crypto.digest.DigestCallback;
import org.jboss.security.auth.callback.MapCallback;
+import org.jboss.ws.common.utils.Base64;
/**
* An implementation of DigestCallback that generates password
@@ -65,7 +66,7 @@
if (nonce != null)
{
Boolean decodeNonce = (Boolean) info.getInfo(DECODE_NONCE);
- byte[] nonceBytes = decodeNonce ? org.jboss.util.Base64.decode(nonce) : nonce.getBytes("UTF-8");
+ byte[] nonceBytes = decodeNonce ? Base64.decode(nonce) : nonce.getBytes("UTF-8");
digest.update(nonceBytes);
}
String created = (String) info.getInfo(CREATED);
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2015-02-23 21:12:51 UTC (rev 19496)
+++ stack/cxf/trunk/pom.xml 2015-02-23 21:23:55 UTC (rev 19497)
@@ -63,11 +63,11 @@
<properties>
<jbossws.api.version>1.0.3.CR2</jbossws.api.version>
<jbossws.spi.version>3.0.0.Beta4</jbossws.spi.version>
- <jbossws.common.version>3.0.0.Beta2</jbossws.common.version>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.1.CR1</jbossws.common.tools.version>
- <jbossws.wildfly800.version>5.0.0.Beta3</jbossws.wildfly800.version>
- <jbossws.wildfly810.version>5.0.0.Beta3</jbossws.wildfly810.version>
- <jbossws.wildfly820.version>5.0.0.Beta1</jbossws.wildfly820.version>
+ <jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version>
+ <jbossws.wildfly810.version>5.0.0-SNAPSHOT</jbossws.wildfly810.version>
+ <jbossws.wildfly820.version>5.0.0-SNAPSHOT</jbossws.wildfly820.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
<wildfly810.version>8.1.0.Final</wildfly810.version>
<wildfly820.version>8.2.0.Final</wildfly820.version>
@@ -76,7 +76,6 @@
<cxf.version>3.0.4</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>3.0.2</cxf.xjcplugins.version>
- <jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
<jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>
<jboss.jandex.version>1.0.3.Final</jboss.jandex.version>
@@ -1135,18 +1134,6 @@
<!-- jboss provided -->
<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>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
<version>${picketbox.version}</version>
More information about the jbossws-commits
mailing list