r140 - in trunk: . faxtomail-ui-web faxtomail-ui-web/src/main/resources faxtomail-ui-web/src/main/webapp/WEB-INF faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/WEB-INF/decorators - Faxtomail-commits

6 Jun 2014

Author: echatellier
Date: 2014-06-06 09:56:32 +0200 (Fri, 06 Jun 2014)
New Revision: 140

Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/140

Log:
Switch to wro

Added:
   trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml
Modified:
   trunk/faxtomail-ui-web/pom.xml
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp
   trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml
   trunk/pom.xml

Modified: trunk/faxtomail-ui-web/pom.xml
===================================================================

--- trunk/faxtomail-ui-web/pom.xml	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/pom.xml	2014-06-06 07:56:32 UTC (rev 140)
@@ -212,12 +212,13 @@
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
     </dependency>
-    
+
     <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>angularjs</artifactId>
+      <groupId>org.nuiton.js</groupId>
+      <artifactId>nuiton-js-wro</artifactId>
     </dependency>
 
+
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>bootstrap</artifactId>
@@ -234,7 +235,12 @@
     </dependency>
 
     <dependency>
+      <artifactId>nuiton-js-angularjs</artifactId>
       <groupId>org.nuiton.js</groupId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.nuiton.js</groupId>
       <artifactId>nuiton-js-angular-ui-tree</artifactId>
     </dependency>
     
@@ -245,11 +251,6 @@
 
     <dependency>
       <groupId>org.webjars</groupId>
-      <artifactId>angular-ui-utils</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.webjars</groupId>
       <artifactId>angular-ui-sortable</artifactId>
     </dependency>
   </dependencies>
@@ -284,7 +285,7 @@
               <goal>parserStruts2</goal>
             </goals>
             <configuration>
-              <acceptKeyFormat>^extranetEncAhi\..*$</acceptKeyFormat>
+              <acceptKeyFormat>^faxtomail\..*$</acceptKeyFormat>
             </configuration>
           </execution>
           <execution>

Added: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties
===================================================================
--- trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties	                        (rev 0)
+++ trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties	2014-06-06 07:56:32 UTC (rev 140)
@@ -0,0 +1,10 @@
+
+# dev
+disableCache=true
+minimize=false
+#preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender
+#postProcessors=cssVariables
+
+# prod
+#disableCache=false
+#minimize=true


Property changes on: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp	2014-06-06 07:56:32 UTC (rev 140)
@@ -29,21 +29,9 @@
   <head>
     <title>Configuration</title>
     
-    <link rel="stylesheet" type="text/css" href="<s:url value='/webjars/select2/3.4.8/select2.css' />" />
-    <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js-angular-ui-tree/angular-ui-tree.css' />" />
-    <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2_locale_fr.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/nuiton-js-angular-ui-tree/angular-ui-tree.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angular-ui-sortable/0.12.2/sortable.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js' />"></script>
+    <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail-configuration.css' />" />
+    <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail-configuration.js' />"></script>
 
-    <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" />
-    <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/js/configuration.js' />"></script>
-
     <script type="text/javascript">
       ConfigurationModule.value('ConfigurationData', {
           // enums

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp	2014-06-06 07:56:32 UTC (rev 140)
@@ -28,7 +28,6 @@
 <html>
   <head>
     <title>Import</title>
-    <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" />
   </head>
 
   <body>

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp	2014-06-06 07:56:32 UTC (rev 140)
@@ -28,7 +28,6 @@
 <html>
   <head>
     <title>Ldap</title>
-    <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" />
   </head>
 
   <body>

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp	2014-06-06 07:56:32 UTC (rev 140)
@@ -29,18 +29,9 @@
   <head>
     <title>Dossiers mis en avant par utilisateur</title>
     
-    <link rel="stylesheet" type="text/css" href="<s:url value='/webjars/select2/3.4.8/select2.css' />" />
-    <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2_locale_fr.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.min.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js' />"></script>
+    <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail-user-folder.css' />" />
+    <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail-user-folder.js' />"></script>
 
-    <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" />
-    <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script>
-    <script type="text/javascript" src="<s:url value='/js/user-folder.js' />"></script>
-
     <script type="text/javascript">
       UserFolderModule.value('UserFolderData', {
           'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>,

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-06-06 07:56:32 UTC (rev 140)
@@ -33,6 +33,8 @@
             <title>FaxToMail : <decorator:title default="FaxToMail"/></title>
             <sj:head locale="fr" jqueryui="true" loadAtOnce='true' jquerytheme="start" />
             <sb:head />
+            <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail.css' />" />
+            <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail.js' />"></script>
             <decorator:head/>
     </head>
 

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml	2014-06-06 07:56:32 UTC (rev 140)
@@ -22,39 +22,17 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
 
-
-<web-app version="2.5"
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    metadata-complete="true">
-
   <display-name>FaxToMail ${project.version}</display-name>
 
   <session-config>
     <session-timeout>600</session-timeout>
   </session-config>
 
-  <!-- prevent excessive caching of js files
   <filter>
-    <filter-name>ExpiresFilter</filter-name>
-    <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class>
-    <init-param>
-      <param-name>ExpiresByType image</param-name>
-      <param-value>access plus 10 minutes</param-value>
-    </init-param>
-    <init-param>
-      <param-name>ExpiresByType text/css</param-name>
-      <param-value>access plus 10 minutes</param-value>
-    </init-param>
-    <init-param>
-      <param-name>ExpiresByType application/javascript</param-name>
-      <param-value>access plus 10 minutes</param-value>
-    </init-param>
-  </filter> -->
-
-  <filter>
     <filter-name>struts-prepare</filter-name>
     <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
   </filter>
@@ -89,10 +67,4 @@
     <listener-class>com.franciaflex.faxtomail.web.FaxToMailApplicationListener</listener-class>
   </listener>
 
-  <!-- <filter-mapping>
-    <filter-name>ExpiresFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-    <dispatcher>REQUEST</dispatcher>
-  </filter-mapping> -->
-
 </web-app>

Added: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml
===================================================================
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml	                        (rev 0)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml	2014-06-06 07:56:32 UTC (rev 140)
@@ -0,0 +1,50 @@
+<groups xmlns="http://www.isdc.ro/wro">
+  
+  <group name='webjar-select2' abstract="true">
+    <css>classpath:META-INF/resources/webjars/select2/3.4.8/select2.css</css>
+    <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2.js</js>
+    <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2_locale_fr.js</js>
+  </group>
+
+  <group name='webjar-angular-ui-sortable' abstract="true">
+    <group-ref>angular</group-ref>
+    <js>classpath:META-INF/resources/webjars/angular-ui-sortable/0.12.2/sortable.min.js</js>
+  </group>
+
+  <group name='webjar-angular-ui-bootstrap' abstract="true">
+    <!-- do not include bootstrap here : done by struts -->
+    <group-ref>angular</group-ref>
+    <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.js</js>
+    <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.js</js>
+  </group>
+
+  <group name='select2sortable' abstract="true">
+    <group-ref>angular</group-ref>
+    <group-ref>webjar-select2</group-ref>
+    <js>/js/select2sortable.js</js>
+  </group>
+  
+  
+
+  
+
+  <group name='faxtomail'>
+    <group-ref>angular</group-ref>
+    <group-ref>webjar-angular-ui-bootstrap</group-ref>
+    <js>/js/faxtomail.js</js>
+  </group>
+
+  <group name='faxtomail-configuration'>
+    <group-ref>select2sortable</group-ref>
+    <group-ref>webjar-angular-ui-sortable</group-ref>
+    <group-ref>angular-ui-tree</group-ref>
+    <js>/js/configuration.js</js>
+    <css>/css/faxtomail.css</css>
+  </group>
+
+  <group name='faxtomail-user-folder'>
+    <group-ref>select2sortable</group-ref>
+    <js>/js/user-folder.js</js>
+    <css>/css/faxtomail.css</css>
+  </group>
+</groups>
\ No newline at end of file


Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2014-06-05 16:43:31 UTC (rev 139)
+++ trunk/pom.xml	2014-06-06 07:56:32 UTC (rev 140)
@@ -514,19 +514,32 @@
         <artifactId>activation</artifactId>
         <version>1.1.1</version>
       </dependency>
-      
+
       <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>angularjs</artifactId>
-        <version>1.2.16-2</version>
+        <groupId>org.nuiton.js</groupId>
+        <artifactId>nuiton-js-wro</artifactId>
+        <version>1.0.2</version>
         <scope>runtime</scope>
       </dependency>
+
+      <dependency>
+        <groupId>ro.isdc.wro4j</groupId>
+        <artifactId>wro4j-core</artifactId>
+        <version>1.7.5</version>
+        <scope>runtime</scope>
+      </dependency>
       
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>angular-ui-utils</artifactId>
         <version>0.1.1</version>
         <scope>runtime</scope>
+        <exclusions>
+          <exclusion>
+            <artifactId>angularjs</artifactId>
+            <groupId>org.webjars</groupId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
@@ -541,6 +554,12 @@
         <artifactId>angular-ui-bootstrap</artifactId>
         <version>0.11.0-2</version>
         <scope>runtime</scope>
+        <exclusions>
+          <exclusion>
+            <artifactId>angularjs</artifactId>
+            <groupId>org.webjars</groupId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -565,7 +584,14 @@
       </dependency>
 
       <dependency>
+        <artifactId>nuiton-js-angularjs</artifactId>
         <groupId>org.nuiton.js</groupId>
+        <version>1.2.16-1</version>
+        <scope>runtime</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.nuiton.js</groupId>
         <artifactId>nuiton-js-angular-ui-tree</artifactId>
         <version>2.1.4-1</version>
         <scope>runtime</scope>

    

r140 - in trunk: . faxtomail-ui-web faxtomail-ui-web/src/main/resources faxtomail-ui-web/src/main/webapp/WEB-INF faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/WEB-INF/decorators

echatellier＠users.forge.codelutin.com

tags

participants (1)