cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r642116 - in /cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain: ./ src/main/resources/META-INF/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/src/main/java/ src/main/resources/archetype-resource...
Date Fri, 28 Mar 2008 08:00:53 GMT
Author: reinhard
Date: Fri Mar 28 01:00:47 2008
New Revision: 642116

URL: http://svn.apache.org/viewvc?rev=642116&view=rev
Log:
. cleanup license files
. add empty Spring configuration file
. fix package names
. remove version numbers from pom.xml
. svn:ignore

Added:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/App.java
      - copied, changed from r641638, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/demo/App.java
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
  (with props)
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
  (with props)
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/AppTest.java
      - copied, changed from r641638, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/demo/AppTest.java
Removed:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/LICENSE.txt
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/NOTICE.txt
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/LICENSE.txt
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/NOTICE.txt
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/demo/
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/blockServlet.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/demo/
Modified:
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/   (props changed)
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/archetype.xml
    cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/pom.xml

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 28 01:00:47 2008
@@ -1,8 +1,10 @@
-target
-.classpath
-.project
-.settings
-.wtpmodules
-*.ipr
-*.iml
-*.iws
+target
+.classpath
+.project
+.settings
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.externalToolBuilders
+maven-eclipse.xml

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/archetype.xml?rev=642116&r1=642115&r2=642116&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/archetype.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/META-INF/archetype.xml
Fri Mar 28 01:00:47 2008
@@ -6,22 +6,28 @@
   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.
 -->
+<!-- $Id$ -->
 <archetype>
   <id>cocoon-archetype-block</id>
   <resources>
-    <resource>rcl.properties</resource>  
-    <resource>src/main/java/demo/App.java</resource>
-    <resource>src/test/java/demo/AppTest.java</resource>    
+    <resource>rcl.properties</resource>
     <resource>src/main/resources/COB-INF/sitemap.xmap</resource>
-    <resource>src/main/resources/META-INF/cocoon/spring/blockServlet.xml</resource>
   
+    <resource>src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml</resource>
+    <resource>src/main/resources/META-INF/cocoon/spring/block-application-context.xml</resource>
   </resources>
+  <sources>
+    <source>src/main/java/App.java</source>
+  </sources>
+  <testSources>
+    <testSource>src/test/java/AppTest.java</testSource>
+  </testSources>
 </archetype>

Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/pom.xml?rev=642116&r1=642115&r2=642116&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/pom.xml
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/pom.xml
Fri Mar 28 01:00:47 2008
@@ -17,16 +17,18 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    +-->
+<!-- $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>
 
+  <parent>
+    <groupId>${groupId}</groupId>
+    <artifactId>[parent-archetype-id]</artifactId>
+    <version>[parent-version]</version>
+  </parent>
   <name>${artifactId}</name>
-  <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <version>${version}</version>
 
@@ -34,17 +36,26 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-RC3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-components</artifactId>
-      <version>1.0.0-RC2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-template-impl</artifactId>
-      <version>1.0.0-RC3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!--  Test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Copied: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/App.java
(from r641638, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/demo/App.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/App.java?p2=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/App.java&p1=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/demo/App.java&r1=641638&r2=642116&rev=642116&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/demo/App.java
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/java/App.java
Fri Mar 28 01:00:47 2008
@@ -1,13 +1,12 @@
-package com.mycompany.app;
+package $package;
 
 /**
  * Hello world!
- *
  */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
+public class App {
+
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
     }
+
 }

Added: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml?rev=642116&view=auto
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
(added)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
Fri Mar 28 01:00:47 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:p="http://www.springframework.org/schema/p"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xmlns:pipeline="http://cocoon.apache.org/schema/pipeline"
+  xsi:schemaLocation="
+  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+  http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+  http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+  http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd">
+
+</beans>

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=642116&view=auto
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
(added)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
Fri Mar 28 01:00:47 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+  und
+-->
+<!-- $Id$ -->
+<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.5.xsd
+                           http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+  <bean name="${groupId}.${artifactId}.service" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/${artifactId}" context-path="blockcontext:/${artifactId}/"/>
+  </bean>
+
+</beans>

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/AppTest.java
(from r641638, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/demo/AppTest.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/AppTest.java?p2=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/AppTest.java&p1=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/demo/AppTest.java&r1=641638&r2=642116&rev=642116&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/demo/AppTest.java
(original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block-plain/src/main/resources/archetype-resources/src/test/java/AppTest.java
Fri Mar 28 01:00:47 2008
@@ -1,4 +1,4 @@
-package com.mycompany.app;
+package $package;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -7,32 +7,29 @@
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
+public class AppTest extends TestCase {
+
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
-    {
+    public AppTest(String testName) {
         super( testName );
     }
 
     /**
      * @return the suite of tests being tested
      */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
     }
 
     /**
      * Rigourous Test :-)
      */
-    public void testApp()
-    {
-        assertTrue( true );
+    public void testApp() {
+        assertTrue(true);
     }
+
 }



Mime
View raw message