You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/02/12 00:38:00 UTC
svn commit: r1567463 - in /tomee/tomee/trunk: ./ tomee/
tomee/apache-tomee/src/main/groovy/commands/ tomee/tomee-common/
tomee/tomee-jaxrs-webapp/src/main/assembly/
tomee/tomee-plume-webapp/src/main/assembly/
tomee/tomee-plus-webapp/src/main/assembly/ ...
Author: tveronezi
Date: Tue Feb 11 23:37:59 2014
New Revision: 1567463
URL: http://svn.apache.org/r1567463
Log:
use webjars instead of 'static-tomee' stuff.
Modified:
tomee/tomee/trunk/rat.xml
tomee/tomee/trunk/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
tomee/tomee/trunk/tomee/pom.xml
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-plume-webapp/src/main/assembly/war.xml
tomee/tomee/trunk/tomee/tomee-plus-webapp/src/main/assembly/war.xml
tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
tomee/tomee/trunk/tomee/tomee-webapp/src/main/assembly/war.xml
tomee/tomee/trunk/tomee/tomee-webapp/src/main/webapp/index.html
Modified: tomee/tomee/trunk/rat.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/rat.xml?rev=1567463&r1=1567462&r2=1567463&view=diff
==============================================================================
--- tomee/tomee/trunk/rat.xml (original)
+++ tomee/tomee/trunk/rat.xml Tue Feb 11 23:37:59 2014
@@ -43,18 +43,6 @@
<exclude name="**/javax.enterprise.inject.spi.Extension"/>
<exclude name="**/*.handlebars"/>
- <!-- Copies of JS libs covered by LICENSE and NOTICE files -->
- <exclude name="tomee/tomee-static-content/backbone/src/**"/>
- <exclude name="tomee/tomee-static-content/bootstrap/src/**"/>
- <exclude name="tomee/tomee-static-content/codemirror/src/**"/>
- <exclude name="tomee/tomee-static-content/handlebars/src/**"/>
- <exclude name="tomee/tomee-static-content/jquery/src/**"/>
- <exclude name="tomee/tomee-static-content/json2/src/**"/>
- <exclude name="tomee/tomee-static-content/less/src/**"/>
- <exclude name="tomee/tomee-static-content/underscorejs/src/**"/>
- <exclude name="tomee/tomee-static-content/require/src/main/resources/META-INF/resources/app/lib/require/**"/>
-
-
<exclude name="assembly/openejb-standalone/src/main/resources/service.readme.txt"/>
<exclude name="arquillian/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension"/>
<exclude name="arquillian/arquillian-tomee-embedded/src/main/resources/META-INF/services/org.jboss.arquillian.container.test.spi.RemoteLoadableExtension" />
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=1567463&r1=1567462&r2=1567463&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 Tue Feb 11 23:37:59 2014
@@ -100,8 +100,15 @@ class SetupCommand {
ant.delete(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar" as String))
// we need the one without version
- ant.delete(file: "${paths.catalinaLibDir}/static-tomee-jquery-${tomeeVersion}.jar")
- ant.delete(file: "${paths.catalinaLibDir}/static-tomee-bootstrap-${tomeeVersion}.jar")
+ def deleteFiles = { String pattern ->
+ new File(paths.catalinaLibDir as String).listFiles(
+ [accept: { dir, fileName -> fileName ==~ pattern }] as FilenameFilter
+ ).each { file ->
+ ant.delete(file: file.path)
+ }
+ }
+ deleteFiles(/jquery.*\.jar/)
+ deleteFiles(/bootstrap.*\.jar/)
ant.delete(file: paths.findOpenEJBWebJar('tomee-loader'))
ant.delete(file: paths.findOpenEJBWebJar('swizzle-stream'))
Modified: tomee/tomee/trunk/tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1567463&r1=1567462&r2=1567463&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Tue Feb 11 23:37:59 2014
@@ -47,7 +47,6 @@
<module>tomee-jaxrs-webapp</module>
<module>apache-tomee</module>
<module>tomee-util</module>
- <module>tomee-static-content</module>
</modules>
<repositories>
Modified: tomee/tomee/trunk/tomee/tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/pom.xml?rev=1567463&r1=1567462&r2=1567463&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-common/pom.xml Tue Feb 11 23:37:59 2014
@@ -41,14 +41,14 @@
<artifactId>swizzle-stream</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-bootstrap</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>3.1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-jquery</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>2.1.0-1</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
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=1567463&r1=1567462&r2=1567463&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 Tue Feb 11 23:37:59 2014
@@ -95,8 +95,8 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
- <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
- <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
+ <include>org.webjars:bootstrap</include>
+ <include>org.webjars:jquery</include>
</includes>
</dependencySet>
</dependencySets>
Modified: tomee/tomee/trunk/tomee/tomee-plume-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-plume-webapp/src/main/assembly/war.xml?rev=1567463&r1=1567462&r2=1567463&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-plume-webapp/src/main/assembly/war.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-plume-webapp/src/main/assembly/war.xml Tue Feb 11 23:37:59 2014
@@ -100,8 +100,8 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
- <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
- <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
+ <include>org.webjars:bootstrap</include>
+ <include>org.webjars: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=1567463&r1=1567462&r2=1567463&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 Tue Feb 11 23:37:59 2014
@@ -95,8 +95,8 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
- <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
- <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
+ <include>org.webjars:bootstrap</include>
+ <include>org.webjars:jquery</include>
</includes>
</dependencySet>
</dependencySets>
Modified: tomee/tomee/trunk/tomee/tomee-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/pom.xml?rev=1567463&r1=1567462&r2=1567463&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/pom.xml Tue Feb 11 23:37:59 2014
@@ -82,14 +82,14 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-bootstrap</artifactId>
- <version>${tomee.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>3.1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-jquery</artifactId>
- <version>${tomee.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>2.1.0-1</version>
</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=1567463&r1=1567462&r2=1567463&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 Tue Feb 11 23:37:59 2014
@@ -91,8 +91,8 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
- <include>org.apache.openejb.staticweb:static-tomee-bootstrap</include>
- <include>org.apache.openejb.staticweb:static-tomee-jquery</include>
+ <include>org.webjars:bootstrap</include>
+ <include>org.webjars:jquery</include>
</includes>
</dependencySet>
</dependencySets>
Modified: tomee/tomee/trunk/tomee/tomee-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webapp/src/main/webapp/index.html?rev=1567463&r1=1567462&r2=1567463&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/src/main/webapp/index.html (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/src/main/webapp/index.html Tue Feb 11 23:37:59 2014
@@ -19,10 +19,10 @@ limitations under the License.
<html>
<head>
<title>Apache TomEE - Installer</title>
- <link rel="stylesheet" type="text/css" href="app/lib/bootstrap/css/bootstrap.css">
+ <link rel="stylesheet" type="text/css" href="webjars/bootstrap/3.1.0/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="app.css">
- <script src="app/lib/jquery/jquery.min.js"></script>
- <script src="app/lib/bootstrap/js/bootstrap.js"></script>
+ <script src="webjars/jquery/2.1.0/jquery.min.js"></script>
+ <script src="webjars/bootstrap/3.1.0/js/bootstrap.min.js"></script>
<script src="app.js"></script>
</head>
<body>