JBossWS SVN: r17807 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-23 12:49:08 -0400 (Tue, 23 Jul 2013)
New Revision: 17807
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
[JBWS-3671] Cleanup the server integration classloader' service config reference as a new server config can be created due to a server reload
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2013-07-22 06:29:07 UTC (rev 17806)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2013-07-23 16:49:08 UTC (rev 17807)
@@ -205,6 +205,10 @@
if (mbeanServer != null) {
mbeanServer.registerMBean(this, AbstractServerConfigMBean.OBJECT_NAME);
}
+
+ //cleanup the server integration classloader' service config reference as
+ //a new server config can be created due to a server reload.
+ serverConfig = null;
}
public void destroy() throws Exception
11 years, 5 months
JBossWS SVN: r17806 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-22 02:29:07 -0400 (Mon, 22 Jul 2013)
New Revision: 17806
Modified:
stack/cxf/trunk/pom.xml
Log:
Upgrade to wildfly-8.0.0.Alpha4-SNAPSHOT
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-07-19 18:16:31 UTC (rev 17805)
+++ stack/cxf/trunk/pom.xml 2013-07-22 06:29:07 UTC (rev 17806)
@@ -70,7 +70,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Final</jboss720.version>
- <wildfly800.version>8.0.0.Alpha3-SNAPSHOT</wildfly800.version>
+ <wildfly800.version>8.0.0.Alpha4-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
<cxf.version>2.7.6-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
11 years, 5 months
JBossWS SVN: r17805 - common/trunk/src/main/java/org/jboss/ws/common/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-19 14:16:31 -0400 (Fri, 19 Jul 2013)
New Revision: 17805
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java
Log:
[JBWS-3669] Use getResourceAsStream from ModuleClassLoader
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java 2013-07-19 08:46:26 UTC (rev 17804)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java 2013-07-19 18:16:31 UTC (rev 17805)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, 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.
*
@@ -129,17 +129,7 @@
@Override
public InputStream getResourceAsStream(final String name)
{
- URL foundResource = getResource(name);
- if (foundResource != null)
- {
- try
- {
- return foundResource.openStream();
- }
- catch (IOException e)
- {
- }
- }
- return null;
+ InputStream is = parent.getResourceAsStream(name);
+ return (is == null) ? delegate.getResourceAsStream(name) : is;
}
}
\ No newline at end of file
11 years, 5 months
JBossWS SVN: r17804 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-19 04:46:26 -0400 (Fri, 19 Jul 2013)
New Revision: 17804
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
Log:
Refactor to use conditon else
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-07-19 08:22:58 UTC (rev 17803)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-07-19 08:46:26 UTC (rev 17804)
@@ -79,23 +79,12 @@
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
- <condition property="remote.port" value="8080">
+ <condition property="remote.port" value="8080" else="4447">
<isset property="jbossws.integration.wildfly80x"/>
</condition>
- <condition property="remote.protocol" value="http-remoting">
+ <condition property="remote.protocol" value="http-remoting" else="remote">
<isset property="jbossws.integration.wildfly80x"/>
</condition>
-
- <condition property="remote.port" value="4447">
- <not>
- <isset property="jbossws.integration.wildfly80x"/>
- </not>
- </condition>
- <condition property="remote.protocol" value="remote">
- <not>
- <isset property="jbossws.integration.wildfly80x"/>
- </not>
- </condition>
</target>
<target name="tests-init" depends="init,tests-classpath">
11 years, 5 months
JBossWS SVN: r17803 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-19 04:22:58 -0400 (Fri, 19 Jul 2013)
New Revision: 17803
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
Log:
Fix binary distribution tests
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-07-18 19:16:28 UTC (rev 17802)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-07-19 08:22:58 UTC (rev 17803)
@@ -657,6 +657,8 @@
</fileset>
<filterset>
<filter token="jboss.bind.address" value="${node0}"/>
+ <filter token="remote.protocol" value="${remote.protocol}"/>
+ <filter token="remote.port" value="${remote.port}"/>
</filterset>
</copy>
<copy todir="${tests.output.dir}/test-classes">
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-07-18 19:16:28 UTC (rev 17802)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2013-07-19 08:22:58 UTC (rev 17803)
@@ -75,9 +75,27 @@
<equals arg1="${jbossws.integration.target}" arg2="wildfly800"/>
</or>
</condition>
-
+
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ <condition property="remote.port" value="8080">
+ <isset property="jbossws.integration.wildfly80x"/>
+ </condition>
+ <condition property="remote.protocol" value="http-remoting">
+ <isset property="jbossws.integration.wildfly80x"/>
+ </condition>
+
+ <condition property="remote.port" value="4447">
+ <not>
+ <isset property="jbossws.integration.wildfly80x"/>
+ </not>
+ </condition>
+ <condition property="remote.protocol" value="remote">
+ <not>
+ <isset property="jbossws.integration.wildfly80x"/>
+ </not>
+ </condition>
</target>
<target name="tests-init" depends="init,tests-classpath">
11 years, 5 months
JBossWS SVN: r17802 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-18 15:16:28 -0400 (Thu, 18 Jul 2013)
New Revision: 17802
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest jaxws api spec version
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-07-18 18:51:42 UTC (rev 17801)
+++ stack/cxf/trunk/pom.xml 2013-07-18 19:16:28 UTC (rev 17802)
@@ -87,7 +87,7 @@
<jaxb.api.version>1.0.3.Final</jaxb.api.version>
<jaxb.impl.version>2.2.5</jaxb.impl.version>
<jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
- <jaxws.api.version>2.0.0.Final</jaxws.api.version>
+ <jaxws.api.version>2.0.2.Beta1</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-lang.version>2.6</commons-lang.version>
11 years, 5 months
JBossWS SVN: r17801 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-18 14:51:42 -0400 (Thu, 18 Jul 2013)
New Revision: 17801
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/SecurityActions.java
Log:
Use privileged action for Boolean.getBoolean(..)
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java 2013-07-18 10:21:48 UTC (rev 17800)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/BeanCustomizer.java 2013-07-18 18:51:42 UTC (rev 17801)
@@ -130,7 +130,7 @@
{
parameters = new TLSClientParameters();
parameters.setUseHttpsURLConnectionDefaultSslSocketFactory(true);
- if (Boolean.getBoolean("org.jboss.security.ignoreHttpsHost"))
+ if (SecurityActions.getBoolean("org.jboss.security.ignoreHttpsHost"))
{
parameters.setDisableCNCheck(true);
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/SecurityActions.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/SecurityActions.java 2013-07-18 10:21:48 UTC (rev 17800)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/SecurityActions.java 2013-07-18 18:51:42 UTC (rev 17801)
@@ -79,6 +79,25 @@
}
}
+ static boolean getBoolean(final String propName)
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Boolean.getBoolean(propName);
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Boolean>()
+ {
+ public Boolean run()
+ {
+ return Boolean.getBoolean(propName);
+ }
+ });
+ }
+ }
+
/**
* Return the current value of the specified system property
*
11 years, 5 months
JBossWS SVN: r17800 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-18 06:21:48 -0400 (Thu, 18 Jul 2013)
New Revision: 17800
Modified:
hudson/trunk/ant.properties.example
Log:
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2013-07-18 09:45:39 UTC (rev 17799)
+++ hudson/trunk/ant.properties.example 2013-07-18 10:21:48 UTC (rev 17800)
@@ -33,7 +33,7 @@
hudson.jboss720.rev=7.2.0.Final-prerelease1
hudson.jboss800.url=https://github.com/wildfly/wildfly
-hudson.jboss800.build=wildfly-8.0.0.Alpha3-SNAPSHOT
+hudson.jboss800.build=wildfly-8.0.0.Alpha4-SNAPSHOT
hudson.jboss800.rev=master
hudson.mail.recipients=
11 years, 5 months
JBossWS SVN: r17799 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-07-18 05:45:39 -0400 (Thu, 18 Jul 2013)
New Revision: 17799
Modified:
stack/cxf/trunk/pom.xml
Log:
Revert back to 2.7.6-SNAPSHOT CXF version till 2.7.6 is on staging (to avoid breaking the build)
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-07-18 06:46:37 UTC (rev 17798)
+++ stack/cxf/trunk/pom.xml 2013-07-18 09:45:39 UTC (rev 17799)
@@ -72,7 +72,7 @@
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Alpha3-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.7.6</cxf.version>
+ <cxf.version>2.7.6-SNAPSHOT</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>
11 years, 5 months
JBossWS SVN: r17798 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/etc and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-07-18 02:46:37 -0400 (Thu, 18 Jul 2013)
New Revision: 17798
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties
Log:
Change remote protocol to http-remoting for wildfly800
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2013-07-18 06:46:37 UTC (rev 17798)
@@ -1,7 +1,7 @@
remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
remote.connections=default
remote.connection.default.host=(a)jboss.bind.address@
-remote.connection.default.port=4447
+remote.connection.default.port=(a)remote.port@
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties 2013-07-18 06:46:37 UTC (rev 17798)
@@ -1,5 +1,5 @@
java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client
-java.naming.provider.url=remote://@jboss.bind.address@:4447
+java.naming.provider.url=@remote.protocol@://@jboss.bind.address@:@remote.port@
jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
-jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
\ No newline at end of file
+jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2013-07-18 06:46:37 UTC (rev 17798)
@@ -1,7 +1,7 @@
remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
remote.connections=default
remote.connection.default.host=(a)jboss.bind.address@
-remote.connection.default.port=4447
+remote.connection.default.port=(a)remote.port@
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties 2013-07-18 06:46:37 UTC (rev 17798)
@@ -1,5 +1,5 @@
java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client
-java.naming.provider.url=remote://@jboss.bind.address@:4447
+java.naming.provider.url=@remote.protocol@://@jboss.bind.address@:@remote.port@
jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
-jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
\ No newline at end of file
+jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-18 06:46:37 UTC (rev 17798)
@@ -30,6 +30,8 @@
<org.slf4j.version>1.6.1</org.slf4j.version>
<gnu.getopt.version>1.0.13</gnu.getopt.version>
<log4j.version>1.2.14</log4j.version>
+ <remote.port>4447</remote.port>
+ <remote.protocol>remote</remote.protocol>
</properties>
<!-- Modules -->
@@ -809,6 +811,8 @@
<properties>
<jboss.version>${wildfly800.version}</jboss.version>
<jbossws.integration.target>wildfly800</jbossws.integration.target>
+ <remote.port>8080</remote.port>
+ <remote.protocol>http-remoting</remote.protocol>
</properties>
<dependencies>
<dependency>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2013-07-18 06:46:37 UTC (rev 17798)
@@ -1,7 +1,7 @@
remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
remote.connections=default
remote.connection.default.host=(a)jboss.bind.address@
-remote.connection.default.port=4447
+remote.connection.default.port=(a)remote.port@
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
callback.handler.class=org.jboss.wsf.test.CallbackHandler
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties 2013-07-18 05:50:16 UTC (rev 17797)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties 2013-07-18 06:46:37 UTC (rev 17798)
@@ -1,5 +1,5 @@
java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client
-java.naming.provider.url=remote://@jboss.bind.address@:4447
+java.naming.provider.url=@remote.protocol@://@jboss.bind.address@:@remote.port@
jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
-jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
\ No newline at end of file
+jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler
11 years, 5 months