cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r508491 - in /cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources: META-INF/ archetype-resources/ archetype-resources/src/main/resources/META-INF/cocoon/spring/
Date Fri, 16 Feb 2007 16:56:25 GMT
Author: reinhard
Date: Fri Feb 16 08:56:24 2007
New Revision: 508491

URL: http://svn.apache.org/viewvc?view=rev&rev=508491
Log:
switch to servlet-service fw; use released artifacts

Added:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
      - copied, changed from r508344, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
Removed:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
Modified:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml?view=diff&rev=508491&r1=508490&r2=508491
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml
Fri Feb 16 08:56:24 2007
@@ -24,6 +24,6 @@
     <resource>src/main/resources/COB-INF/demo.js</resource>
     <resource>src/main/resources/COB-INF/demo.xml</resource>
     <resource>src/main/resources/META-INF/cocoon/spring/demo-application-context.xml</resource>
-    <resource>src/main/resources/META-INF/cocoon/spring/block.xml</resource>
   
+    <resource>src/main/resources/META-INF/cocoon/spring/servlet-service.xml</resource>
   
   </resources>
 </archetype>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml?view=diff&rev=508491&r1=508490&r2=508491
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
Fri Feb 16 08:56:24 2007
@@ -21,12 +21,15 @@
     | @version $Id$
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
+
   <name>${artifactId}</name>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <version>${version}</version>
+
   <build>
     <plugins>
       <!-- As the reloading classloader plugin hasn't been released yet, it is uncommented.
@@ -71,28 +74,44 @@
       </plugin>
     </plugins>
   </build>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-RC1-SNAPSHOT</version>
+      <version>2.2.0-M3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-blocks-fw-impl</artifactId>
+      <artifactId>cocoon-servlet-service-components</artifactId>
       <version>1.0.0-M1</version>
     </dependency>      
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>1.0.0-RC1-SNAPSHOT</version>
+      <version>1.0.0-M3</version>
     </dependency>  
   </dependencies> 
+  
   <repositories>
+    <!-- Avalon/Excalibur dependencies -->
+    <repository>
+      <id>apache.snapshot</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>  
+    <!-- Release testing -->
     <repository>
       <id>cocoon.staging</id>
       <name>Cocoon staging repository</name>
       <url>http://people.apache.org/builds/cocoon</url>
     </repository>
   </repositories>
+
 </project>

Copied: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
(from r508344, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/servlet-service.xml?view=diff&rev=508491&p1=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml&r1=508344&p2=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/servlet-service.xml&r2=508491
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
Fri Feb 16 08:56:24 2007
@@ -19,13 +19,15 @@
 -->
 <!--+
     | @version $Id$
-    +-->  
-<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.xsd">
-  <bean id="${groupId}.${artifactId}.block" class="org.apache.cocoon.blocks.BlockServlet">
-    <property name="mountPath" value="/${artifactId}"/>
-    <property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
-    <property name="blockContextURL" value="blockcontext:/${artifactId}/"/>
+    +-->
+<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.xsd
+  http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+  
+  <bean id="${groupId}.${artifactId}.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/${artifactId}" context-path="blockcontext:/${artifactId}/"/>
   </bean>
+  
 </beans>



Mime
View raw message