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/11 01:12:05 UTC
svn commit: r1566882 - in /tomee/tomee/trunk/tomee/tomee-webaccess: pom.xml
src/main/webapp/WEB-INF/web.xml src/main/webapp/app/config.js
src/main/webapp/index.jsp
Author: tveronezi
Date: Tue Feb 11 00:12:05 2014
New Revision: 1566882
URL: http://svn.apache.org/r1566882
Log:
use webjars instead of 'static-tomee' stuff.
Modified:
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/WEB-INF/web.xml
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/index.jsp
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1566882&r1=1566881&r2=1566882&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Tue Feb 11 00:12:05 2014
@@ -108,57 +108,63 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-backbone</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>backbonejs</artifactId>
+ <version>1.0.0</version>
<scope>runtime</scope>
</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>
<scope>runtime</scope>
</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>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-handlebars</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>handlebars</artifactId>
+ <version>1.2.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-json2</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>json2</artifactId>
+ <version>20110223</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-lessjs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>less</artifactId>
+ <version>1.6.0-1</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-requirejs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>requirejs</artifactId>
+ <version>2.1.10</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-underscorejs</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>requirejs-text</artifactId>
+ <version>2.0.10</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>static-tomee-codemirror</artifactId>
- <version>${project.version}</version>
+ <groupId>org.webjars</groupId>
+ <artifactId>underscorejs</artifactId>
+ <version>1.5.2-2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>3.21</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -235,7 +241,9 @@
<executions>
<execution>
<goals>
+ <goal>generateStubs</goal>
<goal>compile</goal>
+ <goal>generateTestStubs</goal>
<goal>testCompile</goal>
</goals>
</execution>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/WEB-INF/web.xml?rev=1566882&r1=1566881&r2=1566882&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/WEB-INF/web.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/WEB-INF/web.xml Tue Feb 11 00:12:05 2014
@@ -32,6 +32,10 @@
<servlet-name>default</servlet-name>
<url-pattern>/app/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/webjars/*</url-pattern>
+ </servlet-mapping>
<!-- Any other request will point to the "index.jsp" page. This way Backbone knows how to manage page transitions
at the client side in case the user starts the application from a permalink. -->
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js?rev=1566882&r1=1566881&r2=1566882&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/app/config.js Tue Feb 11 00:12:05 2014
@@ -20,31 +20,31 @@ var APP_CONFIG = {
baseUrl: window.ux.ROOT_URL,
paths: {
// https://github.com/requirejs/text
- 'text': 'app/lib/require/text',
+ 'text': 'webjars/requirejs-text/2.0.10/text',
// http://lesscss.org/
- 'lib/less': 'app/lib/less/less.min',
+ 'lib/less': 'webjars/less/1.6.0/less.min',
- 'lib/codemirror': 'app/lib/codemirror/lib/codemirror',
- 'lib/show-hint': 'app/lib/codemirror/addon/hint/show-hint',
- 'lib/anyword-hint': 'app/lib/codemirror/addon/hint/anyword-hint',
- 'lib/javascript-mode': 'app/lib/codemirror/mode/javascript/javascript',
- 'lib/groovy-mode': 'app/lib/codemirror/mode/groovy/groovy',
+ 'lib/codemirror': 'webjars/codemirror/3.21/lib/codemirror',
+ 'lib/show-hint': 'webjars/codemirror/3.21/addon/hint/show-hint',
+ 'lib/anyword-hint': 'webjars/codemirror/3.21/addon/hint/anyword-hint',
+ 'lib/javascript-mode': 'webjars/codemirror/3.21/mode/javascript/javascript',
+ 'lib/groovy-mode': 'webjars/codemirror/3.21/mode/groovy/groovy',
// http://jquery.com/
- 'lib/jquery': 'app/lib/jquery/jquery.min',
+ 'lib/jquery': 'webjars/jquery/2.1.0/jquery.min',
// http://twitter.github.com/bootstrap/
- 'lib/bootstrap': 'app/lib/bootstrap/js/bootstrap.min',
+ 'lib/bootstrap': 'webjars/bootstrap/3.1.0/js/bootstrap.min',
// http://handlebarsjs.com/
- 'lib/handlebars': 'app/lib/handlebars/handlebars',
+ 'lib/handlebars': 'webjars/handlebars/1.2.1/handlebars.min',
- 'lib/underscore': 'app/lib/underscorejs/underscore-min',
+ 'lib/underscore': 'webjars/underscorejs/1.5.2/underscore-min',
- 'lib/json2': 'app/lib/json2/json2',
+ 'lib/json2': 'webjars/json2/20110223/json2.min',
- 'lib/backbone': 'app/lib/backbone/backbone-min'
+ 'lib/backbone': 'webjars/backbonejs/1.0.0/backbone'
},
shim: {
'lib/show-hint': {
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/index.jsp?rev=1566882&r1=1566881&r2=1566882&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/index.jsp (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/src/main/webapp/index.jsp Tue Feb 11 00:12:05 2014
@@ -21,11 +21,11 @@ limitations under the License.
<head>
<meta charset="utf-8">
<title>Apache TomEE</title>
- <link href="<c:url value='/app/lib/bootstrap/css/bootstrap.min.css'/>" rel="stylesheet">
- <link href="<c:url value='/app/lib/codemirror/lib/codemirror.css'/>" rel="stylesheet">
- <link href="<c:url value='/app/lib/codemirror/addon/hint/show-hint.css'/>" rel="stylesheet">
+ <link href="<c:url value='/webjars/bootstrap/3.1.0/css/bootstrap.min.css'/>" rel="stylesheet">
+ <link href="<c:url value='/webjars/codemirror/3.21/lib/codemirror.css'/>" rel="stylesheet">
+ <link href="<c:url value='/webjars/codemirror/3.21/addon/hint/show-hint.css'/>" rel="stylesheet">
<link href="<c:url value='/app/app.less'/>" rel="stylesheet/less" type="text/css">
- <script src="<c:url value='/app/lib/require/require.js'/>"></script>
+ <script src="<c:url value='/webjars/requirejs/2.1.10/require.min.js'/>"></script>
<script type="text/javascript">
window.ux = window.ux || {};
window.ux.SESSION_ID = "<%=request.getSession().getId()%>";