JBossWS SVN: r10029 - framework/branches/jbossws-framework-3.1.2.SP1/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-11 05:01:58 -0400 (Mon, 11 May 2009)
New Revision: 10029
Modified:
framework/branches/jbossws-framework-3.1.2.SP1/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java
Log:
[JBWS-2619] Committing Daniel's patch for ".."/"." issue
Modified: framework/branches/jbossws-framework-3.1.2.SP1/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2.SP1/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2009-05-11 07:48:31 UTC (rev 10028)
+++ framework/branches/jbossws-framework-3.1.2.SP1/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2009-05-11 09:01:58 UTC (rev 10029)
@@ -24,7 +24,6 @@
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;
@@ -43,9 +42,9 @@
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)
@@ -116,51 +115,45 @@
{
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;)
+ for (UnifiedVirtualFile metadataFile : getMetadataFiles())
{
- UnifiedVirtualFile uvf = it.next();
- URL wsdlUrl = uvf.toURL();
- String wsdlPath = wsdlUrl.getPath();
- if (wsdlPath.startsWith("/"))
- wsdlPath = wsdlPath.substring(1);
- if (resourcePath.equals(wsdlPath))
+ try
{
- vfResource = uvf;
- }
- else
- {
- try
+ UnifiedVirtualFile child = metadataFile.findChild(resourcePath);
+ if (child != null)
{
- vfResource = uvf.findChild(resourcePath);
+ vfResource = child;
+ break;
}
- catch (IOException e)
- {
- log.debug("Cannot get " + resourcePath + " from " + uvf, e);
- }
}
+ catch (IOException e)
+ {
+ log.debug("Cannot get " + resourcePath + " from " + metadataFile, e);
+ }
}
+
if (vfResource == null)
throw new IOException("Could not find " + resourcePath + " in the additional metadatafiles!");
-
+
resourceURL = vfResource.toURL();
}
}
return resourceURL;
}
-
+
public List<UnifiedVirtualFile> getMetadataFiles()
{
return metadataFiles;
}
-
+
public void setMetadataFiles(List<UnifiedVirtualFile> metadataFiles)
{
this.metadataFiles = metadataFiles;
15 years
JBossWS SVN: r10027 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-11 03:42:14 -0400 (Mon, 11 May 2009)
New Revision: 10027
Added:
framework/branches/jbossws-framework-3.1.2.SP1/
Log:
Creating new jbossws-framework 3.1.2.SP1 branch
Copied: framework/branches/jbossws-framework-3.1.2.SP1 (from rev 10026, framework/tags/jbossws-framework-3.1.2.GA)
15 years
JBossWS SVN: r10026 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-08 12:17:52 -0400 (Fri, 08 May 2009)
New Revision: 10026
Modified:
stack/cxf/trunk/pom.xml
Log:
Using GA container integrations
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-05-08 16:17:18 UTC (rev 10025)
+++ stack/cxf/trunk/pom.xml 2009-05-08 16:17:52 UTC (rev 10026)
@@ -46,8 +46,8 @@
<jbossws.common.version>1.1.1-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.2-SNAPSHOT</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
15 years
JBossWS SVN: r10025 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-08 12:17:18 -0400 (Fri, 08 May 2009)
New Revision: 10025
Modified:
stack/metro/trunk/pom.xml
Log:
Using GA container integrations
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-05-08 16:16:43 UTC (rev 10024)
+++ stack/metro/trunk/pom.xml 2009-05-08 16:17:18 UTC (rev 10025)
@@ -47,8 +47,8 @@
<jbossws.common.version>1.1.1-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.2-SNAPSHOT</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
15 years
JBossWS SVN: r10024 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-08 12:16:43 -0400 (Fri, 08 May 2009)
New Revision: 10024
Modified:
stack/native/trunk/pom.xml
Log:
Using GA container integration
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-05-08 13:34:57 UTC (rev 10023)
+++ stack/native/trunk/pom.xml 2009-05-08 16:16:43 UTC (rev 10024)
@@ -50,8 +50,8 @@
<jbossws.common.version>1.1.1-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.jboss500.version>3.1.2-SNAPSHOT</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
15 years
JBossWS SVN: r10023 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-08 09:34:57 -0400 (Fri, 08 May 2009)
New Revision: 10023
Added:
stack/native/tags/jbossws-native-3.1.2.GA/
Removed:
stack/native/branches/jbossws-native-3.1.2/
Log:
[JBWS-2642] Tagging jbossws-native-3.1.2.GA
Copied: stack/native/tags/jbossws-native-3.1.2.GA (from rev 10022, stack/native/branches/jbossws-native-3.1.2)
15 years
JBossWS SVN: r10021 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-08 09:33:03 -0400 (Fri, 08 May 2009)
New Revision: 10021
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/jaxrpc/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/jaxws-ext/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/saaj/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
[JBWS-2642] Preparing for tagging
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/jaxrpc/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/jaxrpc/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/jaxrpc/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/jaxws/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/jaxws-ext/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/jaxws-ext/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/jaxws-ext/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/saaj/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/saaj/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/saaj/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-05-08 11:27:00 UTC (rev 10020)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-05-08 13:33:03 UTC (rev 10021)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.GA</version>
<!-- Parent -->
<parent>
@@ -47,11 +47,11 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.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.2-SNAPSHOT</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.1.2-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.common.version>1.1.0.GA</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.GA</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.GA</jbossws.spi.version>
+ <jbossws.jboss500.version>3.1.2.GA</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.2.GA</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
15 years