JBossWS SVN: r9859 - in stack/native/trunk: modules/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-22 03:26:28 -0400 (Wed, 22 Apr 2009)
New Revision: 9859
Modified:
stack/native/trunk/modules/client/pom.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/jaxrpc/pom.xml
stack/native/trunk/modules/jaxws-ext/pom.xml
stack/native/trunk/modules/jaxws/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/pom.xml
stack/native/trunk/modules/saaj/pom.xml
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/trunk/modules/testsuite/native-tests/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
changing version
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/client/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/core/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/jaxrpc/pom.xml
===================================================================
--- stack/native/trunk/modules/jaxrpc/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/jaxrpc/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/jaxws/pom.xml
===================================================================
--- stack/native/trunk/modules/jaxws/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/jaxws/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/jaxws-ext/pom.xml
===================================================================
--- stack/native/trunk/modules/jaxws-ext/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/jaxws-ext/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/management/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/resources/pom.xml
===================================================================
--- stack/native/trunk/modules/resources/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/resources/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/saaj/pom.xml
===================================================================
--- stack/native/trunk/modules/saaj/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/saaj/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
+++ stack/native/trunk/pom.xml 2009-04-22 07:26:28 UTC (rev 9859)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -48,7 +48,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
15 years
JBossWS SVN: r9858 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-22 03:22:33 -0400 (Wed, 22 Apr 2009)
New Revision: 9858
Modified:
stack/metro/trunk/pom.xml
Log:
changing version
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
+++ stack/metro/trunk/pom.xml 2009-04-22 07:22:33 UTC (rev 9858)
@@ -45,7 +45,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
15 years
JBossWS SVN: r9857 - in stack/cxf/trunk: modules/client and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-22 03:20:06 -0400 (Wed, 22 Apr 2009)
New Revision: 9857
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
changing version
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/client/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/resources/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
+++ stack/cxf/trunk/pom.xml 2009-04-22 07:20:06 UTC (rev 9857)
@@ -17,7 +17,7 @@
<artifactId>jbossws-cxf</artifactId>
<packaging>pom</packaging>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -44,7 +44,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
15 years
JBossWS SVN: r9856 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-22 03:14:51 -0400 (Wed, 22 Apr 2009)
New Revision: 9856
Modified:
framework/trunk/pom.xml
Log:
changing version
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-04-22 06:55:40 UTC (rev 9855)
+++ framework/trunk/pom.xml 2009-04-22 07:14:51 UTC (rev 9856)
@@ -6,7 +6,7 @@
<artifactId>jbossws-framework</artifactId>
<packaging>jar</packaging>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
15 years
JBossWS SVN: r9855 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-22 02:55:40 -0400 (Wed, 22 Apr 2009)
New Revision: 9855
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
[JBWS-2437] improving exception message
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-04-21 16:30:02 UTC (rev 9854)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-04-22 06:55:40 UTC (rev 9855)
@@ -101,17 +101,18 @@
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
+ String resourceAbsPath = impResourceFile.getCanonicalPath();
+ if (resourceAbsPath.indexOf(wsdlLocFilePath) >= 0
+ || resourceAbsPath.indexOf(wsdlDataLoc) >= 0
|| (wsdlPublishLoc != null
- && impResourceFile.getCanonicalPath().indexOf(new File(new URL(wsdlPublishLoc).getPath()).getCanonicalPath()) >= 0))
+ && resourceAbsPath.indexOf(new File(new URL(wsdlPublishLoc).getPath()).getCanonicalPath()) >= 0))
{
Element wsdlElement = DOMUtils.parse(impResourceFile.toURL().openStream());
wsdlDoc = wsdlElement.getOwnerDocument();
}
else
{
- throw new IOException("Access to this resource is not allowed");
+ throw new IOException("Access to '" + resourceAbsPath + "' resource is not allowed");
}
}
15 years
JBossWS SVN: r9854 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-21 12:30:02 -0400 (Tue, 21 Apr 2009)
New Revision: 9854
Modified:
stack/metro/trunk/pom.xml
Log:
Using spi snapshot
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-04-21 16:29:28 UTC (rev 9853)
+++ stack/metro/trunk/pom.xml 2009-04-21 16:30:02 UTC (rev 9854)
@@ -46,7 +46,7 @@
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
15 years
JBossWS SVN: r9853 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-21 12:29:28 -0400 (Tue, 21 Apr 2009)
New Revision: 9853
Modified:
stack/native/trunk/pom.xml
Log:
Using spi snapshot
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-04-21 16:26:24 UTC (rev 9852)
+++ stack/native/trunk/pom.xml 2009-04-21 16:29:28 UTC (rev 9853)
@@ -49,7 +49,7 @@
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
15 years
JBossWS SVN: r9852 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-21 12:26:24 -0400 (Tue, 21 Apr 2009)
New Revision: 9852
Modified:
stack/cxf/trunk/pom.xml
Log:
Using spi snapshot
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-04-21 16:18:03 UTC (rev 9851)
+++ stack/cxf/trunk/pom.xml 2009-04-21 16:26:24 UTC (rev 9852)
@@ -45,7 +45,7 @@
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
15 years
JBossWS SVN: r9851 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-21 12:18:03 -0400 (Tue, 21 Apr 2009)
New Revision: 9851
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java
Log:
[JBWS-2619] Using additional metadata files
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2009-04-21 16:17:13 UTC (rev 9850)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2009-04-21 16:18:03 UTC (rev 9851)
@@ -24,7 +24,10 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Iterator;
+import java.util.List;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -40,6 +43,10 @@
private ArchiveDeployment parent;
// The root file for this deployment
private UnifiedVirtualFile rootFile;
+
+ private static Logger log = Logger.getLogger(ArchiveDeploymentImpl.class);
+
+ private List<UnifiedVirtualFile> metadataFiles;
ArchiveDeploymentImpl(String simpleName, ClassLoader classLoader)
{
@@ -94,11 +101,60 @@
if (resourceURL == null && getRootFile() != null)
{
- UnifiedVirtualFile vfResource = getRootFile().findChild(resourcePath);
- resourceURL = vfResource.toURL();
+ try
+ {
+ UnifiedVirtualFile vfResource = getRootFile().findChild(resourcePath);
+ resourceURL = vfResource.toURL();
+ }
+ catch (IOException e)
+ {
+ if (metadataFiles == null || metadataFiles.isEmpty())
+ {
+ throw e;
+ }
+ else
+ {
+ log.debug("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e);
+ }
+
+ }
}
+ //scan additional metadata files (for instance originally attached to a VFSDeploymentUnit)
+ if (resourceURL == null && metadataFiles != null && !metadataFiles.isEmpty())
+ {
+ UnifiedVirtualFile vfResource = null;
+ for (Iterator<UnifiedVirtualFile> it = getMetadataFiles().iterator(); it.hasNext() && vfResource != null; )
+ {
+ UnifiedVirtualFile uvf = it.next();
+ if (resourcePath.equals(uvf.getName()))
+ vfResource = uvf;
+ else
+ {
+ try
+ {
+ vfResource = uvf.findChild(resourcePath);
+ }
+ catch (IOException e)
+ {
+ log.debug("Cannot get " + resourcePath + " from " + uvf, e);
+ }
+ }
+ }
+ if (vfResource == null)
+ throw new IOException("Could not find " + resourcePath + " in the additional metadatafiles!");
+ }
}
return resourceURL;
}
+
+ public List<UnifiedVirtualFile> getMetadataFiles()
+ {
+ return metadataFiles;
+ }
+
+ public void setMetadataFiles(List<UnifiedVirtualFile> metadataFiles)
+ {
+ this.metadataFiles = metadataFiles;
+ }
}
15 years
JBossWS SVN: r9850 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-21 12:17:13 -0400 (Tue, 21 Apr 2009)
New Revision: 9850
Modified:
framework/trunk/pom.xml
Log:
Using spi snapshot
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-04-21 16:12:51 UTC (rev 9849)
+++ framework/trunk/pom.xml 2009-04-21 16:17:13 UTC (rev 9850)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
- <jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jbossxb.version>1.0.0.SP1</jbossxb.version>
</properties>
15 years