[jboss-svn-commits] JBoss Common SVN: r4730 - in shrinkwrap/trunk/extension-tomcat: src/main/java/org/jboss/shrinkwrap/tomcat/api and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-07-15 00:44:25 -0400 (Thu, 15 Jul 2010)
New Revision: 4730

Modified:
   shrinkwrap/trunk/extension-tomcat/pom.xml
   shrinkwrap/trunk/extension-tomcat/src/main/java/org/jboss/shrinkwrap/tomcat/api/ShrinkWrapStandardContext.java
   shrinkwrap/trunk/extension-tomcat/src/main/resources/META-INF/services/org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext
Log:
SHRINKWRAP-198 link to SNAPSHOT


Modified: shrinkwrap/trunk/extension-tomcat/pom.xml
===================================================================
--- shrinkwrap/trunk/extension-tomcat/pom.xml	2010-07-15 04:35:27 UTC (rev 4729)
+++ shrinkwrap/trunk/extension-tomcat/pom.xml	2010-07-15 04:44:25 UTC (rev 4730)
@@ -5,21 +5,18 @@
    <parent>
       <groupId>org.jboss.shrinkwrap</groupId>
       <artifactId>shrinkwrap-build</artifactId>
-      <!-- temporary while we link against 1.0.0-alpha-10 -->
-      <version>1.0.0-alpha-10</version>
+      <version>1.0.0-SNAPSHOT</version>
       <relativePath>../build/pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
 
    <artifactId>shrinkwrap-extension-tomcat</artifactId>
-   <!-- temporary while we link against 1.0.0-alpha-10 -->
-   <version>1.0.0-SNAPSHOT</version>
    <name>ShrinkWrap Tomcat Integration Extension</name>
    <description>ShrinkWrap integration extension for the Jetty Project</description>
 
    <properties>
-      <!-- Known to work with Tomcat version 6.0.13 and up (that's the minimum version in central) -->
+      <!-- Known to work with Tomcat version 6.0.13 and up (that's the minimum version available in central) -->
       <version.org.apache.tomcat_tomcat>6.0.26</version.org.apache.tomcat_tomcat>
       <version.org.apache.httpcomponents_httpclient>4.0.1</version.org.apache.httpcomponents_httpclient>
    </properties>
@@ -29,16 +26,14 @@
       <dependency>
          <groupId>org.jboss.shrinkwrap</groupId>
          <artifactId>shrinkwrap-api</artifactId>
-         <!-- temporary while we link against 1.0.0-alpha-10 -->
-         <version>1.0.0-alpha-10</version>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.shrinkwrap</groupId>
          <artifactId>shrinkwrap-impl-base</artifactId>
-         <!-- temporary while we link against 1.0.0-alpha-10 -->
-         <version>1.0.0-alpha-10</version>
          <scope>test</scope>
+         <version>${project.version}</version>
       </dependency>
 
       <dependency>

Modified: shrinkwrap/trunk/extension-tomcat/src/main/java/org/jboss/shrinkwrap/tomcat/api/ShrinkWrapStandardContext.java
===================================================================
--- shrinkwrap/trunk/extension-tomcat/src/main/java/org/jboss/shrinkwrap/tomcat/api/ShrinkWrapStandardContext.java	2010-07-15 04:35:27 UTC (rev 4729)
+++ shrinkwrap/trunk/extension-tomcat/src/main/java/org/jboss/shrinkwrap/tomcat/api/ShrinkWrapStandardContext.java	2010-07-15 04:44:25 UTC (rev 4730)
@@ -63,11 +63,6 @@
    private static final String EXPORT_FILE_PREFIX = "export";
 
    /**
-    * The folder name of the Tomcat work directory
-    */
-   private static final String WORK_FOLDER = "work";
-
-   /**
     * Temporary directory into which we'll extract the {@link WebArchive}s
     */
    private static final File TMP_DIR;
@@ -139,7 +134,7 @@
       }
       catch (IOException e)
       {
-         throw new RuntimeException("Could not create temporary File in " + TMP_DIR + " to write exported archive", e);
+         throw new RuntimeException("Could not create temporary File in \"" + TMP_DIR + "\" to write exported archive", e);
       }
       // We are overwriting the temporary file placeholder reserved by File#createTemplateFile()
       archive.as(ZipExporter.class).exportZip(exported, true);
@@ -152,7 +147,7 @@
       this.setDocBase(exported.getAbsolutePath());
       // context path must begin with a /
       this.setPath(ROOT + baseName);
-      // we want to be as efficient as possible, so default to not unpack, save config or cache
+      // we want to be as efficient as possible, so disable unpack, save config or cache by default
       this.setUnpackWAR(false);
       this.setSaveConfig(false);
       this.setCachingAllowed(false);

Modified: shrinkwrap/trunk/extension-tomcat/src/main/resources/META-INF/services/org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext
===================================================================
--- shrinkwrap/trunk/extension-tomcat/src/main/resources/META-INF/services/org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext	2010-07-15 04:35:27 UTC (rev 4729)
+++ shrinkwrap/trunk/extension-tomcat/src/main/resources/META-INF/services/org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext	2010-07-15 04:44:25 UTC (rev 4730)
@@ -1 +1 @@
-org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext
\ No newline at end of file
+implementingClassName=org.jboss.shrinkwrap.tomcat.api.ShrinkWrapStandardContext