JBossWS SVN: r19012 - in container/wildfly81/branches/jbossws-wildfly810-4.3.x: server-integration/src/main/java/org/jboss/as/webservices/dmr and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-17 09:44:18 -0400 (Fri, 17 Oct 2014)
New Revision: 19012
Modified:
container/wildfly81/branches/jbossws-wildfly810-4.3.x/
container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java
container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java
Log:
[JBWS-3838] Sort UnifiedHandlerMetaData instances before adding to the chain
Property changes on: container/wildfly81/branches/jbossws-wildfly810-4.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /container/wildfly81/branches/jbossws-wildfly810:18650-18651,18859
+ /container/wildfly81/branches/jbossws-wildfly810:18650-18651,18859,19010
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-10-17 13:40:59 UTC (rev 19011)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/pom.xml 2014-10-17 13:44:18 UTC (rev 19012)
@@ -51,7 +51,7 @@
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
+ <jbossws.spi.version>2.3.1-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.3.1.Final</jbossws.common.version>
<jboss.msc.version>1.2.2.Final</jboss.msc.version>
<wildfly.version>8.1.0.Final</wildfly.version>
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-10-17 13:40:59 UTC (rev 19011)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-10-17 13:44:18 UTC (rev 19012)
@@ -29,6 +29,7 @@
import static org.jboss.as.webservices.dmr.PackageUtils.getHandlerServiceName;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.as.controller.AbstractAddStepHandler;
import org.jboss.as.controller.OperationContext;
@@ -51,6 +52,7 @@
final class HandlerAdd extends AbstractAddStepHandler {
static final HandlerAdd INSTANCE = new HandlerAdd();
+ static final AtomicInteger counter = new AtomicInteger(0);
private HandlerAdd() {
// forbidden instantiation
@@ -77,7 +79,7 @@
final String handlerName = address.getElement(address.size() - 1).getValue();
final String handlerClass = operation.require(CLASS).asString();
- final HandlerService service = new HandlerService(handlerName, handlerClass);
+ final HandlerService service = new HandlerService(handlerName, handlerClass, counter.incrementAndGet());
final ServiceTarget target = context.getServiceTarget();
final ServiceName configServiceName = getConfigServiceName(configType, configName);
final ServiceRegistry registry = context.getServiceRegistry(false);
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-10-17 13:40:59 UTC (rev 19011)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-10-17 13:44:18 UTC (rev 19012)
@@ -24,6 +24,8 @@
import static org.jboss.as.webservices.WSMessages.MESSAGES;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.jboss.as.webservices.dmr.ListInjector;
@@ -63,6 +65,15 @@
@Override
public void start(final StartContext context) throws StartException {
+ Comparator<UnifiedHandlerMetaData> c = new Comparator<UnifiedHandlerMetaData>() {
+ @Override
+ public int compare(UnifiedHandlerMetaData o1, UnifiedHandlerMetaData o2) {
+ return o1.getId().compareTo(o2.getId());
+ }
+ };
+ synchronized (handlers) {
+ Collections.sort(handlers, c);
+ }
handlerChain = new UnifiedHandlerChainMetaData(null, null, protocolBindings, handlers, false, handlerChainId);
}
Modified: container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-10-17 13:40:59 UTC (rev 19011)
+++ container/wildfly81/branches/jbossws-wildfly810-4.3.x/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-10-17 13:44:18 UTC (rev 19012)
@@ -36,11 +36,13 @@
private final String handlerName;
private final String handlerClass;
+ private final int counter;
private volatile UnifiedHandlerMetaData handler;
- public HandlerService(String handlerName, String handlerClass) {
+ public HandlerService(String handlerName, String handlerClass, int counter) {
this.handlerName = handlerName;
this.handlerClass = handlerClass;
+ this.counter = counter;
}
@Override
@@ -50,7 +52,7 @@
@Override
public void start(final StartContext context) throws StartException {
- handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null);
+ handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null, String.valueOf(counter));
}
@Override
9 years, 6 months
JBossWS SVN: r19011 - in container/wildfly80/branches/jbossws-wildfly800: server-integration/src/main/java/org/jboss/as/webservices/dmr and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-17 09:40:59 -0400 (Fri, 17 Oct 2014)
New Revision: 19011
Modified:
container/wildfly80/branches/jbossws-wildfly800/
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java
container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java
Log:
[JBWS-3838] Sort UnifiedHandlerMetaData instances before adding to the chain
Property changes on: container/wildfly80/branches/jbossws-wildfly800
___________________________________________________________________
Added: svn:mergeinfo
+ /container/wildfly81/branches/jbossws-wildfly810:19010
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-10-17 13:35:36 UTC (rev 19010)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-10-17 13:40:59 UTC (rev 19011)
@@ -29,6 +29,7 @@
import static org.jboss.as.webservices.dmr.PackageUtils.getHandlerServiceName;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.as.controller.AbstractAddStepHandler;
import org.jboss.as.controller.OperationContext;
@@ -51,6 +52,7 @@
final class HandlerAdd extends AbstractAddStepHandler {
static final HandlerAdd INSTANCE = new HandlerAdd();
+ static final AtomicInteger counter = new AtomicInteger(0);
private HandlerAdd() {
// forbidden instantiation
@@ -77,7 +79,7 @@
final String handlerName = address.getElement(address.size() - 1).getValue();
final String handlerClass = operation.require(CLASS).asString();
- final HandlerService service = new HandlerService(handlerName, handlerClass);
+ final HandlerService service = new HandlerService(handlerName, handlerClass, counter.incrementAndGet());
final ServiceTarget target = context.getServiceTarget();
final ServiceName configServiceName = getConfigServiceName(configType, configName);
final ServiceRegistry registry = context.getServiceRegistry(false);
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-10-17 13:35:36 UTC (rev 19010)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-10-17 13:40:59 UTC (rev 19011)
@@ -24,6 +24,8 @@
import static org.jboss.as.webservices.WSMessages.MESSAGES;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.jboss.as.webservices.dmr.ListInjector;
@@ -63,6 +65,15 @@
@Override
public void start(final StartContext context) throws StartException {
+ Comparator<UnifiedHandlerMetaData> c = new Comparator<UnifiedHandlerMetaData>() {
+ @Override
+ public int compare(UnifiedHandlerMetaData o1, UnifiedHandlerMetaData o2) {
+ return o1.getId().compareTo(o2.getId());
+ }
+ };
+ synchronized (handlers) {
+ Collections.sort(handlers, c);
+ }
handlerChain = new UnifiedHandlerChainMetaData(null, null, protocolBindings, handlers, false, handlerChainId);
}
Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java
===================================================================
--- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-10-17 13:35:36 UTC (rev 19010)
+++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-10-17 13:40:59 UTC (rev 19011)
@@ -36,11 +36,13 @@
private final String handlerName;
private final String handlerClass;
+ private final int counter;
private volatile UnifiedHandlerMetaData handler;
- public HandlerService(String handlerName, String handlerClass) {
+ public HandlerService(String handlerName, String handlerClass, int counter) {
this.handlerName = handlerName;
this.handlerClass = handlerClass;
+ this.counter = counter;
}
@Override
@@ -50,7 +52,7 @@
@Override
public void start(final StartContext context) throws StartException {
- handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null);
+ handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null, String.valueOf(counter));
}
@Override
9 years, 6 months
JBossWS SVN: r19010 - in container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices: service and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-17 09:35:36 -0400 (Fri, 17 Oct 2014)
New Revision: 19010
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java
Log:
[JBWS-3838] Sort UnifiedHandlerMetaData instances before adding to the chain
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-10-17 13:11:58 UTC (rev 19009)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-10-17 13:35:36 UTC (rev 19010)
@@ -29,6 +29,7 @@
import static org.jboss.as.webservices.dmr.PackageUtils.getHandlerServiceName;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.as.controller.AbstractAddStepHandler;
import org.jboss.as.controller.OperationContext;
@@ -51,6 +52,7 @@
final class HandlerAdd extends AbstractAddStepHandler {
static final HandlerAdd INSTANCE = new HandlerAdd();
+ static final AtomicInteger counter = new AtomicInteger(0);
private HandlerAdd() {
// forbidden instantiation
@@ -77,7 +79,7 @@
final String handlerName = address.getElement(address.size() - 1).getValue();
final String handlerClass = operation.require(CLASS).asString();
- final HandlerService service = new HandlerService(handlerName, handlerClass);
+ final HandlerService service = new HandlerService(handlerName, handlerClass, counter.incrementAndGet());
final ServiceTarget target = context.getServiceTarget();
final ServiceName configServiceName = getConfigServiceName(configType, configName);
final ServiceRegistry registry = context.getServiceRegistry(false);
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-10-17 13:11:58 UTC (rev 19009)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-10-17 13:35:36 UTC (rev 19010)
@@ -24,6 +24,8 @@
import static org.jboss.as.webservices.WSMessages.MESSAGES;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.jboss.as.webservices.dmr.ListInjector;
@@ -63,6 +65,15 @@
@Override
public void start(final StartContext context) throws StartException {
+ Comparator<UnifiedHandlerMetaData> c = new Comparator<UnifiedHandlerMetaData>() {
+ @Override
+ public int compare(UnifiedHandlerMetaData o1, UnifiedHandlerMetaData o2) {
+ return o1.getId().compareTo(o2.getId());
+ }
+ };
+ synchronized (handlers) {
+ Collections.sort(handlers, c);
+ }
handlerChain = new UnifiedHandlerChainMetaData(null, null, protocolBindings, handlers, false, handlerChainId);
}
Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java
===================================================================
--- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-10-17 13:11:58 UTC (rev 19009)
+++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-10-17 13:35:36 UTC (rev 19010)
@@ -36,11 +36,13 @@
private final String handlerName;
private final String handlerClass;
+ private final int counter;
private volatile UnifiedHandlerMetaData handler;
- public HandlerService(String handlerName, String handlerClass) {
+ public HandlerService(String handlerName, String handlerClass, int counter) {
this.handlerName = handlerName;
this.handlerClass = handlerClass;
+ this.counter = counter;
}
@Override
@@ -50,7 +52,7 @@
@Override
public void start(final StartContext context) throws StartException {
- handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null);
+ handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null, String.valueOf(counter));
}
@Override
9 years, 6 months
JBossWS SVN: r19009 - stack/cxf/branches/jbossws-cxf-4.3.x.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-17 09:11:58 -0400 (Fri, 17 Oct 2014)
New Revision: 19009
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
Log:
Use latest spi
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-10-17 13:08:37 UTC (rev 19008)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/pom.xml 2014-10-17 13:11:58 UTC (rev 19009)
@@ -61,7 +61,7 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.2.Final</jbossws.api.version>
- <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
+ <jbossws.spi.version>2.3.1-SNAPSHOT</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.2-SNAPSHOT</jbossws.jboss720.version>
9 years, 6 months
JBossWS SVN: r19008 - in spi/trunk: src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-17 09:08:37 -0400 (Fri, 17 Oct 2014)
New Revision: 19008
Modified:
spi/trunk/
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
Log:
[JBWS-3838] Adding optional id to handler metadata
Property changes on: spi/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /spi/branches/JBWS-3286:14506
/spi/branches/asoldano:14017-14042
/spi/branches/ropalka:16962-17001
/spi/branches/ropalka_JBWS-3550:16742
+ /spi/branches/JBWS-3286:14506
/spi/branches/asoldano:14017-14042
/spi/branches/jbossws-spi-2.3.x:19007
/spi/branches/ropalka:16962-17001
/spi/branches/ropalka_JBWS-3550:16742
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2014-10-17 13:03:23 UTC (rev 19007)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2014-10-17 13:08:37 UTC (rev 19008)
@@ -57,13 +57,16 @@
private final Set<String> soapRoles;
// The optional <port-name> elements, these only apply to webservice clients
private final Set<String> portNames;
+ // An optional id
+ private final String id;
public UnifiedHandlerMetaData(String handlerClass,
String handlerName,
List<UnifiedInitParamMetaData> initParams,
Set<QName> soapHeaders,
Set<String> soapRoles,
- Set<String> portNames) {
+ Set<String> portNames,
+ String id) {
this.handlerClass = handlerClass;
this.handlerName = handlerName;
this.initParams = initParams != null ? Collections.unmodifiableList(initParams) : null;
@@ -82,8 +85,18 @@
} else {
this.portNames = Collections.emptySet();
}
+ this.id = id;
}
+ public UnifiedHandlerMetaData(String handlerClass,
+ String handlerName,
+ List<UnifiedInitParamMetaData> initParams,
+ Set<QName> soapHeaders,
+ Set<String> soapRoles,
+ Set<String> portNames) {
+ this(handlerClass, handlerName, initParams, soapHeaders, soapRoles, portNames, handlerName);
+ }
+
public UnifiedHandlerChainMetaData getHandlerChain()
{
return handlerChain;
@@ -104,6 +117,11 @@
return handlerClass;
}
+ public String getId()
+ {
+ return id;
+ }
+
public List<UnifiedInitParamMetaData> getInitParams()
{
return initParams;
@@ -134,6 +152,7 @@
str.append("\n soapRoles=" + soapRoles);
str.append("\n portNames=" + portNames);
str.append("\n initParams=" + initParams);
+ str.append("\n id=" + id);
return str.toString();
}
}
9 years, 6 months
JBossWS SVN: r19007 - spi/branches/jbossws-spi-2.3.x/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-17 09:03:23 -0400 (Fri, 17 Oct 2014)
New Revision: 19007
Modified:
spi/branches/jbossws-spi-2.3.x/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
Log:
[JBWS-3838] Adding optional id to handler metadata
Modified: spi/branches/jbossws-spi-2.3.x/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- spi/branches/jbossws-spi-2.3.x/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2014-10-17 12:04:13 UTC (rev 19006)
+++ spi/branches/jbossws-spi-2.3.x/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2014-10-17 13:03:23 UTC (rev 19007)
@@ -57,13 +57,16 @@
private final Set<String> soapRoles;
// The optional <port-name> elements, these only apply to webservice clients
private final Set<String> portNames;
+ // An optional id
+ private final String id;
public UnifiedHandlerMetaData(String handlerClass,
String handlerName,
List<UnifiedInitParamMetaData> initParams,
Set<QName> soapHeaders,
Set<String> soapRoles,
- Set<String> portNames) {
+ Set<String> portNames,
+ String id) {
this.handlerClass = handlerClass;
this.handlerName = handlerName;
this.initParams = initParams != null ? Collections.unmodifiableList(initParams) : null;
@@ -82,8 +85,18 @@
} else {
this.portNames = Collections.emptySet();
}
+ this.id = id;
}
+ public UnifiedHandlerMetaData(String handlerClass,
+ String handlerName,
+ List<UnifiedInitParamMetaData> initParams,
+ Set<QName> soapHeaders,
+ Set<String> soapRoles,
+ Set<String> portNames) {
+ this(handlerClass, handlerName, initParams, soapHeaders, soapRoles, portNames, handlerName);
+ }
+
public UnifiedHandlerChainMetaData getHandlerChain()
{
return handlerChain;
@@ -104,6 +117,11 @@
return handlerClass;
}
+ public String getId()
+ {
+ return id;
+ }
+
public List<UnifiedInitParamMetaData> getInitParams()
{
return initParams;
@@ -134,6 +152,7 @@
str.append("\n soapRoles=" + soapRoles);
str.append("\n portNames=" + portNames);
str.append("\n initParams=" + initParams);
+ str.append("\n id=" + id);
return str.toString();
}
}
9 years, 6 months
JBossWS SVN: r19005 - container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 17:33:04 -0400 (Thu, 16 Oct 2014)
New Revision: 19005
Modified:
container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
Log:
[JBWS-3819] Allow parametrization of web connector created within TS execution
Modified: container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-10-16 21:14:28 UTC (rev 19004)
+++ container/jboss72/branches/jbossws-jboss720-4.3.x/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-10-16 21:33:04 UTC (rev 19005)
@@ -94,6 +94,7 @@
private static final String JBWS_DEPLOYER_PORT = "jbossws.deployer.port";
private static final String JBWS_DEPLOYER_AUTH_USER = "jbossws.deployer.authentication.username";
private static final String JBWS_DEPLOYER_AUTH_PWD = "jbossws.deployer.authentication.password";
+ private static final String JBWS_HTTPS_CONNECTOR_PROTOCOL = "jbossws.https.connector.protocol";
private static final CallbackHandler callbackHandler = getCallbackHandler();
private static final int TIMEOUT = 60000;
private static InetAddress address;
@@ -270,7 +271,7 @@
ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", ADD);
op.get("socket-binding").set("https");
op.get("scheme").set("https");
- op.get("protocol").set("HTTP/1.1");
+ op.get("protocol").set(System.getProperty(JBWS_HTTPS_CONNECTOR_PROTOCOL, "HTTP/1.1"));
op.get("secure").set(true);
op.get("enabled").set(true);
steps.add(op);
9 years, 6 months
JBossWS SVN: r19004 - stack/cxf/branches/jbossws-cxf-4.3.x.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 17:14:28 -0400 (Thu, 16 Oct 2014)
New Revision: 19004
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/
Log:
Blocked revisions 18935 via svnmerge
.......
r18935 | rsearls | 2014-09-12 15:25:39 +0200 (Fri, 12 Sep 2014) | 1 line
[JBWS-3816] enabled test, removed WSTrustActAsTestCase from the exclude list.
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.3.x
___________________________________________________________________
Modified: svnmerge-blocked
- /stack/cxf/trunk:18599-18602,18604-18606,18608,18613-18615,18620,18622-18624,18653-18655,18659-18660,18662,18664,18669-18670,18684,18688,18694,18696-18697,18699-18700,18702,18705,18711,18714,18716,18722-18725,18731,18733-18734,18738-18741,18743-18744,18747-18749,18753-18754,18760-18761,18763-18769,18771-18776,18780,18788-18795,18797,18799-18804,18809-18810,18815,18817-18821,18825-18831,18836,18838,18841,18844,18846,18849-18851,18853-18855,18858,18865,18867-18869
+ /stack/cxf/trunk:18599-18602,18604-18606,18608,18613-18615,18620,18622-18624,18653-18655,18659-18660,18662,18664,18669-18670,18684,18688,18694,18696-18697,18699-18700,18702,18705,18711,18714,18716,18722-18725,18731,18733-18734,18738-18741,18743-18744,18747-18749,18753-18754,18760-18761,18763-18769,18771-18776,18780,18788-18795,18797,18799-18804,18809-18810,18815,18817-18821,18825-18831,18836,18838,18841,18844,18846,18849-18851,18853-18855,18858,18865,18867-18869,18935
9 years, 6 months
JBossWS SVN: r19003 - in stack/cxf/branches/jbossws-cxf-4.3.x: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-10-16 17:11:45 -0400 (Thu, 16 Oct 2014)
New Revision: 19003
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/
stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
Log:
Merged revisions 18933 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r18933 | rsearls | 2014-09-11 20:38:55 +0200 (Thu, 11 Sep 2014) | 1 line
[JBWS-3816] changed UsernameToken input args
.......
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,18947
+ /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,18933,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,18947
+ /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,18933,18947
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-10-16 20:48:08 UTC (rev 19002)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-10-16 21:11:45 UTC (rev 19003)
@@ -147,7 +147,7 @@
UsernameTokenCallbackHandler ch = new UsernameTokenCallbackHandler();
- String str = ch.getUsernameTokenString("myactaskey", null);
+ String str = ch.getUsernameTokenString("alice","clarinet");
ctx.put(SecurityConstants.STS_TOKEN_ACT_AS, str);
9 years, 6 months