JBossWS SVN: r14085 - api/trunk/src/main/java/org/jboss/wsf/spi/tools.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-13 05:09:05 -0400 (Wed, 13 Apr 2011)
New Revision: 14085
Modified:
api/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
Log:
[JBWS-3222] implement temporary reflection based hack for AS7 jbossws integration module lookup
Modified: api/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- api/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2011-04-13 09:08:41 UTC (rev 14084)
+++ api/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2011-04-13 09:09:05 UTC (rev 14085)
@@ -52,7 +52,21 @@
*/
public static WSContractConsumer newInstance()
{
- return newInstance(SecurityActions.getContextClassLoader());
+ // TODO: use SPI class loader facade, not reflection!
+ ClassLoader loader;
+ try {
+ Class<?> moduleClass = Class.forName("org.jboss.modules.Module");
+ Class<?> moduleIdentifierClass = Class.forName("org.jboss.modules.ModuleIdentifier");
+ Class<?> moduleLoaderClass = Class.forName("org.jboss.modules.ModuleLoader");
+ Object moduleLoader = moduleClass.getMethod("getBootModuleLoader").invoke(null);
+ Object moduleIdentifier = moduleIdentifierClass.getMethod("create", String.class).invoke(null, "org.jboss.as.webservices.server.integration");
+ Object module = moduleLoaderClass.getMethod("loadModule", moduleIdentifierClass).invoke(moduleLoader, moduleIdentifier);
+ loader = (ClassLoader)moduleClass.getMethod("getClassLoader").invoke(module);
+ } catch (Exception e) {
+ //ignore, JBoss Modules might not be available at all
+ loader = Thread.currentThread().getContextClassLoader();
+ }
+ return newInstance(loader);
}
/**
14 years, 5 months
JBossWS SVN: r14084 - common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-04-13 05:08:41 -0400 (Wed, 13 Apr 2011)
New Revision: 14084
Modified:
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/SecurityActions.java
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
Log:
[JBWS-3222] implement temporary reflection based hack for AS7 jbossws integration module lookup
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/SecurityActions.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/SecurityActions.java 2011-04-13 02:16:40 UTC (rev 14083)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/SecurityActions.java 2011-04-13 09:08:41 UTC (rev 14084)
@@ -57,7 +57,66 @@
});
}
}
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+ static ClassLoader getModulesClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return getModulesClassLoaderInternal();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return getModulesClassLoaderInternal();
+ }
+ });
+ }
+ }
+
+ private static ClassLoader getModulesClassLoaderInternal()
+ {
+ // TODO: use SPI class loader facade, not reflection!
+ try {
+ Class<?> moduleClass = Class.forName("org.jboss.modules.Module");
+ Class<?> moduleIdentifierClass = Class.forName("org.jboss.modules.ModuleIdentifier");
+ Class<?> moduleLoaderClass = Class.forName("org.jboss.modules.ModuleLoader");
+ Object moduleLoader = moduleClass.getMethod("getBootModuleLoader").invoke(null);
+ Object moduleIdentifier = moduleIdentifierClass.getMethod("create", String.class).invoke(null, "org.jboss.as.webservices.server.integration");
+ Object module = moduleLoaderClass.getMethod("loadModule", moduleIdentifierClass).invoke(moduleLoader, moduleIdentifier);
+ return (ClassLoader)moduleClass.getMethod("getClassLoader").invoke(module);
+ } catch (Exception e) {
+ //ignore, JBoss Modules might not be available at all
+ return null;
+ }
+ }
+
/**
* Load a class using the provided classloader
*
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-13 02:16:40 UTC (rev 14083)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2011-04-13 09:08:41 UTC (rev 14084)
@@ -68,6 +68,7 @@
*/
public class WSConsume
{
+ private static final ClassLoader MODULES_LOADER;
private List<File> bindingFiles = new ArrayList<File>();
private File outputDir = new File("output");
private boolean generateSource;
@@ -82,15 +83,41 @@
private boolean noCompile;
private File sourceDir;
private String target;
-
+
+ static
+ {
+ MODULES_LOADER = SecurityActions.getModulesClassLoader();
+ }
+
public static final String PROGRAM_NAME = SecurityActions.getSystemProperty("program.name", WSConsume.class.getName());
public static void main(String[] args)
{
- WSConsume importer = new WSConsume();
- URL wsdl = importer.parseArguments(args);
- System.exit(importer.importServices(wsdl));
+ if (MODULES_LOADER != null)
+ {
+ final ClassLoader origLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(MODULES_LOADER);
+ mainInternal(args);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(origLoader);
+ }
+ }
+ else
+ {
+ mainInternal(args);
+ }
}
+
+ private static void mainInternal(final String[] args)
+ {
+ WSConsume importer = new WSConsume();
+ URL wsdl = importer.parseArguments(args);
+ System.exit(importer.importServices(wsdl));
+ }
private URL parseArguments(String[] args)
{
Modified: common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-13 02:16:40 UTC (rev 14083)
+++ common/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2011-04-13 09:08:41 UTC (rev 14084)
@@ -64,7 +64,8 @@
*/
public class WSProvide
{
- private ClassLoader loader = SecurityActions.getContextClassLoader();
+ private static final ClassLoader DEFAULT_LOADER;
+ private ClassLoader loader = DEFAULT_LOADER;
private File outputDir = new File("output");
private boolean generateSource;
private boolean generateWsdl;
@@ -74,6 +75,13 @@
private boolean loadProvider;
private File resourceDir;
private File sourceDir;
+
+ static
+ {
+ final ClassLoader modulesLoader = SecurityActions.getModulesClassLoader();
+ final ClassLoader contextLoader = SecurityActions.getContextClassLoader();
+ DEFAULT_LOADER = modulesLoader != null ? modulesLoader : contextLoader;
+ }
public static final String PROGRAM_NAME = SecurityActions.getSystemProperty("program.name", WSProvide.class.getSimpleName());
14 years, 5 months
JBossWS SVN: r14083 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-12 22:16:40 -0400 (Tue, 12 Apr 2011)
New Revision: 14083
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
Log:
[JBPAPP-6242][JBPAPP-6243][JBWS-2901] test case for JBWS-2901
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2011-04-13 02:16:13 UTC (rev 14082)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2011-04-13 02:16:40 UTC (rev 14083)
@@ -639,6 +639,20 @@
<include name="*" />
</webinf>
</war>
+
+ <!-- jaxws-jbws2901 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws2901.war" webxml="${tests.output.dir}/resources/jaxws/jbws2901/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2901/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws2901/WEB-INF">
+ <include name="wsdl/service.wsdl"/>
+ </webinf>
+ <fileset dir="${tests.output.dir}/resources/jaxws/jbws2901">
+ <include name="passwd" />
+ </fileset>
+ </war>
<!-- jaxws-jbws2009 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml">
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml:14048
14 years, 5 months
JBossWS SVN: r14082 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test: java/org/jboss/test/ws/jaxws/jbws2901 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-12 22:16:13 -0400 (Tue, 12 Apr 2011)
New Revision: 14082
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/
Log:
[JBPAPP-6242][JBPAPP-6243][JBWS-2901] test case for JBWS-2901
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws:14048
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2901;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService (name="Endpoint")
-@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
-public interface Endpoint
-{
- @WebMethod(operationName = "echoString", action = "urn:EchoString")
- String echo(String input);
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/Endpoint.java 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2901;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echoString", action = "urn:EchoString")
+ String echo(String input);
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2901;
-
-import javax.jws.WebService;
-
-@WebService
-(
- portName = "EndpointPort",
- serviceName = "EndpointService",
- wsdlLocation = "WEB-INF/wsdl/service.wsdl",
- endpointInterface = "org.jboss.test.ws.jaxws.jbws2901.Endpoint"
-)
-public class EndpointImpl
-{
- public String echo(String msg)
- {
- return msg;
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/EndpointImpl.java 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2901;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "EndpointPort",
+ serviceName = "EndpointService",
+ wsdlLocation = "WEB-INF/wsdl/service.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2901.Endpoint"
+)
+public class EndpointImpl
+{
+ public String echo(String msg)
+ {
+ return msg;
+ }
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,98 +0,0 @@
-/**
- *
- */
-package org.jboss.test.ws.jaxws.jbws2901;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.common.IOUtils;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-import org.jboss.test.ws.jaxws.jbws2901.Endpoint;
-/**
- * [JBWS-2901] Disable XML external entity resolver
- *
- * @author <a href="mailto:bmaxwell@redhat.com">Brad Maxwell</a>
- *
- */
-public class JBWS2901TestCase extends JBossWSTest
-{
- private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jbws2901/TestService";
- private String targetNS = "http://jbws2901.jaxws.ws.test.jboss.org/";
- private String passwdContents = "root:x:0:0:root:/root:/bin/bash";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2901TestCase.class, "jaxws-jbws2901.war");
- }
-
- public void testLegalAccess() throws Exception
- {
- URL wsdlURL = new URL(endpointURL + "?wsdl");
- QName serviceName = new QName(targetNS, "EndpointService");
-
- Service service = Service.create(wsdlURL, serviceName);
- Endpoint port = (Endpoint)service.getPort(Endpoint.class);
-
- Object retObj = port.echo("Hello");
- assertEquals("Hello", retObj);
- }
-
- public void testSOAPMessage() throws Exception
- {
- String response = getResponse("jaxws/jbws2901/message.xml");
- assertTrue(response.contains("HTTP/1.1 200 OK"));
- assertTrue(response.contains("<return>Hello</return>"));
- }
-
- public void testSOAPMessageAttack1() throws Exception
- {
- String response = getResponse("jaxws/jbws2901/attack-message-1.xml");
- assertFalse(response.contains(passwdContents));
- }
-
- private String getResponse(String requestFile) throws Exception
- {
- final String CRNL = "\r\n";
- String content = getContent(new FileInputStream(getResourceFile(requestFile)));
- Socket socket = new Socket();
- socket.connect(new InetSocketAddress(getServerHost(), 8080));
- OutputStream out = socket.getOutputStream();
-
- // send an HTTP request to the endpoint
- out.write(("POST /jaxws-jbws2901/TestService HTTP/1.0" + CRNL).getBytes());
- out.write(("Host: " + getServerHost() + ":8080" + CRNL).getBytes());
- out.write(("Content-Type: text/xml" + CRNL).getBytes());
- out.write(("Content-Length: " + content.length() + CRNL).getBytes());
- out.write((CRNL).getBytes());
- out.write((content).getBytes());
-
- // read the response
- String response = getContent(socket.getInputStream());
- socket.close();
- System.out.println("---");
- System.out.println(response);
- System.out.println("---");
- return response;
- }
-
- private static String getContent(InputStream is) throws IOException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copyStream(baos, is);
- return new String(baos.toByteArray());
- }
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2901/JBWS2901TestCase.java 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,124 @@
+/**
+ *
+ */
+package org.jboss.test.ws.jaxws.jbws2901;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import org.jboss.test.ws.jaxws.jbws2901.Endpoint;
+/**
+ * [JBWS-2901] Disable XML external entity resolver
+ *
+ * @author <a href="mailto:bmaxwell@redhat.com">Brad Maxwell</a>
+ *
+ */
+public class JBWS2901TestCase extends JBossWSTest
+{
+ private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+ private static String testResourcesDir = null;
+ private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jbws2901/TestService";
+ private String targetNS = "http://jbws2901.jaxws.ws.test.jboss.org/";
+ private String passwdContents = "root:x:0:0:root:/root:/bin/bash";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2901TestCase.class, "jaxws-jbws2901.war");
+ }
+
+ public void testLegalAccess() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+
+ public void testSOAPMessage() throws Exception
+ {
+ String response = getResponse("resources/jaxws/jbws2901/message.xml");
+ assertTrue(response.contains("HTTP/1.1 200 OK"));
+ assertTrue(response.contains("<return>Hello</return>"));
+ }
+
+ public void testSOAPMessageAttack1() throws Exception
+ {
+ String response = getResponse("resources/jaxws/jbws2901/attack-message-1.xml");
+ assertFalse(response.contains(passwdContents));
+ }
+
+ private String getResponse(String requestFile) throws Exception
+ {
+ final String CRNL = "\r\n";
+ String content = getContent(new FileInputStream(getResourceFile(requestFile)));
+ Socket socket = new Socket();
+ socket.connect(new InetSocketAddress(getServerHost(), 8080));
+ OutputStream out = socket.getOutputStream();
+
+ // send an HTTP request to the endpoint
+ out.write(("POST /jaxws-jbws2901/TestService HTTP/1.0" + CRNL).getBytes());
+ out.write(("Host: " + getServerHost() + ":8080" + CRNL).getBytes());
+ out.write(("Content-Type: text/xml" + CRNL).getBytes());
+ out.write(("Content-Length: " + content.length() + CRNL).getBytes());
+ out.write((CRNL).getBytes());
+ out.write((content).getBytes());
+
+ // read the response
+ String response = getContent(socket.getInputStream());
+ socket.close();
+ System.out.println("---");
+ System.out.println(response);
+ System.out.println("---");
+ return response;
+ }
+
+ public static String getTestResourcesDir()
+ {
+ if (testResourcesDir == null)
+ testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY);
+
+ return testResourcesDir;
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestResourcesDir() + "/" + resource);
+ if (file.exists())
+ return file;
+
+ String notSet = (getTestResourcesDir() == null ? " System property '" + SYSPROP_TEST_RESOURCES_DIRECTORY + "' not set." : "");
+ throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'." + notSet);
+ }
+
+ private static String getContent(InputStream is) throws IOException
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ IOUtils.copyStream(baos, is);
+ return new String(baos.toByteArray());
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws:14048
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2901.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/TestService</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/web.xml 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2901.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/TestService</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='EndpointService' targetNamespace='http://jbws2901.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws2901.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <xs:schema targetNamespace='http://jbws2901.jaxws.ws.test.jboss.org/' version='1.0' xmlns:tns='http://jbws2901.jaxws.ws.test.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
- <xs:element name='echoString' type='tns:echoString'/>
- <xs:element name='echoStringResponse' type='tns:echoStringResponse'/>
- <xs:complexType name='echoString'>
- <xs:sequence>
- <xs:element minOccurs='0' name='arg0' type='xs:string'/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name='echoStringResponse'>
- <xs:sequence>
- <xs:element minOccurs='0' name='return' type='xs:string'/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- </types>
- <message name='Endpoint_echoString'>
- <part element='tns:echoString' name='echoString'/>
- </message>
- <message name='Endpoint_echoStringResponse'>
- <part element='tns:echoStringResponse' name='echoStringResponse'/>
- </message>
- <portType name='Endpoint'>
- <operation name='echoString' parameterOrder='echoString'>
- <input message='tns:Endpoint_echoString'/>
- <output message='tns:Endpoint_echoStringResponse'/>
- </operation>
- </portType>
- <binding name='EndpointBinding' type='tns:Endpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoString'>
- <soap:operation soapAction='urn:EchoString'/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='EndpointService'>
- <port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/WEB-INF/wsdl/service.wsdl 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='EndpointService' targetNamespace='http://jbws2901.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws2901.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://jbws2901.jaxws.ws.test.jboss.org/' version='1.0' xmlns:tns='http://jbws2901.jaxws.ws.test.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='echoString' type='tns:echoString'/>
+ <xs:element name='echoStringResponse' type='tns:echoStringResponse'/>
+ <xs:complexType name='echoString'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoStringResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='Endpoint_echoString'>
+ <part element='tns:echoString' name='echoString'/>
+ </message>
+ <message name='Endpoint_echoStringResponse'>
+ <part element='tns:echoStringResponse' name='echoStringResponse'/>
+ </message>
+ <portType name='Endpoint'>
+ <operation name='echoString' parameterOrder='echoString'>
+ <input message='tns:Endpoint_echoString'/>
+ <output message='tns:Endpoint_echoStringResponse'/>
+ </operation>
+ </portType>
+ <binding name='EndpointBinding' type='tns:Endpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoString'>
+ <soap:operation soapAction='urn:EchoString'/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='EndpointService'>
+ <port binding='tns:EndpointBinding' name='EndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/attack-message-1.xml 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!DOCTYPE x[
-<!ENTITY showme SYSTEM "http://localhost:8080/jaxws-jbws2901/passwd">
-]
->
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jbw="http://jbws2901.jaxws.ws.test.jboss.org/">
- <soapenv:Header/>
- <soapenv:Body>
- <jbw:echoString>
- <!--Optional:-->
- <arg0>&showme;</arg0>
- </jbw:echoString>
- </soapenv:Body>
-</soapenv:Envelope>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/attack-message-1.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/attack-message-1.xml 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!DOCTYPE x[
+<!ENTITY showme SYSTEM "http://localhost:8080/jaxws-jbws2901/passwd">
+]
+>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jbw="http://jbws2901.jaxws.ws.test.jboss.org/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <jbw:echoString>
+ <!--Optional:-->
+ <arg0>&showme;</arg0>
+ </jbw:echoString>
+ </soapenv:Body>
+</soapenv:Envelope>
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/message.xml 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jbw="http://jbws2901.jaxws.ws.test.jboss.org/">
- <soapenv:Header/>
- <soapenv:Body>
- <jbw:echoString>
- <!--Optional:-->
- <arg0>Hello</arg0>
- </jbw:echoString>
- </soapenv:Body>
-</soapenv:Envelope>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/message.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/message.xml 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jbw="http://jbws2901.jaxws.ws.test.jboss.org/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <jbw:echoString>
+ <!--Optional:-->
+ <arg0>Hello</arg0>
+ </jbw:echoString>
+ </soapenv:Body>
+</soapenv:Envelope>
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/passwd 2011-04-09 03:25:54 UTC (rev 14048)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd 2011-04-13 02:16:13 UTC (rev 14082)
@@ -1 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd (from rev 14048, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2901/passwd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2901/passwd 2011-04-13 02:16:13 UTC (rev 14082)
@@ -0,0 +1 @@
+root:x:0:0:root:/root:/bin/bash
14 years, 5 months
JBossWS SVN: r14081 - common/branches/jbossws-common-1.0.0.GA_CP04_JBPAPP-6243/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-12 14:40:10 -0400 (Tue, 12 Apr 2011)
New Revision: 14081
Modified:
common/branches/jbossws-common-1.0.0.GA_CP04_JBPAPP-6243/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-6243] removed Disable external-general-entities and external-parameter-entities settings
Modified: common/branches/jbossws-common-1.0.0.GA_CP04_JBPAPP-6243/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP04_JBPAPP-6243/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-12 18:39:28 UTC (rev 14080)
+++ common/branches/jbossws-common-1.0.0.GA_CP04_JBPAPP-6243/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-12 18:40:10 UTC (rev 14081)
@@ -91,8 +91,6 @@
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
}
- factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
- factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
}
catch (ParserConfigurationException pce)
{
14 years, 5 months
JBossWS SVN: r14080 - common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-04-12 14:39:28 -0400 (Tue, 12 Apr 2011)
New Revision: 14080
Modified:
common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-6242] removed Disable external-general-entities and external-parameter-entities settings
Modified: common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-12 13:39:40 UTC (rev 14079)
+++ common/branches/jbossws-common-1.0.0.GA_CP05_JBPAPP-6242/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-12 18:39:28 UTC (rev 14080)
@@ -94,8 +94,6 @@
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
}
- factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
- factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
}
catch (ParserConfigurationException pce)
{
14 years, 5 months
JBossWS SVN: r14079 - in stack/cxf/branches/asoldano: modules/addons and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-12 09:39:40 -0400 (Tue, 12 Apr 2011)
New Revision: 14079
Modified:
stack/cxf/branches/asoldano/modules/addons/pom.xml
stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/asoldano/modules/client/pom.xml
stack/cxf/branches/asoldano/modules/dist/management/pom.xml
stack/cxf/branches/asoldano/modules/dist/pom.xml
stack/cxf/branches/asoldano/modules/endorsed/pom.xml
stack/cxf/branches/asoldano/modules/resources/pom.xml
stack/cxf/branches/asoldano/modules/server/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/pom.xml
stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/asoldano/pom.xml
Log:
Preparing for tagging jbossws-cxf-4.0.0.Alpha4
Modified: stack/cxf/branches/asoldano/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/addons/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/addons/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/addons/transports/http/httpserver/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/client/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/client/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/dist/management/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/dist/management/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- Build -->
Modified: stack/cxf/branches/asoldano/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/dist/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/dist/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -4,12 +4,12 @@
<name>JBoss Web Services - Stack CXF Distrubiton</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/endorsed/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/endorsed/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/resources/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/resources/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/server/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/server/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/testsuite/cxf-spring-tests/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/testsuite/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/modules/testsuite/shared-tests/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/asoldano/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/pom.xml 2011-04-12 13:01:31 UTC (rev 14078)
+++ stack/cxf/branches/asoldano/pom.xml 2011-04-12 13:39:40 UTC (rev 14079)
@@ -18,20 +18,20 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>4.0.0.Alpha4-SNAPSHOT</version>
+ <version>4.0.0.Alpha4</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.10.Alpha1</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.0.0...</url>
</scm>
<!-- Modules -->
@@ -45,10 +45,10 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.0.Alpha3-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.0.Alpha5-SNAPSHOT</jbossws.common.version>
- <jbossws.shared.testsuite.version>4.0.0.Alpha1-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.spi.version>2.0.0.Alpha3</jbossws.spi.version>
+ <jbossws.common.version>2.0.0.Alpha5</jbossws.common.version>
+ <jbossws.shared.testsuite.version>4.0.0.Alpha1</jbossws.shared.testsuite.version>
+ <jbossws.jboss600.version>4.0.0.Alpha1</jbossws.jboss600.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
14 years, 5 months
JBossWS SVN: r14078 - in shared-testsuite: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-12 09:01:31 -0400 (Tue, 12 Apr 2011)
New Revision: 14078
Added:
shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Alpha1/
Removed:
shared-testsuite/branches/asoldano/
Log:
Tagging jbossws-shared-testsuite-4.0.0.Alpha1
14 years, 5 months
JBossWS SVN: r14077 - in common: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-12 08:59:26 -0400 (Tue, 12 Apr 2011)
New Revision: 14077
Added:
common/tags/jbossws-common-2.0.0.Alpha5/
Removed:
common/branches/asoldano/
Log:
Tagging jbossws-common-2.0.0.Alpha5
14 years, 5 months
JBossWS SVN: r14076 - in spi: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-12 08:58:19 -0400 (Tue, 12 Apr 2011)
New Revision: 14076
Added:
spi/tags/jbossws-spi-2.0.0.Alpha3/
Removed:
spi/branches/asoldano/
Log:
Tagging jbossws-spi-2.0.0.Alpha3
14 years, 5 months