JBossWS SVN: r15620 - stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-09 08:45:30 -0500 (Thu, 09 Feb 2012)
New Revision: 15620
Modified:
stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
Log:
svn merge -r 15618:15619 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Modified: stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
===================================================================
--- stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-02-09 13:40:14 UTC (rev 15619)
+++ stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-02-09 13:45:30 UTC (rev 15620)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -21,12 +21,22 @@
*/
package org.jboss.wsf.stack.cxf.security.authentication;
+import java.security.Principal;
+import java.security.acl.Group;
+
import javax.security.auth.Subject;
+import org.apache.cxf.common.security.SecurityToken;
+import org.apache.cxf.common.security.TokenType;
import org.apache.cxf.common.security.UsernameToken;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.security.AbstractUsernameTokenInInterceptor;
+import org.apache.cxf.interceptor.security.DefaultSecurityContext;
import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.security.SecurityContext;
+import org.apache.ws.security.WSUsernameTokenPrincipal;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.security.SecurityDomainContext;
import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
@@ -38,42 +48,100 @@
* @author alessio.soldano(a)jboss.com
* @since 26-May-2011
*/
-public class SubjectCreatingPolicyInterceptor extends AbstractUsernameTokenInInterceptor
+public class SubjectCreatingPolicyInterceptor extends AbstractPhaseInterceptor<Message>
{
- private ThreadLocal<SecurityDomainContext> sdc = new ThreadLocal<SecurityDomainContext>();
-
+ private static Logger LOG = Logger.getLogger(SubjectCreatingPolicyInterceptor.class);
+
private SubjectCreator helper = new SubjectCreator();
-
+
public SubjectCreatingPolicyInterceptor()
{
- super();
+ super(Phase.PRE_INVOKE);
helper.setPropagateContext(true);
}
@Override
- public void handleMessage(Message msg) throws Fault {
- Endpoint ep = msg.getExchange().get(Endpoint.class);
- sdc.set(ep.getSecurityDomainContext());
- try
+ public void handleMessage(Message message) throws Fault
+ {
+ Endpoint ep = message.getExchange().get(Endpoint.class);
+ SecurityDomainContext sdc = ep.getSecurityDomainContext();
+ SecurityContext context = message.get(SecurityContext.class);
+ if (context == null || context.getUserPrincipal() == null)
{
- super.handleMessage(msg);
+ reportSecurityException("User Principal is not available on the current message");
}
- finally
+
+ SecurityToken token = message.get(SecurityToken.class);
+ Subject subject = null;
+ if (token != null)
{
- if (sdc != null)
+ //Try authenticating using SecurityToken info
+ if (token.getTokenType() != TokenType.UsernameToken)
{
- sdc.remove();
+ reportSecurityException("Unsupported token type " + token.getTokenType().toString());
}
+ UsernameToken ut = (UsernameToken) token;
+ subject = createSubject(sdc, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime());
+
}
+ else
+ {
+ //Try authenticating using WSS4J internal info (previously set into SecurityContext by WSS4JInInterceptor)
+ Principal p = context.getUserPrincipal();
+ if (!(p instanceof WSUsernameTokenPrincipal)) {
+ reportSecurityException("Could not get subject info neither from Security Token in the current message nor directly from computed SecurityContext");
+ }
+ WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p;
+ subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime());
+ }
+
+ Principal principal = getPrincipal(context.getUserPrincipal(), subject);
+ message.put(SecurityContext.class, createSecurityContext(principal, subject));
}
- @Override
- protected Subject createSubject(UsernameToken token)
+ private Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime)
{
- return helper.createSubject(sdc.get(), token.getName(), token.getPassword(), token.isHashed(), token.getNonce(),
- token.getCreatedTime());
+ Subject subject = null;
+ try
+ {
+ subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime);
+ }
+ catch (Exception ex)
+ {
+ reportSecurityException("Failed Authentication : Subject has not been created, " + ex.getMessage());
+ }
+ if (subject == null || subject.getPrincipals().size() == 0)
+ {
+ reportSecurityException("Failed Authentication : Invalid Subject");
+ }
+ return subject;
}
+ protected Principal getPrincipal(Principal originalPrincipal, Subject subject)
+ {
+ Principal[] ps = subject.getPrincipals().toArray(new Principal[]
+ {});
+ if (ps != null && ps.length > 0 && !(ps[0] instanceof Group))
+ {
+ return ps[0];
+ }
+ else
+ {
+ return originalPrincipal;
+ }
+ }
+
+ protected SecurityContext createSecurityContext(Principal p, Subject subject)
+ {
+ return new DefaultSecurityContext(p, subject);
+ }
+
+ protected void reportSecurityException(String errorMessage)
+ {
+ LOG.error(errorMessage); //TODO i18n
+ throw new SecurityException(errorMessage);
+ }
+
public void setPropagateContext(boolean propagateContext)
{
this.helper.setPropagateContext(propagateContext);
12 years, 7 months
JBossWS SVN: r15619 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-09 08:40:14 -0500 (Thu, 09 Feb 2012)
New Revision: 15619
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
Log:
[JBWS-3430] Refactor SubjectCreatingPolicyInterceptor for performing authentication of subjects coming from CXF SecurityContext principals too
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-02-09 04:59:01 UTC (rev 15618)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-02-09 13:40:14 UTC (rev 15619)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -21,12 +21,22 @@
*/
package org.jboss.wsf.stack.cxf.security.authentication;
+import java.security.Principal;
+import java.security.acl.Group;
+
import javax.security.auth.Subject;
+import org.apache.cxf.common.security.SecurityToken;
+import org.apache.cxf.common.security.TokenType;
import org.apache.cxf.common.security.UsernameToken;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.security.AbstractUsernameTokenInInterceptor;
+import org.apache.cxf.interceptor.security.DefaultSecurityContext;
import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.security.SecurityContext;
+import org.apache.ws.security.WSUsernameTokenPrincipal;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.security.SecurityDomainContext;
import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
@@ -38,42 +48,100 @@
* @author alessio.soldano(a)jboss.com
* @since 26-May-2011
*/
-public class SubjectCreatingPolicyInterceptor extends AbstractUsernameTokenInInterceptor
+public class SubjectCreatingPolicyInterceptor extends AbstractPhaseInterceptor<Message>
{
- private ThreadLocal<SecurityDomainContext> sdc = new ThreadLocal<SecurityDomainContext>();
-
+ private static Logger LOG = Logger.getLogger(SubjectCreatingPolicyInterceptor.class);
+
private SubjectCreator helper = new SubjectCreator();
-
+
public SubjectCreatingPolicyInterceptor()
{
- super();
+ super(Phase.PRE_INVOKE);
helper.setPropagateContext(true);
}
@Override
- public void handleMessage(Message msg) throws Fault {
- Endpoint ep = msg.getExchange().get(Endpoint.class);
- sdc.set(ep.getSecurityDomainContext());
- try
+ public void handleMessage(Message message) throws Fault
+ {
+ Endpoint ep = message.getExchange().get(Endpoint.class);
+ SecurityDomainContext sdc = ep.getSecurityDomainContext();
+ SecurityContext context = message.get(SecurityContext.class);
+ if (context == null || context.getUserPrincipal() == null)
{
- super.handleMessage(msg);
+ reportSecurityException("User Principal is not available on the current message");
}
- finally
+
+ SecurityToken token = message.get(SecurityToken.class);
+ Subject subject = null;
+ if (token != null)
{
- if (sdc != null)
+ //Try authenticating using SecurityToken info
+ if (token.getTokenType() != TokenType.UsernameToken)
{
- sdc.remove();
+ reportSecurityException("Unsupported token type " + token.getTokenType().toString());
}
+ UsernameToken ut = (UsernameToken) token;
+ subject = createSubject(sdc, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime());
+
}
+ else
+ {
+ //Try authenticating using WSS4J internal info (previously set into SecurityContext by WSS4JInInterceptor)
+ Principal p = context.getUserPrincipal();
+ if (!(p instanceof WSUsernameTokenPrincipal)) {
+ reportSecurityException("Could not get subject info neither from Security Token in the current message nor directly from computed SecurityContext");
+ }
+ WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p;
+ subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime());
+ }
+
+ Principal principal = getPrincipal(context.getUserPrincipal(), subject);
+ message.put(SecurityContext.class, createSecurityContext(principal, subject));
}
- @Override
- protected Subject createSubject(UsernameToken token)
+ private Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime)
{
- return helper.createSubject(sdc.get(), token.getName(), token.getPassword(), token.isHashed(), token.getNonce(),
- token.getCreatedTime());
+ Subject subject = null;
+ try
+ {
+ subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime);
+ }
+ catch (Exception ex)
+ {
+ reportSecurityException("Failed Authentication : Subject has not been created, " + ex.getMessage());
+ }
+ if (subject == null || subject.getPrincipals().size() == 0)
+ {
+ reportSecurityException("Failed Authentication : Invalid Subject");
+ }
+ return subject;
}
+ protected Principal getPrincipal(Principal originalPrincipal, Subject subject)
+ {
+ Principal[] ps = subject.getPrincipals().toArray(new Principal[]
+ {});
+ if (ps != null && ps.length > 0 && !(ps[0] instanceof Group))
+ {
+ return ps[0];
+ }
+ else
+ {
+ return originalPrincipal;
+ }
+ }
+
+ protected SecurityContext createSecurityContext(Principal p, Subject subject)
+ {
+ return new DefaultSecurityContext(p, subject);
+ }
+
+ protected void reportSecurityException(String errorMessage)
+ {
+ LOG.error(errorMessage); //TODO i18n
+ throw new SecurityException(errorMessage);
+ }
+
public void setPropagateContext(boolean propagateContext)
{
this.helper.setPropagateContext(propagateContext);
12 years, 7 months
JBossWS SVN: r15618 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-02-08 23:59:01 -0500 (Wed, 08 Feb 2012)
New Revision: 15618
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
Log:
[JBWS-3297]:javax.xml.ws.service getport not generate correct wsdl url
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-02-08 15:27:07 UTC (rev 15617)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-02-09 04:59:01 UTC (rev 15618)
@@ -115,6 +115,10 @@
protected boolean isRewriteRequired(String address, String previousAddress)
{
+ //JBWS-3297:rewrite is only needed when previousAddress(from wsdl) is different with the published wsdl
+ if (address.equals(previousAddress)) {
+ return false;
+ }
//check config prop forcing address rewrite
if (serverConfig.isModifySOAPAddress())
{
12 years, 7 months
JBossWS SVN: r15617 - in stack/cxf/branches/wstrust: modules/dist/src/main/scripts and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-08 10:27:07 -0500 (Wed, 08 Feb 2012)
New Revision: 15617
Modified:
stack/cxf/branches/wstrust/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/wstrust/modules/server/pom.xml
stack/cxf/branches/wstrust/pom.xml
Log:
Adding sts-core module
Modified: stack/cxf/branches/wstrust/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/wstrust/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-08 09:25:31 UTC (rev 15616)
+++ stack/cxf/branches/wstrust/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-08 15:27:07 UTC (rev 15617)
@@ -34,6 +34,7 @@
<include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
<include>org.jboss.com.sun.httpserver:httpserver:jar</include>
<include>org.apache.cxf:cxf-*</include>
+ <include>org.apache.cxf.services.sts:cxf-services-sts-core:jar</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
Modified: stack/cxf/branches/wstrust/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/wstrust/modules/server/pom.xml 2012-02-08 09:25:31 UTC (rev 15616)
+++ stack/cxf/branches/wstrust/modules/server/pom.xml 2012-02-08 15:27:07 UTC (rev 15617)
@@ -110,6 +110,10 @@
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf.services.sts</groupId>
+ <artifactId>cxf-services-sts-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
</dependency>
Modified: stack/cxf/branches/wstrust/pom.xml
===================================================================
--- stack/cxf/branches/wstrust/pom.xml 2012-02-08 09:25:31 UTC (rev 15616)
+++ stack/cxf/branches/wstrust/pom.xml 2012-02-08 15:27:07 UTC (rev 15617)
@@ -660,6 +660,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.cxf.services.sts</groupId>
+ <artifactId>cxf-services-sts-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
<version>${cxf.version}</version>
12 years, 7 months
JBossWS SVN: r15616 - in stack/cxf/branches/wstrust: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-08 04:25:31 -0500 (Wed, 08 Feb 2012)
New Revision: 15616
Modified:
stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/branches/wstrust/pom.xml
Log:
Moving to cxf 2.5.2
Modified: stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2012-02-08 09:24:15 UTC (rev 15615)
+++ stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2012-02-08 09:25:31 UTC (rev 15616)
@@ -38,6 +38,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.frontend.WSDLGetInterceptor;
+import org.apache.cxf.frontend.WSDLGetUtils;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
@@ -200,7 +201,7 @@
String ctxUri = req.getRequestURI();
String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString();
EndpointInfo endpointInfo = dest.getEndpointInfo();
- endpointInfo.setProperty(WSDLGetInterceptor.AUTO_REWRITE_ADDRESS,
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS,
ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers())
Modified: stack/cxf/branches/wstrust/pom.xml
===================================================================
--- stack/cxf/branches/wstrust/pom.xml 2012-02-08 09:24:15 UTC (rev 15615)
+++ stack/cxf/branches/wstrust/pom.xml 2012-02-08 09:25:31 UTC (rev 15616)
@@ -72,7 +72,7 @@
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.4.6</cxf.version>
+ <cxf.version>2.5.2</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
12 years, 7 months
JBossWS SVN: r15615 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-08 04:24:15 -0500 (Wed, 08 Feb 2012)
New Revision: 15615
Added:
stack/cxf/branches/wstrust/
Log:
Branching for trying integration of a full ws-trust demo
12 years, 7 months
JBossWS SVN: r15614 - in stack/cxf/trunk/modules: addons/transports/http/httpserver and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-07 11:40:14 -0500 (Tue, 07 Feb 2012)
New Revision: 15614
Modified:
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
Log:
Preparing for next dev cycle
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/addons/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/client/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/dist/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -4,12 +4,12 @@
<name>JBoss Web Services - Stack CXF Distrubiton</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/resources/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/server/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-07 16:40:14 UTC (rev 15614)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
12 years, 7 months
JBossWS SVN: r15613 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-07 10:44:55 -0500 (Tue, 07 Feb 2012)
New Revision: 15613
Modified:
stack/cxf/trunk/pom.xml
Log:
Preparing for next dev cycle
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-02-06 17:20:18 UTC (rev 15612)
+++ stack/cxf/trunk/pom.xml 2012-02-07 15:44:55 UTC (rev 15613)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -61,12 +61,12 @@
<properties>
<jbossws.api.version>1.0.1-SNAPSHOT</jbossws.api.version>
<jbossws.spi.version>2.0.3-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.0.1-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss700.version>4.0.1-SNAPSHOT</jbossws.jboss700.version>
- <jbossws.jboss701.version>4.0.1-SNAPSHOT</jbossws.jboss701.version>
- <jbossws.jboss702.version>4.0.1-SNAPSHOT</jbossws.jboss702.version>
+ <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
+ <jbossws.jboss700.version>4.0.1.GA</jbossws.jboss700.version>
+ <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
+ <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
<jboss700.version>7.0.0.Final</jboss700.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
12 years, 7 months
JBossWS SVN: r15612 - stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-02-06 12:20:18 -0500 (Mon, 06 Feb 2012)
New Revision: 15612
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
Log:
[CXF-1310] Removing FIXME for won't fix jira
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2012-02-06 15:37:52 UTC (rev 15611)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2012-02-06 17:20:18 UTC (rev 15612)
@@ -54,8 +54,6 @@
URL wsdlURL = new URL(endpointURL + "?wsdl");
Element wsdl = DOMUtils.parse(wsdlURL.openStream());
assertNotNull(wsdl);
-
- System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies");
}
public void testClient() throws Exception
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2012-02-06 15:37:52 UTC (rev 15611)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2012-02-06 17:20:18 UTC (rev 15612)
@@ -54,8 +54,6 @@
URL wsdlURL = new URL(endpointURL + "?wsdl");
Element wsdl = DOMUtils.parse(wsdlURL.openStream());
assertNotNull(wsdl);
-
- System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies");
}
public void testClient() throws Exception
12 years, 7 months
JBossWS SVN: r15611 - in common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026: src/main/java/org/jboss/ws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2012-02-06 10:37:52 -0500 (Mon, 06 Feb 2012)
New Revision: 15611
Modified:
common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/.classpath
common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/ws/Constants.java
common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/wsf/common/DOMWriter.java
Log:
[JBPAPP-8026] One-off patch: DOMWriter shouldn't flush the output stream after every element
Modified: common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/.classpath
===================================================================
--- common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/.classpath 2012-02-06 15:33:26 UTC (rev 15610)
+++ common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/.classpath 2012-02-06 15:37:52 UTC (rev 15611)
@@ -4,5 +4,7 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 5.1 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/ws/Constants.java 2012-02-06 15:33:26 UTC (rev 15610)
+++ common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/ws/Constants.java 2012-02-06 15:37:52 UTC (rev 15611)
@@ -304,4 +304,6 @@
static final String DOM_CONTENT_CANONICAL_NORMALIZATION = "org.jboss.ws.DOMContentCanonicalNormalization";
static final String ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY = "org.jboss.ws.alwaysResolveDocumentBuilderFactory";
+
+ static final String FLUSH_ONLY_ONCE = "org.jboss.ws.domwriter.FlushOnlyOnce";
}
Modified: common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/wsf/common/DOMWriter.java
===================================================================
--- common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/wsf/common/DOMWriter.java 2012-02-06 15:33:26 UTC (rev 15610)
+++ common/branches/jbossws-common-1.1.0.SP6_JBPAPP-8026/src/main/java/org/jboss/wsf/common/DOMWriter.java 2012-02-06 15:37:52 UTC (rev 15611)
@@ -71,6 +71,8 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.jboss.ws.Constants;
+
/**
* Traverse a DOM tree in order to print a document that is parsed.
*
@@ -102,7 +104,15 @@
private boolean completeNamespaces = true;
// The current default namespace
private String currentDefaultNamespace;
+ // How often should we flush the output stream?
+ private static final boolean flushOnlyOnce;
+ static
+ {
+ flushOnlyOnce = System.getProperty(Constants.FLUSH_ONLY_ONCE, "false")
+ .equals("true");
+ }
+
public DOMWriter(Writer w)
{
this.out = new PrintWriter(w);
@@ -231,6 +241,8 @@
rootNode = node;
printInternal(node, false);
+ if(flushOnlyOnce)
+ out.flush();
}
private void printInternal(Node node, boolean indentEndMarker)
@@ -510,7 +522,9 @@
out.print('\n');
}
}
- out.flush();
+
+ if(!flushOnlyOnce)
+ out.flush();
}
private String getNamespaceURI(String prefix, Element element, Node stopNode)
12 years, 7 months