activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1067271 - in /activemq/activemq-apollo/trunk/apollo-web/src/main: scala/org/apache/activemq/apollo/web/Boot.scala scala/org/apache/activemq/apollo/web/JerseyServletContainer.scala webapp/WEB-INF/web.xml
Date Fri, 04 Feb 2011 20:11:38 GMT
Author: chirino
Date: Fri Feb  4 20:11:38 2011
New Revision: 1067271

URL: http://svn.apache.org/viewvc?rev=1067271&view=rev
Log:
Simplifications to the web integration now that we are using fragment bundles in OSGi

Removed:
    activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/JerseyServletContainer.scala
Modified:
    activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/Boot.scala
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/web.xml

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/Boot.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/Boot.scala?rev=1067271&r1=1067270&r2=1067271&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/Boot.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/Boot.scala
Fri Feb  4 20:11:38 2011
@@ -33,7 +33,6 @@ class Boot(engine: TemplateEngine) {
   
   def run: Unit = {
     println("scalate boot: "+Thread.currentThread.getContextClassLoader)
-    engine.classLoader = Thread.currentThread.getContextClassLoader
     engine.packagePrefix = "org.apache.activemq.apollo.web.templates"
   }
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/web.xml?rev=1067271&r1=1067270&r2=1067271&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/web.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/WEB-INF/web.xml Fri Feb  4 20:11:38
2011
@@ -31,7 +31,7 @@
 
   <filter>
     <filter-name>Jersey Filter</filter-name>
-    <filter-class>org.apache.activemq.apollo.web.JerseyServletContainer</filter-class>
+    <filter-class>com.sun.jersey.spi.container.servlet.ServletContainer</filter-class>
     <init-param>
       <param-name>com.sun.jersey.config.feature.Trace</param-name>
       <param-value>false</param-value>
@@ -55,13 +55,6 @@
         org.apache.activemq.apollo.web.resources.JacksonJsonProvider
       </param-value>
     </init-param>
-    <!-- <init-param>
-      <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>
-        org.fusesource.scalate.console;
-        org.apache.activemq.apollo.web.resources
-      </param-value>
-    </init-param> -->
     <init-param>
       <param-name>com.sun.jersey.config.feature.FilterForwardOn404</param-name>
       <param-value>true</param-value>



Mime
View raw message