cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r769167 - in /cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring: cocoon-sample-jaxrs.xml cocoon-sample-servlet-service.xml cocoon-sample-sitemap-components.xml
Date Mon, 27 Apr 2009 21:22:12 GMT
Author: reinhard
Date: Mon Apr 27 21:22:10 2009
New Revision: 769167

URL: http://svn.apache.org/viewvc?rev=769167&view=rev
Log:
comment jax-rs stuff that will hopefully soon be ready to be committed

Modified:
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml?rev=769167&r1=769166&r2=769167&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
Mon Apr 27 21:22:10 2009
@@ -21,9 +21,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+  <!-- 
   <bean id="org.apache.cocoon.sample.rest.resource.one" class="org.apache.cocoon.sample.jaxrs.SampleRestResource">
     <property name="settings" ref="org.apache.cocoon.configuration.Settings" />
   </bean>
   <bean id="org.apache.cocoon.sample.rest.resource.two" class="org.apache.cocoon.sample.jaxrs.Sample2RestResource"
/>
-  
+  -->
 </beans>

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml?rev=769167&r1=769166&r2=769167&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
Mon Apr 27 21:22:10 2009
@@ -28,11 +28,11 @@
   
   <!-- A Cocoon-Sitemap based servlet-service. -->
   <bean id="org.apache.cocoon.sample.servlet" class="org.apache.cocoon.servlet.XMLSitemapServlet">
-    <servlet:context mount-path="" context-path="blockcontext:/cocoon-sample/">   
  
-    </servlet:context>
+    <servlet:context mount-path="" context-path="blockcontext:/cocoon-sample/" /> 
    
   </bean>
   
   <!-- A servlet-service that exposes JAX-RS REST endpoints. -->
+  <!-- 
   <bean id="org.apache.cocoon.sample.rest.servlet" class="org.apache.cocoon.rest.jaxrs.container.CocoonJAXRSServlet">
     <servlet:context mount-path="/jax-rs" context-path="blockcontext:/cocoon-sample/">
       <servlet:connections>
@@ -47,4 +47,5 @@
       </list>
     </property>
   </bean>
+  -->
 </beans>

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml?rev=769167&r1=769166&r2=769167&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
Mon Apr 27 21:22:10 2009
@@ -23,7 +23,7 @@
 
   <bean name="action:error-throwing" class="org.apache.cocoon.sample.action.ErrorThrowingAction"
scope="prototype" />
   
-  <bean name="generator:timestamp-caching" class="org.apache.cocoon.sample.generation.CachingTimestampGenerator"
/>
+  <bean name="generator:timestamp-caching" class="org.apache.cocoon.sample.generation.CachingTimestampGenerator"
scope="prototype" />
   
   <bean name="generator:timestamp-noncaching" class="org.apache.cocoon.sample.generation.TimestampGenerator"
scope="prototype" />
 </beans>



Mime
View raw message