JBossWS SVN: r15122 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:34:07 -0400 (Tue, 18 Oct 2011)
New Revision: 15122
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
fixing test for AS7 - exception message is different
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-10-18 10:28:07 UTC (rev 15121)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-10-18 10:34:07 UTC (rev 15122)
@@ -79,7 +79,14 @@
}
catch (Exception ex)
{
- assertEquals("Caller unauthorized", ex.getMessage());
+ if (isTargetJBoss6())
+ {
+ assertEquals("Caller unauthorized", ex.getMessage());
+ }
+ else
+ {
+ assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed"));
+ }
}
}
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 10:28:07 UTC (rev 15121)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 10:34:07 UTC (rev 15122)
@@ -1320,7 +1320,6 @@
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
<!-- TODO: investigate -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude>
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
14 years, 2 months
JBossWS SVN: r15121 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 06:28:07 -0400 (Tue, 18 Oct 2011)
New Revision: 15121
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
Log:
[JBWS-3369] Forward proper classloader from JBossWSConfigFactory to the entity resolver it creates to parse the configuration
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-10-18 10:24:09 UTC (rev 15120)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-10-18 10:28:07 UTC (rev 15121)
@@ -99,7 +99,7 @@
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
unmarshaller.setValidation(true);
unmarshaller.setSchemaValidation(true);
- unmarshaller.setEntityResolver(new JBossWSEntityResolver());
+ unmarshaller.setEntityResolver(new JBossWSEntityResolver(loader));
String nsURI = getNamespaceURI(configURL);
is = configURL.openStream();
14 years, 2 months
JBossWS SVN: r15120 - common/trunk/src/main/java/org/jboss/ws/common/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 06:24:09 -0400 (Tue, 18 Oct 2011)
New Revision: 15120
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
Log:
[JBWS-3369] Allow providing a classloader for entities properties file retrieval in JBossWSEntityResolver
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2011-10-18 10:13:37 UTC (rev 15119)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2011-10-18 10:24:09 UTC (rev 15120)
@@ -59,19 +59,32 @@
// provide logging
private static final Logger log = Logger.getLogger(JBossWSEntityResolver.class);
+
+ private ClassLoader additionalClassLoader;
public JBossWSEntityResolver()
{
- this("META-INF/jbossws-entities.properties");
+ this(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
}
+ public JBossWSEntityResolver(ClassLoader loader)
+ {
+ this("META-INF/jbossws-entities.properties", loader);
+ }
+
public JBossWSEntityResolver(final String entitiesResource)
{
+ this(entitiesResource, ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
+ }
+
+ public JBossWSEntityResolver(final String entitiesResource, final ClassLoader loader)
+ {
super();
+ this.additionalClassLoader = loader;
Properties props = null;
- ClassLoader loader = SecurityActions.getContextClassLoader();
- Map<String, Properties> map = propertiesMap.get(loader);
+ ClassLoader tccl = SecurityActions.getContextClassLoader();
+ Map<String, Properties> map = propertiesMap.get(tccl);
if (map != null && map.containsKey(entitiesResource))
{
props = map.get(entitiesResource);
@@ -81,10 +94,10 @@
if (map == null)
{
map = new ConcurrentHashMap<String, Properties>();
- propertiesMap.put(loader, map);
+ propertiesMap.put(tccl, map);
}
// load entities
- props = loadEntitiesMappingFromClasspath(entitiesResource, loader);
+ props = loadEntitiesMappingFromClasspath(entitiesResource, tccl, this.additionalClassLoader);
if (props.size() == 0)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "NO_ENTITIES_MAPPING_DEFINED_IN_RESOURCE_FILE", entitiesResource));
map.put(entitiesResource, props);
@@ -101,16 +114,16 @@
}
}
- private Properties loadEntitiesMappingFromClasspath(final String entitiesResource, final ClassLoader classLoader)
+ private Properties loadEntitiesMappingFromClasspath(final String entitiesResource, final ClassLoader classLoader, final ClassLoader additionalClassLoader)
{
return AccessController.doPrivileged(new PrivilegedAction<Properties>()
{
public Properties run()
{
- //use a delegate classloader: first try lookup using the provided classloader,
- //otherwise use server integration classloader which has the default configuration
- final ClassLoader intCl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- InputStream is = new DelegateClassLoader(intCl, classLoader).getResourceAsStream(entitiesResource);
+ //use a delegate classloader: first try lookup using the provided (tccl) classloader,
+ //otherwise use the constructor provided classloader if any (that defaults to the
+ //server integration classloader which should have the default configuration)
+ InputStream is = new DelegateClassLoader(additionalClassLoader, classLoader).getResourceAsStream(entitiesResource);
// get stream
if (is == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "RESOURCE_NOT_FOUND", entitiesResource ));
@@ -160,7 +173,7 @@
final ClassLoader origLoader = SecurityActions.getContextClassLoader();
try
{
- SecurityActions.setContextClassLoader(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader());
+ SecurityActions.setContextClassLoader(this.additionalClassLoader);
is = super.loadClasspathResource(resource, trace);
}
finally
14 years, 2 months
JBossWS SVN: r15119 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:13:37 -0400 (Tue, 18 Oct 2011)
New Revision: 15119
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 09:17:27 UTC (rev 15118)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 10:13:37 UTC (rev 15119)
@@ -1296,6 +1296,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- # [JBWS-3371] waiting for merge upstream -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1317,7 +1320,6 @@
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
<!-- TODO: investigate -->
- <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude>
14 years, 2 months
JBossWS SVN: r15118 - in stack/cxf/trunk/modules: testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-18 05:17:27 -0400 (Tue, 18 Oct 2011)
New Revision: 15118
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3370] adding org.jboss.vfs so spring-core can see its classes
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-10-18 06:20:30 UTC (rev 15117)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-10-18 09:17:27 UTC (rev 15118)
@@ -33,5 +33,6 @@
<module name="javax.jms.api" />
<module name="javax.annotation.api" />
<module name="org.apache.commons.logging" />
+ <module name="org.jboss.vfs" />
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 06:20:30 UTC (rev 15117)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 09:17:27 UTC (rev 15118)
@@ -1317,7 +1317,6 @@
<exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
<!-- TODO: investigate -->
- <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude>
14 years, 2 months
JBossWS SVN: r15117 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-18 02:20:30 -0400 (Tue, 18 Oct 2011)
New Revision: 15117
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-17 17:15:15 UTC (rev 15116)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-18 06:20:30 UTC (rev 15117)
@@ -1296,9 +1296,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- # [JBWS-3227][MODULES-109] waiting for jboss modules 1.0.3.GA release -->
- <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
-
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1325,9 +1322,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase*</exclude>
- <!-- # [JBWS-3205] JDKLogManager not used -->
- <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
-
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
14 years, 2 months
JBossWS SVN: r15116 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-17 13:15:15 -0400 (Mon, 17 Oct 2011)
New Revision: 15116
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
Log:
[JBWS-3369] Use native core module classloader for getting default native stack confs instead of ASIL classloader
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-10-17 11:07:13 UTC (rev 15115)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-10-17 17:15:15 UTC (rev 15116)
@@ -72,9 +72,8 @@
private JBossWSConfigFactory(ClassLoader loader)
{
//use a delegate classloader: first try lookup using the provided classloader,
- //otherwise use server integration classloader which has the default configuration
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- this.loader = new DelegateClassLoader(cl, loader);
+ //otherwise use the native core module classloader (the default confs are there)
+ this.loader = new DelegateClassLoader(JBossWSConfigFactory.class.getClassLoader(), loader);
}
/** Create a new instance of the factory
14 years, 2 months
JBossWS SVN: r15115 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-17 07:07:13 -0400 (Mon, 17 Oct 2011)
New Revision: 15115
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-17 11:06:11 UTC (rev 15114)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-17 11:07:13 UTC (rev 15115)
@@ -1016,9 +1016,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- # [JBWS-3232][JBMETA-339] waiting for metadata beta14 release -->
- <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
14 years, 2 months
JBossWS SVN: r15114 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-17 07:06:11 -0400 (Mon, 17 Oct 2011)
New Revision: 15114
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-17 10:54:56 UTC (rev 15113)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-17 11:06:11 UTC (rev 15114)
@@ -1296,9 +1296,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata Beta14 release -->
- <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
<!-- # [JBWS-3227][MODULES-109] waiting for jboss modules 1.0.3.GA release -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
14 years, 2 months
JBossWS SVN: r15113 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-17 06:54:56 -0400 (Mon, 17 Oct 2011)
New Revision: 15113
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3225] resuscitating JBossWS console for CXF JAXRPC integration as well
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-10-17 10:05:40 UTC (rev 15112)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-10-17 10:54:56 UTC (rev 15113)
@@ -254,23 +254,6 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy JBossWS Console + PortComponentLink servlet -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-jaxrpc-deployment">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-cxf-management-pcl.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
<!-- Deploy Deployers -->
<!-- ================================================================== -->
@@ -445,7 +428,7 @@
<macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-jaxrpc-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
14 years, 2 months