forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r750826 - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block: ./ src/main/resources/META-INF/cocoon/avalon/ src/main/resources/META-INF/cocoon/spring/
Date Fri, 06 Mar 2009 09:54:54 GMT
Author: thorsten
Date: Fri Mar  6 09:54:52 2009
New Revision: 750826

URL: http://svn.apache.org/viewvc?rev=750826&view=rev
Log:
Fixing rcl bevaviour. This makes it again possible to start blocks standalone.

Modified:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml?rev=750826&r1=750825&r2=750826&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/pom.xml
Fri Mar  6 09:54:52 2009
@@ -75,13 +75,13 @@
       <plugin>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0-M3</version>
+        <version>1.0.0-M2</version>
         <executions>
           <execution>
-            <id>rcl</id>
+            <id>prepare</id>
             <phase>compile</phase>
             <goals>
-              <goal>rcl</goal>
+              <goal>prepare</goal>
             </goals>
           </execution>
         </executions>
@@ -134,7 +134,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
       </plugin>
     </plugins>
   </build>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties?rev=750826&r1=750825&r2=750826&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/rcl.properties
Fri Mar  6 09:54:52 2009
@@ -14,5 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.apache.forrest.dispatcher.block%classes-dir=./target/classes
-org.apache.forrest.propertiesGenerator.block%classes-dir=../propertiesGenerator/target/classes
\ No newline at end of file
+org.apache.forrest.dispatcher.service%classes-dir=./target/classes
+org.apache.forrest.propertiesGenerator.block%classes-dir=../propertiesGenerator/target/classes

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf?rev=750826&r1=750825&r2=750826&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
Fri Mar  6 09:54:52 2009
@@ -55,6 +55,7 @@
       <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
       <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
       <encoding>UTF-8</encoding>
+      <indent>true</indent>
     </map:serializer>
   </map:serializers>
 </map:components>
\ No newline at end of file

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml?rev=750826&r1=750825&r2=750826&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
Fri Mar  6 09:54:52 2009
@@ -23,10 +23,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:servlet="http://cocoon.apache.org/schema/servlet"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
   
-  <bean id="org.apache.forrest.dispatcher.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean id="org.apache.forrest.dispatcher.service" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/dispatcher" context-path="blockcontext:/dispatcher/">
       <servlet:connections>
         <entry key="propertiesGenerator" value-ref="org.apache.forrest.propertiesGenerator.block"/>



Mime
View raw message