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/06/26 22:52:55 UTC
svn commit: r1605906 - in /tomee/tomee/trunk/tomee:
apache-tomee/src/main/groovy/commands/ tomee-common/
tomee-jaxrs-webapp/src/main/assembly/ tomee-plume-webapp/src/main/assembly/
tomee-plus-webapp/src/main/assembly/ tomee-webapp/ tomee-webapp/src/mai...
Author: tveronezi
Date: Thu Jun 26 20:52:55 2014
New Revision: 1605906
URL: http://svn.apache.org/r1605906
Log:
TOMEE-1202: Webapp Remove dependencies on jquery and bootstrap webjars, but keep the UI as good looking as possible
Modified:
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-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
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=1605906&r1=1605905&r2=1605906&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 Jun 26 20:52:55 2014
@@ -100,16 +100,6 @@ class SetupCommand {
ant.delete(file: paths.findTomEELibJar("openejb-javaagent-${openejbVersion}.jar" as String))
// we need the one without version
- 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/tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/pom.xml?rev=1605906&r1=1605905&r2=1605906&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-common/pom.xml Thu Jun 26 20:52:55 2014
@@ -41,16 +41,6 @@
<artifactId>swizzle-stream</artifactId>
</dependency>
<dependency>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- <version>2.1.0-1</version>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
</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=1605906&r1=1605905&r2=1605906&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 Jun 26 20:52:55 2014
@@ -78,9 +78,6 @@
<!-- 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>
@@ -95,8 +92,6 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</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=1605906&r1=1605905&r2=1605906&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 Thu Jun 26 20:52:55 2014
@@ -83,9 +83,6 @@
<exclude>org.apache.tomcat:*</exclude>
<exclude>org.apache.myfaces:*</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>
@@ -100,8 +97,6 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</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=1605906&r1=1605905&r2=1605906&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 Jun 26 20:52:55 2014
@@ -78,9 +78,6 @@
<!-- 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>
@@ -95,8 +92,6 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</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=1605906&r1=1605905&r2=1605906&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webapp/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webapp/pom.xml Thu Jun 26 20:52:55 2014
@@ -36,6 +36,39 @@
</properties>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>3.1.0</version>
+ <includes>**/bootstrap.min.css,**/bootstrap.min.js,**/bootstrap.min.css,**/bootstrap.css.map,**/fonts/*</includes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>2.1.0-1</version>
+ <includes>**/jquery.min.*</includes>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/webjars-resources</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin> <!-- the jar is only for resources and other classes are for the gui -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -47,7 +80,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -90,16 +123,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- <version>2.1.0-1</version>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
@@ -111,10 +134,6 @@
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
<dependency> <!-- will be moved over endorsed dir so simply adding it alone (= not in javaee-api) -->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
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=1605906&r1=1605905&r2=1605906&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 Jun 26 20:52:55 2014
@@ -44,6 +44,10 @@
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
+ <directory>${project.build.directory}/webjars-resources/META-INF/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/target/classes</directory>
<outputDirectory>/</outputDirectory>
<excludes>
@@ -79,9 +83,6 @@
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
- <!-- exclude all the static web content -->
- <exclude>org.apache.openejb.staticweb:*</exclude>
-
<exclude>*:pom</exclude>
</excludes>
</dependencySet>
@@ -91,8 +92,6 @@
<includes>
<include>org.apache.openejb:tomee-loader</include>
<include>org.codehaus.swizzle:swizzle-stream</include>
- <include>org.webjars:bootstrap</include>
- <include>org.webjars:jquery</include>
</includes>
</dependencySet>
</dependencySets>