JBossWS SVN: r15042 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:40:57 -0400 (Fri, 07 Oct 2011)
New Revision: 15042
Added:
common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityActions.java
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java
Log:
[JBWS-3366] Use DeploymentAspect::getLoader to set the TCCL before starting/stopping DA in DeploymentAspectManagerImpl
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java 2011-10-07 08:37:57 UTC (rev 15041)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspectManagerImpl.java 2011-10-07 08:40:57 UTC (rev 15042)
@@ -123,8 +123,19 @@
DeploymentAspect aspect = getDeploymentAspects().get(i);
try
{
- logInvocation(aspect, "Start");
- aspect.start(dep);
+ if (aspect.canHandle(dep)) {
+ logInvocation(aspect, "Start");
+ ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(aspect.getLoader());
+ aspect.start(dep);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(origClassLoader);
+ }
+ }
}
catch (RuntimeException rte)
{
Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityActions.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityActions.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityActions.java 2011-10-07 08:40:57 UTC (rev 15042)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.ws.common.deployment;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Security actions for this package
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Oct-2011
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the context classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+}
\ No newline at end of file
14 years, 2 months
JBossWS SVN: r15041 - in spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi: deployment and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:37:57 -0400 (Fri, 07 Oct 2011)
New Revision: 15041
Modified:
spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
Log:
- Adding jaxrpc integration classloader retrieval method in ClassLoaderProvider
- Adding flag for deployment/classloader type in ServletDelegateFactory
Modified: spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
===================================================================
--- spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-10-07 08:35:14 UTC (rev 15040)
+++ spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-10-07 08:37:57 UTC (rev 15041)
@@ -46,6 +46,12 @@
{
return getContextClassLoader();
}
+
+ @Override
+ public ClassLoader getServerJAXRPCIntegrationClassLoader()
+ {
+ return getContextClassLoader();
+ }
};
public static void setDefaultProvider(ClassLoaderProvider p)
@@ -66,12 +72,19 @@
public abstract ClassLoader getWebServiceSubsystemClassLoader();
/**
- * Return the ClassLoader instance having visibility over the all server side ws libraries
+ * Return the ClassLoader instance having visibility over the all server side ws libraries (for JAXWS usage)
*
* @return
*/
public abstract ClassLoader getServerIntegrationClassLoader();
+ /**
+ * Return the ClassLoader instance having visibility over the all server side ws libraries (for JAXRPC usage)
+ *
+ * @return
+ */
+ public abstract ClassLoader getServerJAXRPCIntegrationClassLoader();
+
static ClassLoader getContextClassLoader()
{
if (System.getSecurityManager() == null)
Modified: spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
===================================================================
--- spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-10-07 08:35:14 UTC (rev 15040)
+++ spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-10-07 08:37:57 UTC (rev 15041)
@@ -30,5 +30,5 @@
*/
public interface ServletDelegateFactory
{
- public ServletDelegate newServletDelegate(String delegateClassName);
+ public ServletDelegate newServletDelegate(String delegateClassName, boolean isJaxWs);
}
Modified: spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
===================================================================
--- spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-10-07 08:35:14 UTC (rev 15040)
+++ spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-10-07 08:37:57 UTC (rev 15041)
@@ -43,6 +43,7 @@
public class WSFServlet extends HttpServlet
{
public static final String STACK_SERVLET_DELEGATE_CLASS = "org.jboss.wsf.spi.deployment.stackServletDelegateClass";
+ public static final String INTEGRATION_CLASSLOADER = "org.jboss.wsf.spi.deployment.integrationClassLoader";
private ServletDelegate delegate = null;
@@ -73,7 +74,8 @@
ClassLoader cl = clProvider.getWebServiceSubsystemClassLoader();
ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl);
ServletDelegateFactory factory = sl.iterator().next();
- return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS));
+ boolean isJaxWs = DeploymentType.JAXWS.toString().equals(servletConfig.getInitParameter(INTEGRATION_CLASSLOADER));
+ return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS), isJaxWs);
}
@Override
14 years, 2 months
JBossWS SVN: r15040 - spi/branches.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:35:14 -0400 (Fri, 07 Oct 2011)
New Revision: 15040
Added:
spi/branches/JBWS-3366/
Log:
Branching for working on jaxrpc functionalities for AS7
14 years, 2 months
JBossWS SVN: r15039 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2268.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-05 06:52:24 -0400 (Wed, 05 Oct 2011)
New Revision: 15039
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
Log:
endpoints cannot be final classes
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java 2011-10-05 09:09:12 UTC (rev 15038)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java 2011-10-05 10:52:24 UTC (rev 15039)
@@ -38,7 +38,7 @@
targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2268",
endpointInterface="org.jboss.test.ws.jaxws.jbws2268.EndpointInterface"
)
-public final class EndpointImpl
+public class EndpointImpl
{
private StringBuilder builder = new StringBuilder();
14 years, 2 months
JBossWS SVN: r15038 - stack/native/trunk/modules/core/src/main/resources/schema.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-05 05:09:12 -0400 (Wed, 05 Oct 2011)
New Revision: 15038
Modified:
stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd
stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd
stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd
Log:
[JBWS-3365] Uncommenting some DOCTYPEs
Modified: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2011-10-05 08:08:07 UTC (rev 15037)
+++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2011-10-05 09:09:12 UTC (rev 15038)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
<!--
W3C XML Schema defined in the Web Services Addressing 1.0
- Metadata specification
@@ -63,4 +63,4 @@
</xs:complexType>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
Modified: stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd 2011-10-05 08:08:07 UTC (rev 15037)
+++ stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd 2011-10-05 09:09:12 UTC (rev 15038)
@@ -15,7 +15,7 @@
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-->
-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2003/11/wsdl" targetNamespace="http://www.w3.org/2003/11/wsdl" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
@@ -325,4 +325,4 @@
<xs:attribute ref="wsdl:required" use="optional"/>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
Modified: stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2011-10-05 08:08:07 UTC (rev 15037)
+++ stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2011-10-05 09:09:12 UTC (rev 15038)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--DOCTYPE schema
+<!DOCTYPE schema
PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
[
<!ATTLIST schema
@@ -7,7 +7,7 @@
<!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
<!ENTITY % p ''>
<!ENTITY % s ''>
- ]-->
+ ]>
<!-- Schema for XML Signatures
http://www.w3.org/2000/09/xmldsig#
14 years, 2 months
JBossWS SVN: r15037 - stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-05 04:08:07 -0400 (Wed, 05 Oct 2011)
New Revision: 15037
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
Log:
adding javax.ejb.api
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-10-05 08:07:54 UTC (rev 15036)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-10-05 08:08:07 UTC (rev 15037)
@@ -31,6 +31,7 @@
<dependencies>
<module name="javax.annotation.api"/>
<module name="javax.api"/>
+ <module name="javax.ejb.api"/>
<module name="javax.jws.api"/>
<module name="javax.servlet.api"/>
<module name="javax.xml.ws.api"/>
14 years, 2 months
JBossWS SVN: r15036 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-05 04:07:54 -0400 (Wed, 05 Oct 2011)
New Revision: 15036
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
Log:
adding javax.ejb.api
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-10-04 14:13:03 UTC (rev 15035)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-10-05 08:07:54 UTC (rev 15036)
@@ -31,6 +31,7 @@
<dependencies>
<module name="javax.annotation.api"/>
<module name="javax.api"/>
+ <module name="javax.ejb.api"/>
<module name="javax.jws.api"/>
<module name="javax.servlet.api"/>
<module name="javax.xml.ws.api"/>
14 years, 2 months
JBossWS SVN: r15035 - in common/trunk/src/main/java/org/jboss/ws/common: utils and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-04 10:13:03 -0400 (Tue, 04 Oct 2011)
New Revision: 15035
Modified:
common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
Log:
[JBWS-3365] Use a dedicated DocumentBuilfer for WSDL file publishing
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java 2011-10-04 06:39:08 UTC (rev 15034)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java 2011-10-04 14:13:03 UTC (rev 15035)
@@ -142,40 +142,41 @@
}
}
- @SuppressWarnings("deprecation")
- private void setEntityResolver(DocumentBuilder builder)
+ };
+
+ @SuppressWarnings("deprecation")
+ private static void setEntityResolver(DocumentBuilder builder)
+ {
+ EntityResolver entityResolver = null;
+ try
{
- EntityResolver entityResolver = null;
- try
+ entityResolver = new JBossWSEntityResolver();
+ }
+ catch (Throwable t)
+ {
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("Cannot load JBossWSEntityResolver");
+ String[] resolvers = new String[] { "org.jboss.util.xml.JBossEntityResolver" };
+ ClassLoader loader = SecurityActions.getContextClassLoader();
+ for (String resolver : resolvers)
{
- entityResolver = new JBossWSEntityResolver();
- }
- catch (Throwable t)
- {
- boolean debugEnabled = log.isDebugEnabled();
- if (debugEnabled)
- log.debug("Cannot load JBossWSEntityResolver");
- String[] resolvers = new String[] { "org.jboss.util.xml.JBossEntityResolver" };
- ClassLoader loader = SecurityActions.getContextClassLoader();
- for (String resolver : resolvers)
+ try
{
- try
- {
- Class<?> resolverClass = SecurityActions.loadClass(loader, resolver);
- entityResolver = (EntityResolver)resolverClass.newInstance();
- break;
- }
- catch (Exception ex)
- {
- if (debugEnabled)
- log.debug("Cannot load: " + resolver);
- }
+ Class<?> resolverClass = SecurityActions.loadClass(loader, resolver);
+ entityResolver = (EntityResolver)resolverClass.newInstance();
+ break;
}
+ catch (Exception ex)
+ {
+ if (debugEnabled)
+ log.debug("Cannot load: " + resolver);
+ }
}
- if (entityResolver != null)
- builder.setEntityResolver(entityResolver);
}
- };
+ if (entityResolver != null)
+ builder.setEntityResolver(entityResolver);
+ }
private static void initializeFactory(final DocumentBuilderFactory factory)
{
@@ -211,6 +212,26 @@
private DOMUtils()
{
}
+
+ /**
+ * Creates a new DocumentBuilder instance using the provided DocumentBuilderFactory
+ *
+ * @param factory
+ * @return
+ */
+ public static DocumentBuilder newDocumentBuilder(final DocumentBuilderFactory factory)
+ {
+ try
+ {
+ final DocumentBuilder builder = factory.newDocumentBuilder();
+ setEntityResolver(builder);
+ return builder;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "UNABLE_TO_CREATE_DOCUMENT_BUILDER"), e);
+ }
+ }
/**
* Initialize the DocumentBuilder, set the current thread association and returns it
@@ -239,14 +260,12 @@
/**
* Parse the given XML stream and return the root Element
- * This uses the document builder associated with the current thread.
*/
- public static Element parse(InputStream xmlStream) throws IOException
+ public static Element parse(InputStream xmlStream, DocumentBuilder builder) throws IOException
{
try
{
Document doc;
- DocumentBuilder builder = getDocumentBuilder();
synchronized (builder) //synchronize to prevent concurrent parsing on the same DocumentBuilder
{
doc = builder.parse(xmlStream);
@@ -262,6 +281,16 @@
xmlStream.close();
}
}
+
+ /**
+ * Parse the given XML stream and return the root Element
+ * This uses the document builder associated with the current thread.
+ */
+ public static Element parse(InputStream xmlStream) throws IOException
+ {
+ DocumentBuilder builder = getDocumentBuilder();
+ return parse(xmlStream, builder);
+ }
/**
* Parse the given input source and return the root Element.
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2011-10-04 06:39:08 UTC (rev 15034)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2011-10-04 14:13:03 UTC (rev 15035)
@@ -36,6 +36,10 @@
import javax.wsdl.Definition;
import javax.wsdl.Import;
import javax.wsdl.factory.WSDLFactory;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
@@ -67,6 +71,8 @@
// The server config
protected ServerConfig serverConfig;
+ private static DocumentBuilder builder;
+
public AbstractWSDLFilePublisher(ArchiveDeployment dep)
{
this.dep = dep;
@@ -88,6 +94,36 @@
}
}
+ private static synchronized DocumentBuilder getDocumentBuilder()
+ {
+ if (builder == null)
+ {
+ final ClassLoader classLoader = SecurityActions.getContextClassLoader();
+ SecurityActions.setContextClassLoader(AbstractWSDLFilePublisher.class.getClassLoader());
+ try
+ {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setValidating(false);
+ factory.setNamespaceAware(true);
+ factory.setExpandEntityReferences(false);
+ try
+ {
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ }
+ catch (ParserConfigurationException pce)
+ {
+ log.error(pce);
+ }
+ builder = DOMUtils.newDocumentBuilder(factory);
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(classLoader);
+ }
+ }
+ return builder;
+ }
+
/** Publish the wsdl imports for a given wsdl definition
*/
@SuppressWarnings("unchecked")
@@ -132,7 +168,7 @@
publishWsdlImports(targetURL, subdef, published);
// Publish XMLSchema imports
- Element subdoc = DOMUtils.parse(targetURL.openStream());
+ Element subdoc = DOMUtils.parse(targetURL.openStream(), getDocumentBuilder());
publishSchemaImports(targetURL, subdoc, published);
}
}
@@ -203,7 +239,7 @@
log.debug("XMLSchema import published to: " + xsdURL);
// recursively publish imports
- Element subdoc = DOMUtils.parse(xsdURL.openStream());
+ Element subdoc = DOMUtils.parse(xsdURL.openStream(), getDocumentBuilder());
publishSchemaImports(xsdURL, subdoc, published);
}
}
@@ -243,7 +279,7 @@
else
{
if (file.delete() == false)
- log.warn(BundleUtils.getMessage(bundle, "CANNOT_DELETE_PUBLISHED_WSDL_DOCUMENT", file.toURL()));
+ log.warn(BundleUtils.getMessage(bundle, "CANNOT_DELETE_PUBLISHED_WSDL_DOCUMENT", file.toURI().toURL()));
}
}
14 years, 2 months
JBossWS SVN: r15034 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-04 02:39:08 -0400 (Tue, 04 Oct 2011)
New Revision: 15034
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling @WebServiceRef tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-04 06:35:53 UTC (rev 15033)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-04 06:39:08 UTC (rev 15034)
@@ -1231,13 +1231,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
<exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> <!-- [AS7-1407] affects this test -->
- <!-- @WebServiceRef / webserviceref not implemented / ready yet on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
-
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1263,6 +1256,7 @@
<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: r15033 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-04 02:35:53 -0400 (Tue, 04 Oct 2011)
New Revision: 15033
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
enabling @WebServiceRef tests
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-03 14:22:36 UTC (rev 15032)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-04 06:35:53 UTC (rev 15033)
@@ -993,12 +993,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
<exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</exclude> <!-- [AS7-1407] affects this test -->
- <!-- TODO: Native webserviceref stuff -->
- <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</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