JBossWS SVN: r8970 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 09:20:15 -0500 (Tue, 06 Jan 2009)
New Revision: 8970
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2431] do not deploy jaxb-api and stax-api to JBOSSAS_HOME/lib directory
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-06 14:19:59 UTC (rev 8969)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-06 14:20:15 UTC (rev 8970)
@@ -126,9 +126,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
@@ -143,9 +141,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
15 years, 12 months
JBossWS SVN: r8969 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 09:19:59 -0500 (Tue, 06 Jan 2009)
New Revision: 8969
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2431] do not deploy jaxb-api and stax-api to JBOSSAS_HOME/lib directory
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 2009-01-06 14:19:48 UTC (rev 8968)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-06 14:19:59 UTC (rev 8969)
@@ -132,9 +132,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
@@ -149,9 +147,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
15 years, 12 months
JBossWS SVN: r8968 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 09:19:48 -0500 (Tue, 06 Jan 2009)
New Revision: 8968
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2431] do not deploy jaxb-api and stax-api to JBOSSAS_HOME/lib directory
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-06 13:02:59 UTC (rev 8967)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-06 14:19:48 UTC (rev 8968)
@@ -143,9 +143,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
@@ -160,9 +158,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
15 years, 12 months
JBossWS SVN: r8967 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 08:02:59 -0500 (Tue, 06 Jan 2009)
New Revision: 8967
Modified:
stack/cxf/trunk/pom.xml
Log:
switch to new framework
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-01-06 13:02:48 UTC (rev 8966)
+++ stack/cxf/trunk/pom.xml 2009-01-06 13:02:59 UTC (rev 8967)
@@ -45,7 +45,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.framework.version>3.0.5.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
<jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.5.GA</jbossws.jboss423.version>
15 years, 12 months
JBossWS SVN: r8966 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 08:02:48 -0500 (Tue, 06 Jan 2009)
New Revision: 8966
Modified:
stack/metro/trunk/pom.xml
Log:
switch to new framework
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-01-06 13:02:37 UTC (rev 8965)
+++ stack/metro/trunk/pom.xml 2009-01-06 13:02:48 UTC (rev 8966)
@@ -46,7 +46,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.framework.version>3.0.5.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
<jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.5.GA</jbossws.jboss423.version>
15 years, 12 months
JBossWS SVN: r8965 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 08:02:37 -0500 (Tue, 06 Jan 2009)
New Revision: 8965
Modified:
stack/native/trunk/pom.xml
Log:
switch to new framework
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-01-06 11:38:50 UTC (rev 8964)
+++ stack/native/trunk/pom.xml 2009-01-06 13:02:37 UTC (rev 8965)
@@ -49,7 +49,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8.GA</jbossws.common.version>
- <jbossws.framework.version>3.0.5.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
<jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.5.GA</jbossws.jboss423.version>
15 years, 12 months
JBossWS SVN: r8964 - in framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF: wsdl and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-06 06:38:50 -0500 (Tue, 06 Jan 2009)
New Revision: 8964
Added:
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
Removed:
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/schema/
Modified:
framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl
Log:
[JBWS-2437] updating test
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl 2009-01-06 09:37:55 UTC (rev 8963)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl 2009-01-06 11:38:50 UTC (rev 8964)
@@ -5,7 +5,7 @@
<xsd:schema elementFormDefault="qualified" targetNamespace="http://jbws2009.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws2009.jaxws.ws.test.jboss.org/"
xmlns:xns4="http://jbws2009.jaxws.ws.test.jboss.org/java/lang/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:import namespace="urn:BaseComponents" schemaLocation="../schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/>
+ <xsd:import namespace="urn:BaseComponents" schemaLocation="./schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/>
<xsd:element name="getCountryCodes">
<xsd:complexType>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd 2009-01-06 11:38:50 UTC (rev 8964)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified"
+ xmlns:bc="urn:BaseComponents"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import namespace="urn:BaseComponents" schemaLocation="../../imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/>
+ <xs:simpleType name="CountryType">
+ <xs:restriction base="bc:CountryCodeType"/>
+ </xs:simpleType>
+ <xs:simpleType name="CurrencyType">
+ <xs:restriction base="bc:CurrencyCodeType"/>
+ </xs:simpleType>
+</xs:schema>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd 2009-01-06 11:38:50 UTC (rev 8964)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:BaseComponents" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:cc="urn:CoreComponentTypes"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import namespace="urn:CoreComponentTypes" schemaLocation="../../../common/1.0-SNAPSHOT/CoreComponentTypes.xsd"/>
+ <xs:simpleType name="CountryCodeType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="DE"/>
+ <xs:enumeration value="CZ"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="CurrencyCodeType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="CZK"/>
+ <xs:enumeration value="EUR"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="RequestType">
+ <xs:restriction base="cc:CountryType"/>
+ </xs:simpleType>
+ <xs:simpleType name="ResponseType">
+ <xs:restriction base="cc:CurrencyType"/>
+ </xs:simpleType>
+</xs:schema>
\ No newline at end of file
15 years, 12 months
JBossWS SVN: r8963 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-01-06 04:37:55 -0500 (Tue, 06 Jan 2009)
New Revision: 8963
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
[JBWS-2437] Fixed Regression
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-01-05 18:44:31 UTC (rev 8962)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-01-06 09:37:55 UTC (rev 8963)
@@ -27,8 +27,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -90,7 +93,16 @@
File impResourceFile = new File(impResourcePath);
String wsdlPublishLoc = epMetaData.getServiceMetaData().getWsdlPublishLocation();
- if (impResourceFile.getCanonicalPath().indexOf(wsdlLocFile.getParentFile().getCanonicalPath()) >= 0
+ log.debug("Importing resource file: " + impResourceFile.getCanonicalPath());
+
+ String wsdlLocFilePath = wsdlLocFile.getParentFile().getCanonicalPath();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ String wsdlDataLoc = serverConfig.getServerDataDir().getCanonicalPath() + File.separatorChar + "wsdl";
+
+ //allow wsdl file's parent or server's data/wsdl or overriden wsdl publish directories only
+ if (impResourceFile.getCanonicalPath().indexOf(wsdlLocFilePath) >= 0
+ || impResourceFile.getCanonicalPath().indexOf(wsdlDataLoc) >= 0
|| (wsdlPublishLoc != null
&& impResourceFile.getCanonicalPath().indexOf(new File(new URL(wsdlPublishLoc).getPath()).getCanonicalPath()) >= 0))
{
15 years, 12 months