tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tveron...@apache.org
Subject svn commit: r1566950 - in /tomee/tomee/trunk/examples/moviefun-rest: pom.xml src/main/webapp/WEB-INF/web.xml src/main/webapp/app/config.js src/main/webapp/index.jsp
Date Tue, 11 Feb 2014 02:05:46 GMT
Author: tveronezi
Date: Tue Feb 11 02:05:46 2014
New Revision: 1566950

URL: http://svn.apache.org/r1566950
Log:
use webjars instead of 'static-tomee' stuff.

Modified:
    tomee/tomee/trunk/examples/moviefun-rest/pom.xml
    tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/WEB-INF/web.xml
    tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/app/config.js
    tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/index.jsp

Modified: tomee/tomee/trunk/examples/moviefun-rest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun-rest/pom.xml?rev=1566950&r1=1566949&r2=1566950&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun-rest/pom.xml (original)
+++ tomee/tomee/trunk/examples/moviefun-rest/pom.xml Tue Feb 11 02:05:46 2014
@@ -209,44 +209,44 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-backbone</artifactId>
-      <version>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>backbonejs</artifactId>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-bootstrap</artifactId>
-      <version>1.6.1-SNAPSHOT</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>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>handlebars</artifactId>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-handlebars</artifactId>
-      <version>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>jquery</artifactId>
+      <version>2.1.0-1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-json2</artifactId>
-      <version>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>json2</artifactId>
+      <version>20110223</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-lessjs</artifactId>
-      <version>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>less</artifactId>
+      <version>1.6.0-1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-requirejs</artifactId>
-      <version>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>requirejs</artifactId>
+      <version>2.1.10</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb.staticweb</groupId>
-      <artifactId>static-tomee-underscorejs</artifactId>
-      <version>1.6.1-SNAPSHOT</version>
+      <groupId>org.webjars</groupId>
+      <artifactId>requirejs-text</artifactId>
+      <version>2.0.10</version>
     </dependency>
   </dependencies>
   <profiles>

Modified: tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/WEB-INF/web.xml?rev=1566950&r1=1566949&r2=1566950&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/WEB-INF/web.xml (original)
+++ tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/WEB-INF/web.xml Tue Feb 11 02:05:46
2014
@@ -26,6 +26,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/examples/moviefun-rest/src/main/webapp/app/config.js
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/app/config.js?rev=1566950&r1=1566949&r2=1566950&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/app/config.js (original)
+++ tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/app/config.js Tue Feb 11 02:05:46
2014
@@ -19,14 +19,14 @@
 var APP_CONFIG = {
     baseUrl: window.ux.ROOT_URL,
     paths: {
-        'text': 'app/lib/require/text',
-        'lib/less': 'app/lib/less/less.min',
-        'lib/jquery': 'app/lib/jquery/jquery.min',
-        'lib/bootstrap': 'app/lib/bootstrap/js/bootstrap.min',
-        'lib/handlebars': 'app/lib/handlebars/handlebars',
-        'lib/underscore': 'app/lib/underscorejs/underscore-min',
-        'lib/json2': 'app/lib/json2/json2',
-        'lib/backbone': 'app/lib/backbone/backbone-min'
+        'text': 'webjars/requirejs-text/2.0.10/text',
+        'lib/less': 'webjars/less/1.6.0/less.min',
+        'lib/jquery': 'webjars/jquery/2.1.0/jquery.min',
+        'lib/bootstrap': 'webjars/bootstrap/3.1.0/js/bootstrap.min',
+        'lib/handlebars': 'webjars/handlebars/1.2.1/handlebars.min',
+        'lib/underscore': 'webjars/underscorejs/1.4.3/underscore-min',
+        'lib/json2': 'webjars/json2/20110223/json2.min',
+        'lib/backbone': 'webjars/backbonejs/1.0.0/backbone'
     },
     shim: {
         'lib/bootstrap': {

Modified: tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/index.jsp?rev=1566950&r1=1566949&r2=1566950&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/index.jsp (original)
+++ tomee/tomee/trunk/examples/moviefun-rest/src/main/webapp/index.jsp Tue Feb 11 02:05:46
2014
@@ -21,9 +21,9 @@ limitations under the License.
 <head>
   <meta charset="utf-8">
   <title>Moviefun</title>
-  <link href="<c:url value='/app/lib/bootstrap/css/bootstrap.min.css'/>" rel="stylesheet">
+  <link href="<c:url value='/webjars/bootstrap/3.1.0/css/bootstrap.min.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()%>";



Mime
View raw message