You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/12/11 10:41:21 UTC

svn commit: r485582 - in /cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources: META-INF/archetype.xml archetype-resources/pom.xml archetype-resources/rcl.properties

Author: reinhard
Date: Mon Dec 11 01:41:20 2006
New Revision: 485582

URL: http://svn.apache.org/viewvc?view=rev&rev=485582
Log:
polishing for release; add rcl.properties which is required to use the reloading classloader plugin

Added:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties   (with props)
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=485582&r1=485581&r2=485582
==============================================================================
--- 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 Mon Dec 11 01:41:20 2006
@@ -18,6 +18,7 @@
 <archetype>
   <id>cocoon-archetype-block</id>
   <resources>
+    <resource>rcl.properties</resource>  
     <resource>src/main/java/demo/MyBean.java</resource>
     <resource>src/main/resources/COB-INF/sitemap.xmap</resource>
     <resource>src/main/resources/COB-INF/demo.js</resource>

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=485582&r1=485581&r2=485582
==============================================================================
--- 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 Mon Dec 11 01:41:20 2006
@@ -29,15 +29,12 @@
   <artifactId>${artifactId}</artifactId>
   <version>${version}</version>
   <build>
-    <!-- with multimodule project setting finalName like this results in having 2 jars in cocoon/lib:
-  	     my-module.jar and my-module-1.0-SNAPSHOT.jar -->
-    <!-- finalName>${artifactId}</finalName -->
     <plugins>
-      <plugin>
+      <!--plugin>
         <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-deployer-plugin</artifactId>
-        <version>1.0.0-M2-SNAPSHOT</version>
-      </plugin>
+        <artifactId>cocoon-rcl-plugin</artifactId>
+        <version>1.0.0-M1-SNAPSHOT</version>
+      </plugin-->
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
@@ -51,6 +48,12 @@
           </connectors>
           <webAppSourceDirectory>${project.build.directory}/${pom.artifactId}-${pom.version}</webAppSourceDirectory>
           <contextPath>/</contextPath>
+          <systemProperties>
+            <systemProperty>
+              <name>org.apache.cocoon.mode</name>
+              <value>dev</value>
+            </systemProperty>            
+          </systemProperties>           
         </configuration>
       </plugin>
       <plugin>
@@ -80,20 +83,20 @@
     </dependency>      
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-forms-impl</artifactId>
+      <artifactId>cocoon-template-impl</artifactId>
       <version>1.0.0-M2-SNAPSHOT</version>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-template-impl</artifactId>
+      <artifactId>cocoon-forms-impl</artifactId>
       <version>1.0.0-M2-SNAPSHOT</version>
-    </dependency>
+    </dependency-->    
   </dependencies>
   <repositories>
-    <repository>
+    <!--repository>
       <id>apache.snapshot</id>
       <name>Apache Snapshot Repository</name>
       <url>http://svn.apache.org/maven-snapshot-repository</url>
-    </repository>
+    </repository-->
   </repositories>
 </project>

Added: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties?view=auto&rev=485582
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties (added)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties Mon Dec 11 01:41:20 2006
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+${groupId}.${artifactId}.block%classes-dir=./target/classes
\ No newline at end of file

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/rcl.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain