You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:01:05 UTC

svn commit: r1522160 - /james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml

Author: dongxu
Date: Thu Sep 12 03:01:05 2013
New Revision: 1522160

URL: http://svn.apache.org/r1522160
Log:
config guice server module's listener

Modified:
    james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml

Modified: james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml?rev=1522160&r1=1522159&r2=1522160&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml (original)
+++ james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml Thu Sep 12 03:01:05 2013
@@ -60,6 +60,7 @@
     <listener>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
         <listener-class>org.apache.hupa.server.ioc.GuiceListener</listener-class>
 =======
         <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
@@ -67,6 +68,9 @@
 =======
         <listener-class>org.apache.hupa.server.guice.GuiceServletConfig</listener-class>
 >>>>>>> first commit
+=======
+        <listener-class>org.apache.hupa.server.ioc.GuiceListener</listener-class>
+>>>>>>> config guice server module's listener
     </listener>
 
     <!-- Gwt remote logging -->



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org