[jboss-svn-commits] JBoss Common SVN: r4762 - in shrinkwrap/trunk: api and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 17 22:27:00 EDT 2010
Author: ALRubinger
Date: 2010-07-17 22:26:58 -0400 (Sat, 17 Jul 2010)
New Revision: 4762
Modified:
shrinkwrap/trunk/api/pom.xml
shrinkwrap/trunk/build/pom.xml
shrinkwrap/trunk/doc/reference/pom.xml
shrinkwrap/trunk/extension-classloader/pom.xml
shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java
shrinkwrap/trunk/extension-glassfish/pom.xml
shrinkwrap/trunk/extension-jetty-6/pom.xml
shrinkwrap/trunk/extension-jetty-7/pom.xml
shrinkwrap/trunk/extension-openejb/pom.xml
shrinkwrap/trunk/extension-tomcat-6/pom.xml
shrinkwrap/trunk/extension-vdf/pom.xml
shrinkwrap/trunk/extension-vfs3/pom.xml
shrinkwrap/trunk/impl-base/pom.xml
shrinkwrap/trunk/pom.xml
shrinkwrap/trunk/spi/pom.xml
Log:
[SHRINKWRAP-208] Bump project versions in preparation for release
Modified: shrinkwrap/trunk/api/pom.xml
===================================================================
--- shrinkwrap/trunk/api/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/api/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/build/pom.xml
===================================================================
--- shrinkwrap/trunk/build/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/build/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -18,7 +18,7 @@
<!-- Artifact Configuration -->
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<name>ShrinkWrap Build</name>
<description>ShrinkWrap Build Configuration</description>
<packaging>pom</packaging>
Modified: shrinkwrap/trunk/doc/reference/pom.xml
===================================================================
--- shrinkwrap/trunk/doc/reference/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/doc/reference/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-classloader/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-classloader/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-classloader/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java
===================================================================
--- shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-classloader/src/main/java/org/jboss/shrinkwrap/classloader/ShrinkWrapClassLoader.java 2010-07-18 02:26:58 UTC (rev 4762)
@@ -23,8 +23,8 @@
import java.net.URLClassLoader;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
@@ -52,8 +52,12 @@
// Instance Members -------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- private Map<URL, InputStream> openedStreams = new HashMap<URL, InputStream>();
-
+ /**
+ * Map of all streams opened, such that they may be closed in {@link ShrinkWrapClassLoader#close()}.
+ * Guarded by "this".
+ */
+ private final ConcurrentMap<URL, InputStream> openedStreams = new ConcurrentHashMap<URL, InputStream>();
+
//-------------------------------------------------------------------------------------||
// Constructors -----------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
@@ -68,7 +72,8 @@
*/
public ShrinkWrapClassLoader(final Archive<?>... archives)
{
- super(new URL[]{});
+ super(new URL[]
+ {});
if (archives == null)
{
@@ -87,7 +92,8 @@
*/
public ShrinkWrapClassLoader(final ClassLoader parent, final Archive<?>... archives)
{
- super(new URL[]{}, parent);
+ super(new URL[]
+ {}, parent);
if (archives == null)
{
@@ -119,14 +125,14 @@
public void connect() throws IOException
{
}
-
+
@Override
public InputStream getInputStream() throws IOException
{
- synchronized (openedStreams)
+ synchronized (this)
{
InputStream input = openedStreams.get(u);
- if(input == null)
+ if (input == null)
{
ArchivePath path = convertToArchivePath(u);
input = archive.get(path).getAsset().openStream();
@@ -135,35 +141,35 @@
return input;
}
}
-
+
private ArchivePath convertToArchivePath(URL url)
{
String path = url.getPath();
path = path.replace(archive.getName(), "");
-
+
return ArchivePaths.create(path);
}
};
}
}));
}
- catch (Exception e)
+ catch (Exception e)
{
throw new RuntimeException("Could not create URL for archive: " + archive.getName(), e);
}
}
-
+
public void close() throws IOException
{
- synchronized (openedStreams)
+ synchronized (this)
{
- for(InputStream stream : openedStreams.values())
+ for (InputStream stream : openedStreams.values())
{
try
{
stream.close();
}
- catch (Exception e)
+ catch (Exception e)
{
log.warning("Could not close opened inputstream: " + e);
}
Modified: shrinkwrap/trunk/extension-glassfish/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-glassfish/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-glassfish/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-jetty-6/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-jetty-6/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-jetty-6/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-jetty-7/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-jetty-7/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-jetty-7/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-openejb/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-openejb/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-openejb/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-tomcat-6/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-tomcat-6/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-tomcat-6/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-vdf/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-vdf/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-vdf/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/extension-vfs3/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-vfs3/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/extension-vfs3/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/impl-base/pom.xml
===================================================================
--- shrinkwrap/trunk/impl-base/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/impl-base/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
Modified: shrinkwrap/trunk/pom.xml
===================================================================
--- shrinkwrap/trunk/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -18,7 +18,7 @@
<!-- Artifact Information -->
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<packaging>pom</packaging>
<name>ShrinkWrap Aggregator</name>
<url>http://www.jboss.org</url>
Modified: shrinkwrap/trunk/spi/pom.xml
===================================================================
--- shrinkwrap/trunk/spi/pom.xml 2010-07-18 00:52:38 UTC (rev 4761)
+++ shrinkwrap/trunk/spi/pom.xml 2010-07-18 02:26:58 UTC (rev 4762)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-11</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
More information about the jboss-svn-commits
mailing list