r3088 - in trunk: . pollen-wm pollen-wm/src/main/java/org/chorem/pollen/web pollen-wm/src/main/resources pollen-wm/src/main/webapp/WEB-INF - Pollen-commits

24 Nov 2011

Author: echatellier
Date: 2011-11-24 10:05:05 +0100 (Thu, 24 Nov 2011)
New Revision: 3088

Url: http://chorem.org/repositories/revision/pollen/3088

Log:
Update to webmotion 2, fix web ui.

Added:
   trunk/pollen-wm/src/main/resources/log4j.properties
Modified:
   trunk/pollen-wm/pom.xml
   trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java
   trunk/pollen-wm/src/main/resources/mapping
   trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp
   trunk/pollen-wm/src/main/webapp/WEB-INF/web.xml
   trunk/pom.xml

Modified: trunk/pollen-wm/pom.xml
===================================================================

--- trunk/pollen-wm/pom.xml	2011-11-23 17:47:44 UTC (rev 3087)
+++ trunk/pollen-wm/pom.xml	2011-11-24 09:05:05 UTC (rev 3088)
@@ -33,12 +33,6 @@
     <dependency>
       <groupId>org.debux</groupId>
       <artifactId>webmotion</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-simple</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>

Modified: trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java
===================================================================
--- trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java	2011-11-23 17:47:44 UTC (rev 3087)
+++ trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java	2011-11-24 09:05:05 UTC (rev 3088)
@@ -2,7 +2,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.debux.webmotion.server.WebMotionAction;
+import org.debux.webmotion.server.WebMotionController;
 import org.debux.webmotion.server.call.Render;
 
 /**
@@ -11,7 +11,7 @@
  * @author ceric35
  * Date : 22 nov. 2011 
  */
-public class PollenAction extends WebMotionAction {
+public class PollenAction extends WebMotionController {
 
     /** Logger */
     private static Log log = LogFactory.getLog(PollenAction.class);

Added: trunk/pollen-wm/src/main/resources/log4j.properties
===================================================================
--- trunk/pollen-wm/src/main/resources/log4j.properties	                        (rev 0)
+++ trunk/pollen-wm/src/main/resources/log4j.properties	2011-11-24 09:05:05 UTC (rev 3088)
@@ -0,0 +1,30 @@
+###
+# #%L
+# Pollen :: Web Motion Interface
+# 
+# $Id$
+# $HeadURL$
+# %%
+# Copyright (C) 2011 CodeLutin, Chatellier Eric
+# %%
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# #L%
+###
+log4j.rootCategory=ERROR, console
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d [%p] %c{2} %m%n
+
+log4j.logger.org.debux.webmotion=DEBUG

Modified: trunk/pollen-wm/src/main/resources/mapping
===================================================================
--- trunk/pollen-wm/src/main/resources/mapping	2011-11-23 17:47:44 UTC (rev 3087)
+++ trunk/pollen-wm/src/main/resources/mapping	2011-11-24 09:05:05 UTC (rev 3088)
@@ -1,5 +1,5 @@
 [config]
-package.views=
+package.views=WEB-INF
 package.actions=org.chorem.pollen.web
 package.filters=org.chorem.pollen.web.filters
 package.errors=org.chorem.pollen.web.errors

Modified: trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp
===================================================================
--- trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp	2011-11-23 17:47:44 UTC (rev 3087)
+++ trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp	2011-11-24 09:05:05 UTC (rev 3088)
@@ -4,7 +4,7 @@
  </head>
  
  <body>
-   <jsp:include page="header.jsp">
+<%--    <jsp:include page="header.jsp"> --%>
 
    <div class="homelogo">
      <img src="img/pollen.png" alt="Pollen logo"/>
@@ -22,6 +22,6 @@
         </a>
     </div>
     
-    <jsp:include page="footer.jsp">
+<%--     <jsp:include page="footer.jsp"> --%>
  </body>
 </html>
\ No newline at end of file

Modified: trunk/pollen-wm/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/pollen-wm/src/main/webapp/WEB-INF/web.xml	2011-11-23 17:47:44 UTC (rev 3087)
+++ trunk/pollen-wm/src/main/webapp/WEB-INF/web.xml	2011-11-24 09:05:05 UTC (rev 3088)
@@ -1,62 +1,7 @@
-<web-app version="2.5"
+<web-app version="3.0"
   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">
+  http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
-    <listener>
-        <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup </listener-class>
-    </listener>
-    
-    <servlet>
-      <servlet-name>WebMotionServer</servlet-name>
-      <servlet-class>org.debux.webmotion.server.WebMotionServer</servlet-class>
-    </servlet>
-    
-    <servlet-mapping>
-      <servlet-name>WebMotionServer</servlet-name>
-      <url-pattern>/deploy/*</url-pattern>
-    </servlet-mapping>
-    
-    <!-- Exception -->
-    <error-page>
-        <exception-type>java.lang.Exception</exception-type>
-        <location>/deploy/error</location>
-    </error-page>
-
-    <!-- Bad Request -->
-    <error-page>
-        <error-code>400</error-code> 
-        <location>/deploy/error</location>
-    </error-page>
-
-    <!-- Unauthorized -->
-    <error-page>
-        <error-code>401</error-code> 
-        <location>/deploy/error</location>
-    </error-page>
-
-    <!-- Forbidden -->
-    <error-page>
-        <error-code>403</error-code> 
-        <location>/deploy/error</location>
-    </error-page>
-
-    <!-- Not Found -->
-    <error-page>
-        <error-code>404</error-code> 
-        <location>/deploy/error</location>
-    </error-page>
-
-    <!-- Request Time-out -->
-    <error-page>
-        <error-code>408</error-code> 
-        <location>/deploy/error</location>
-    </error-page>
-
-    <!-- Internal Server Error -->
-    <error-page>
-        <error-code>500</error-code> 
-        <location>/deploy/error</location>
-    </error-page>
 </web-app>
\ No newline at end of file

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2011-11-23 17:47:44 UTC (rev 3087)
+++ trunk/pom.xml	2011-11-24 09:05:05 UTC (rev 3088)
@@ -186,7 +186,7 @@
       <dependency>
         <groupId>org.debux</groupId>
         <artifactId>webmotion</artifactId>
-        <version>1.4</version>
+        <version>2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -363,8 +363,9 @@
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>7.5.4.v20111024</version>
+          <version>8.0.4.v20111024</version>
         </plugin>
+
         <!-- EUGene plugin for entities generation -->
         <plugin>
           <groupId>org.nuiton.eugene</groupId>
@@ -431,7 +432,7 @@
     <!-- chenillekit Repository -->
     <repository>
         <id>debux</id>
-        <url>http://debux.org/maven/repo</url>
+        <url>http://debux.org/maven/snapshot</url>
     </repository>
 
     <!-- depot des releases nuiton -->

    

r3088 - in trunk: . pollen-wm pollen-wm/src/main/java/org/chorem/pollen/web pollen-wm/src/main/resources pollen-wm/src/main/webapp/WEB-INF

echatellier＠users.chorem.org

tags

participants (1)