tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tveron...@apache.org
Subject svn commit: r1531059 - in /tomee/tomee/trunk: examples/moviefun-rest/ tomee/apache-tomee/src/main/groovy/commands/ tomee/tomee-common/ tomee/tomee-jaxrs-webapp/src/main/assembly/ tomee/tomee-plus-webapp/src/main/assembly/ tomee/tomee-static-content/ to...
Date Thu, 10 Oct 2013 17:45:36 GMT
Author: tveronezi
Date: Thu Oct 10 17:45:36 2013
New Revision: 1531059

URL: http://svn.apache.org/r1531059
Log:
https://issues.apache.org/jira/browse/TOMEE-1036
renaming static web content modules
removing it from "tomee/lib"

Modified:
    tomee/tomee/trunk/examples/moviefun-rest/pom.xml
    tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
    tomee/tomee/trunk/tomee/tomee-common/pom.xml
    tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml
    tomee/tomee/trunk/tomee/tomee-plus-webapp/src/main/assembly/war.xml
    tomee/tomee/trunk/tomee/tomee-static-content/backbone/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/codemirror/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/handlebars/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/jquery/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/json2/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/less/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/require/pom.xml
    tomee/tomee/trunk/tomee/tomee-static-content/underscorejs/pom.xml
    tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
    tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
    tomee/tomee/trunk/tomee/tomee-webapp/src/main/assembly/war.xml

Modified: tomee/tomee/trunk/examples/moviefun-rest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun-rest/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun-rest/pom.xml (original)
+++ tomee/tomee/trunk/examples/moviefun-rest/pom.xml Thu Oct 10 17:45:36 2013
@@ -134,42 +134,42 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-backbone</artifactId>
+      <artifactId>static-tomee-backbone</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-bootstrap</artifactId>
+      <artifactId>static-tomee-bootstrap</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-jquery</artifactId>
+      <artifactId>static-tomee-jquery</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-handlebars</artifactId>
+      <artifactId>static-tomee-handlebars</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-json2</artifactId>
+      <artifactId>static-tomee-json2</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-lessjs</artifactId>
+      <artifactId>static-tomee-lessjs</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-requirejs</artifactId>
+      <artifactId>static-tomee-requirejs</artifactId>
       <version>${tomee.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-underscorejs</artifactId>
+      <artifactId>static-tomee-underscorejs</artifactId>
       <version>${tomee.version}</version>
     </dependency>
   </dependencies>

Modified: tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy Thu
Oct 10 17:45:36 2013
@@ -133,8 +133,8 @@ class SetupCommand {
         ant.delete(file: paths.findTomEELibJar("jaxb-impl"))
         ant.delete(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar"))
// we need the one without version
 
-        ant.delete(file: "${paths.catalinaLibDir}/tomee-static-jquery-${tomeeVersion}.jar")
-        ant.delete(file: "${paths.catalinaLibDir}/tomee-static-bootstrap-${tomeeVersion}.jar")
+        ant.delete(file: "${paths.catalinaLibDir}/static-tomee-jquery-${tomeeVersion}.jar")
+        ant.delete(file: "${paths.catalinaLibDir}/static-tomee-bootstrap-${tomeeVersion}.jar")
 
         ant.delete(file: paths.findOpenEJBWebJar("tomee-loader"))
         ant.delete(file: paths.findOpenEJBWebJar("swizzle-stream"))

Modified: tomee/tomee/trunk/tomee/tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-common/pom.xml Thu Oct 10 17:45:36 2013
@@ -42,12 +42,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-bootstrap</artifactId>
+      <artifactId>static-tomee-bootstrap</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-jquery</artifactId>
+      <artifactId>static-tomee-jquery</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

Modified: tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/src/main/assembly/war.xml Thu Oct 10 17:45:36
2013
@@ -78,6 +78,9 @@
         <!-- provided -->
         <exclude>org.apache.tomcat:*</exclude>
 
+        <!-- exclude all the static web content -->
+        <exclude>org.apache.openejb.staticweb:*</exclude>
+
         <!-- should be in a pom exclusion but it does perfectly the trick -->
         <exclude>org.springframework:*</exclude>
 
@@ -92,8 +95,8 @@
       <includes>
         <include>org.apache.openejb:tomee-loader</include>
         <include>org.codehaus.swizzle:swizzle-stream</include>
-        <include>org.apache.openejb.staticweb:tomee-static-bootstrap</include>
-        <include>org.apache.openejb.staticweb:tomee-static-jquery</include>
+        <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
+        <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
       </includes>
     </dependencySet>
   </dependencySets>

Modified: tomee/tomee/trunk/tomee/tomee-plus-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plus-webapp/src/main/assembly/war.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plus-webapp/src/main/assembly/war.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plus-webapp/src/main/assembly/war.xml Thu Oct 10 17:45:36
2013
@@ -78,6 +78,9 @@
         <!-- provided -->
         <exclude>org.apache.tomcat:*</exclude>
 
+        <!-- exclude all the static web content -->
+        <exclude>org.apache.openejb.staticweb:*</exclude>
+
         <!-- should be in a pom exclusion but it does perfectly the trick -->
         <exclude>org.springframework:*</exclude>
 
@@ -92,8 +95,8 @@
       <includes>
         <include>org.apache.openejb:tomee-loader</include>
         <include>org.codehaus.swizzle:swizzle-stream</include>
-        <include>org.apache.openejb.staticweb:tomee-static-bootstrap</include>
-        <include>org.apache.openejb.staticweb:tomee-static-jquery</include>
+        <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
+        <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
       </includes>
     </dependencySet>
   </dependencySets>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/backbone/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/backbone/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/backbone/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/backbone/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-backbone</artifactId>
+  <artifactId>static-tomee-backbone</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: backbone</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: backbone</name>
   <description>Contains backbone 1.0.0</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/bootstrap/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-bootstrap</artifactId>
+  <artifactId>static-tomee-bootstrap</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: bootstrap</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: bootstrap</name>
   <description>Contains bootstrap 2.3.2</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/codemirror/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/codemirror/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/codemirror/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/codemirror/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-codemirror</artifactId>
+  <artifactId>static-tomee-codemirror</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: codemirror</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: codemirror</name>
   <description>Contains CodeMirror 3.16</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/handlebars/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/handlebars/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/handlebars/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/handlebars/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-handlebars</artifactId>
+  <artifactId>static-tomee-handlebars</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: handlebars</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: handlebars</name>
   <description>Contains handlebars 1.0.0</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/jquery/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/jquery/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/jquery/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/jquery/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-jquery</artifactId>
+  <artifactId>static-tomee-jquery</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: jquery</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: jquery</name>
   <description>Contains jquery 2.0.3</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/json2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/json2/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/json2/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/json2/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,10 +24,10 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-json2</artifactId>
+  <artifactId>static-tomee-json2</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: json2</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: json2</name>
   <description>
     Contains Douglas Crockford's JSON implementation for JavaScript.
     (version date: 2010-11-18, https://github.com/douglascrockford/JSON-js)

Modified: tomee/tomee/trunk/tomee/tomee-static-content/less/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/less/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/less/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/less/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-lessjs</artifactId>
+  <artifactId>static-tomee-lessjs</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: less</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: less</name>
   <description>Contains less.js 1.4.1</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,7 +24,7 @@
   <artifactId>tomee-static-content</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content </name>
+  <name>OpenEJB :: TomEE :: static-tomee-content </name>
   <modules>
     <module>backbone</module>
     <module>bootstrap</module>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/require/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/require/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/require/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/require/pom.xml Thu Oct 10 17:45:36 2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-requirejs</artifactId>
+  <artifactId>static-tomee-requirejs</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: require</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: require</name>
   <description>Contains RequireJS 2.1.8 and RequireJS text plugin 2.0.10</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-static-content/underscorejs/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-static-content/underscorejs/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-static-content/underscorejs/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-static-content/underscorejs/pom.xml Thu Oct 10 17:45:36
2013
@@ -24,9 +24,9 @@
     <artifactId>tomee-static-content</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-  <artifactId>tomee-static-underscorejs</artifactId>
+  <artifactId>static-tomee-underscorejs</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenEJB :: TomEE :: tomee-static-content :: underscorejs</name>
+  <name>OpenEJB :: TomEE :: static-tomee-content :: underscorejs</name>
   <description>Contains Underscore.js 1.5.2</description>
 </project>

Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Thu Oct 10 17:45:36 2013
@@ -34,55 +34,55 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-backbone</artifactId>
+      <artifactId>static-tomee-backbone</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-bootstrap</artifactId>
+      <artifactId>static-tomee-bootstrap</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-jquery</artifactId>
+      <artifactId>static-tomee-jquery</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-handlebars</artifactId>
+      <artifactId>static-tomee-handlebars</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-json2</artifactId>
+      <artifactId>static-tomee-json2</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-lessjs</artifactId>
+      <artifactId>static-tomee-lessjs</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-requirejs</artifactId>
+      <artifactId>static-tomee-requirejs</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-underscorejs</artifactId>
+      <artifactId>static-tomee-underscorejs</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-codemirror</artifactId>
+      <artifactId>static-tomee-codemirror</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>

Modified: tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/pom.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/pom.xml Thu Oct 10 17:45:36 2013
@@ -83,15 +83,13 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-bootstrap</artifactId>
+      <artifactId>static-tomee-bootstrap</artifactId>
       <version>${tomee.version}</version>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>tomee-static-jquery</artifactId>
+      <artifactId>static-tomee-jquery</artifactId>
       <version>${tomee.version}</version>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>

Modified: tomee/tomee/trunk/tomee/tomee-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/src/main/assembly/war.xml?rev=1531059&r1=1531058&r2=1531059&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/src/main/assembly/war.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/src/main/assembly/war.xml Thu Oct 10 17:45:36 2013
@@ -79,22 +79,9 @@
       <outputDirectory>lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
-        <!--<exclude>org.apache.tomcat:tomcat-catalina</exclude>-->
-        <!--<exclude>org.apache.openejb:tomee-webservices</exclude>-->
-        <!--<exclude>org.apache.openejb:openejb-webservices</exclude>-->
-        <!--<exclude>wsdl4j:wsdl4j</exclude>-->
-        <!--<exclude>org.apache.openejb:openejb-rest</exclude>-->
-        <!--<exclude>org.apache.openejb:openejb-cxf-transport</exclude>-->
-        <!--<exclude>org.apache.cxf:cxf-bundle</exclude>-->
-        <!--<exclude>org.apache.openejb.patch:openejb-cxf-bundle</exclude>-->
-        <!--<exclude>org.apache.ws.xmlschema:xmlschema-core</exclude>-->
-        <!--<exclude>org.apache.openejb:openejb-cxf</exclude>-->
-        <!--<exclude>org.apache.ws.security:wss4j</exclude>-->
-        <!--<exclude>org.opensaml:openws</exclude>-->
-        <!--<exclude>org.apache.openejb:openejb-cxf-rs</exclude>-->
-        <!--<exclude>org.apache.activemq:activemq-core</exclude>-->
-        <!--<exclude>org.apache.activemq:activemq-ra</exclude>-->
-        <!--<exclude>org.apache.openejb:javaee-api</exclude>-->
+        <!-- exclude all the static web content -->
+        <exclude>org.apache.openejb.staticweb:*</exclude>
+
         <exclude>*:pom</exclude>
       </excludes>
     </dependencySet>
@@ -104,8 +91,8 @@
       <includes>
         <include>org.apache.openejb:tomee-loader</include>
         <include>org.codehaus.swizzle:swizzle-stream</include>
-        <include>org.apache.openejb.staticweb:tomee-static-bootstrap</include>
-        <include>org.apache.openejb.staticweb:tomee-static-jquery</include>
+        <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
+        <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
       </includes>
     </dependencySet>
   </dependencySets>



Mime
View raw message