cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r371333 - in /cocoon/trunk: cocoon-deployer/src/main/java/org/apache/cocoon/deployer/ cocoon-deployer/src/main/java/org/apache/cocoon/deployer/applicationserver/ cocoon-deployer/src/main/resources/xsd/ cocoon-deployer/src/test/java/org/apac...
Date Sun, 22 Jan 2006 16:23:32 GMT
Author: reinhard
Date: Sun Jan 22 08:21:41 2006
New Revision: 371333

URL: http://svn.apache.org/viewcvs?rev=371333&view=rev
Log:
make cocoon:simple-deploy work for the cocoon-deployer-plugin-demo project

Added:
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/README.txt   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/pom.xml   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/App.java   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/pom.xml   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/blocks/
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/web.xml   (with props)
    cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/wiring.xml   (with props)
Modified:
    cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
    cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java
    cocoon/trunk/cocoon-deployer/src/main/resources/xsd/deploy-schema-1.0.xsd
    cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java
    cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/LICENSE.txt   (contents, props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/NOTICE.txt   (contents, props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/pom.xml
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/run.bat   (contents, props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployMojo.java   (contents, props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenArtifactProvider.java   (contents, props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenLoggingWrapper.java   (props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SimpleDeployMojo.java   (contents, props changed)
    cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java   (contents, props changed)
    cocoon/trunk/cocoon-plugins/pom.xml   (contents, props changed)

Modified: cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java (original)
+++ cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java Sun Jan 22 08:21:41 2006
@@ -71,12 +71,12 @@
 		
 		Validate.notNull(deploymentDescriptor, "A deployment descriptor object has to be passed.");
 
-
 		// read the deploy script
 		org.apache.cocoon.deployer.generated.deploy.x10.Block[] installBlocks = deploymentDescriptor.getBlock();
 
 		for(int i = 0; i < installBlocks.length; i++) {
 			org.apache.cocoon.deployer.generated.deploy.x10.Block installBlock = installBlocks[i];
+			log.verbose("Block urn: " + installBlock.getUrn());			
 			String blockUrn = installBlock.getUrn();
 			File blockArchive = null;
 			if(installBlock.getLocation() == null) {

Modified: cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java (original)
+++ cocoon/trunk/cocoon-deployer/src/main/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22.java Sun Jan 22 08:21:41 2006
@@ -26,11 +26,9 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.zip.ZipInputStream;
 
 import org.apache.cocoon.deployer.ArtifactProvider;
@@ -51,7 +49,7 @@
 
 public class CocoonServer22 implements CocoonServer {
 
-	public static final String COCOON_22_SERVER_ARTIFACT = "org.apache.cocoon:cocoon-server:2.2";
+	public static final String DEFAULT_COCOON_22_SERVER_ARTIFACT = "org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war";
 	public static final String WIRING_10_NAMESPACE = "http://apache.org/cocoon/blocks/wiring/1.0";
 	public static final String WIRING_FILE = "WEB-INF/wiring.xml";
 	public static final String WEB_INF_BLOCKS_DIR = "WEB-INF/blocks";
@@ -87,6 +85,7 @@
 
 	    try {
 	    	File baseDirectoryFile = new File(this.baseDirectory);
+	    	
 			// install the Cocoon server if necessary
 			if(baseDirectoryFile.list().length == 0) {
 				deployCocoonServer(frm, txId, "");
@@ -299,7 +298,7 @@
 	 * Extract the Cocoon server to the filesystem using the FileResourceManager
 	 */
 	protected void deployCocoonServer(FileResourceManager frm, String txId, String relativeOutputDir) {
-		File zip = this.artifactProvider.getArtifact(COCOON_22_SERVER_ARTIFACT);
+		File zip = this.artifactProvider.getArtifact(DEFAULT_COCOON_22_SERVER_ARTIFACT);
 		try {
 			ZipUtils.extractZip(new ZipInputStream(new FileInputStream(zip)), frm, txId, relativeOutputDir);
 		} catch (FileNotFoundException e) {

Modified: cocoon/trunk/cocoon-deployer/src/main/resources/xsd/deploy-schema-1.0.xsd
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/main/resources/xsd/deploy-schema-1.0.xsd?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/main/resources/xsd/deploy-schema-1.0.xsd (original)
+++ cocoon/trunk/cocoon-deployer/src/main/resources/xsd/deploy-schema-1.0.xsd Sun Jan 22 08:21:41 2006
@@ -34,6 +34,7 @@
   	<xs:attribute name="url" type="xs:anyURI" use="required"/>
     <xs:attribute name="exclusive" type="xs:boolean" use="required"/>
   	<xs:attribute name="version" type="xs:string" use="required"/>	
+  	<xs:attribute name="webapp" type="xs:anyURI" use="optional"/>
   </xs:complexType>
   
   <xs:complexType name="block">

Modified: cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java (original)
+++ cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/BlockDeployerTest.java Sun Jan 22 08:21:41 2006
@@ -43,7 +43,7 @@
 		ArtifactProvider aProvider = (ArtifactProvider) aProviderCtrl.getMock();
 		
 		// server
-		aProvider.getArtifact(CocoonServer22.COCOON_22_SERVER_ARTIFACT);
+		aProvider.getArtifact(CocoonServer22.DEFAULT_COCOON_22_SERVER_ARTIFACT);
 		File vanillaCocoonServerArtifact = this.getMockArtefact("validVanillaCocoon22App/appRoot.zip");
 		assertTrue(vanillaCocoonServerArtifact.exists());		
 		aProviderCtrl.setReturnValue(vanillaCocoonServerArtifact);

Modified: cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java (original)
+++ cocoon/trunk/cocoon-deployer/src/test/java/org/apache/cocoon/deployer/applicationserver/CocoonServer22Test.java Sun Jan 22 08:21:41 2006
@@ -140,7 +140,7 @@
 		MockControl aProviderCtrl = MockControl.createControl(ArtifactProvider.class);
 		ArtifactProvider aProvider = (ArtifactProvider) aProviderCtrl.getMock();
 		
-		aProvider.getArtifact(CocoonServer22.COCOON_22_SERVER_ARTIFACT);
+		aProvider.getArtifact(CocoonServer22.DEFAULT_COCOON_22_SERVER_ARTIFACT);
 		File vanillaCocoonServerArtifact = this.getMockArtefact("validVanillaCocoon22App/appRoot.zip");
 		assertTrue(vanillaCocoonServerArtifact.exists());		
 		aProviderCtrl.setReturnValue(vanillaCocoonServerArtifact);

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jan 22 08:21:41 2006
@@ -0,0 +1,5 @@
+
+.classpath
+.project
+.wtpmodules
+target

Added: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/README.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/README.txt?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/README.txt (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/README.txt Sun Jan 22 08:21:41 2006
@@ -0,0 +1,16 @@
+This project is a minimal sample of a block in order to demonstrate the functionality 
+of the block deployer (simple-deploy).
+
+When the development of the block deployer has stabilized, this block's content will become an archetype too.
+
+In order to test it, move to ./cocoon/trunk/cocoon-plugins and run
+
+mvn install
+
+and then, movto to ./cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo and run
+
+mvn cocoon:simple-deploy
+
+from your console.
+
+WARNING: The created webapp can't be deployed into a servlet container!

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/pom.xml?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/pom.xml (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/pom.xml Sun Jan 22 08:21:41 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed 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.
+-->
+<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>
+  
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-plugins</artifactId>    
+    <version>1.0-SNAPSHOT</version>
+  </parent>  
+  
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-deployer-plugin-demo</artifactId>
+  <version>1.0-SNAPSHOT</version>  
+  
+  <packaging>jar</packaging>
+
+  <name>Demo for the Cocoon block deployer</name>
+  <url>http://cocoon.apache.org</url>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-block-deployer-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </plugin>
+    </plugins>
+  </build>  
+  
+</project>

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap Sun Jan 22 08:21:41 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="test">
+        <map:generate src="test.xml"/>
+        <map:serialize/>
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml Sun Jan 22 08:21:41 2006
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<test/>
\ No newline at end of file

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/COB-INF/test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/App.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/App.java?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/App.java (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/App.java Sun Jan 22 08:21:41 2006
@@ -0,0 +1,13 @@
+package org.apache.cocoon;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/java/org/apache/cocoon/App.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml Sun Jan 22 08:21:41 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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. 
+-->
+<block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
+  id="org.apache.cocoon:cocoon-deployer-plugin-demo:1.0-SNAPSHOT">
+  
+  <name>Demo for the Cocoon block deployer</name>
+  <description href="http://cocoon.apache.org">
+    Demo for the Cocoon block deployer
+  </description>
+  <state href="http://cocoon.apache.org/blocks/anyblock/1.0/state.html" 
+         community="committed" 
+         interfaces="unstable" 
+         implementation="unstable"/>
+  <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
+  <author href="http://cocoon.apache.org">Apache Cocoon community</author>
+  
+</block>
\ No newline at end of file

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin-demo/src/main/resources/META-INF/block.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/LICENSE.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/LICENSE.txt?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/LICENSE.txt (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/LICENSE.txt Sun Jan 22 08:21:41 2006
@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/NOTICE.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/NOTICE.txt?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/NOTICE.txt (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/NOTICE.txt Sun Jan 22 08:21:41 2006
@@ -1,2 +1,2 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/pom.xml?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/pom.xml (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/pom.xml Sun Jan 22 08:21:41 2006
@@ -1,14 +1,18 @@
 <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>  
+  
   <parent>
-    <artifactId>cocoon-plugins</artifactId>
     <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-plugins</artifactId>    
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cocoon-deployer-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
+
+  <artifactId>cocoon-block-deployer-plugin</artifactId>
   <version>1.0-SNAPSHOT</version>
+    
+  <packaging>maven-plugin</packaging>
   
   <name>Cocoon Block Deployer - Maven 2 Plugin</name>
   <url>http://cocoon.apache.org</url>
@@ -59,7 +63,7 @@
         <configuration>
           <goalPrefix>cocoon</goalPrefix>
         </configuration>
-      </plugin>
+      </plugin>    
     </plugins>
   </build>
   <developers>
@@ -70,6 +74,6 @@
         <role>committer</role>
       </roles>
     </developer>
-  </developers>   
+  </developers>  
   
 </project>

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/run.bat
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/run.bat?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/run.bat (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/run.bat Sun Jan 22 08:21:41 2006
@@ -1 +1 @@
-mvn -X org.apache.cocoon:deployer-maven-plugin:1.0-SNAPSHOT:deploy
\ No newline at end of file
+mvn -X -e org.apache.cocoon:cocoon-block-deployer-plugin:1.0-SNAPSHOT:simple-deploy1
\ No newline at end of file

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/run.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployMojo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployMojo.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployMojo.java (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployMojo.java Sun Jan 22 08:21:41 2006
@@ -1,160 +1,156 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- * 
- * Licensed 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.
- */
-package org.apache.cocoon.maven.deployer;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.artifact.MavenMetadataSource;
-
-/**
- * @goal deploy
- * @requiresProject false
- */
-public class DeployMojo extends AbstractMojo {
-
-    /**
-     * Artifact factory, needed to download source jars for inclusion in classpath.
-     *
-     * @component role="org.apache.maven.artifact.factory.ArtifactFactory"
-     * @required
-     * @readonly
-     */
-    private ArtifactFactory artifactFactory;	
-    
-    /**
-     * Artifact resolver, needed to download source jars for inclusion in classpath.
-     *
-     * @component role="org.apache.maven.artifact.resolver.ArtifactResolver"
-     * @required
-     * @readonly
-     */
-    private ArtifactResolver artifactResolver;   
-    
-    /**
-     * Artifact resolver, needed to download source jars for inclusion in classpath.
-     *
-     * @component role="org.apache.maven.artifact.metadata.ArtifactMetadataSource"
-     * @required
-     * @readonly
-     */
-    private MavenMetadataSource metadataSource;    
-    
-    /**
-     * Local maven repository.
-     *
-     * @parameter expression="${localRepository}"
-     * @required
-     * @readonly
-     */
-    private ArtifactRepository localRepository;    
-    
-
-    /**
-     * Remote repositories which will be searched for blocks.
-     *
-     * @parameter expression="${project.remoteArtifactRepositories}"
-     * @required
-     * @readonly
-     */
-    private List remoteArtifactRepositories;  
-    
-    /**
-     * The source directory containing *.xsd files
-     * 
-     * @parameter expression="${basedir}/deploy.xml"
-     */
-    private String deployDescriptor;    
-	
-    public void execute() throws MojoExecutionException 
-    {
-        getLog().info("Cocoon block deployer");
-        getLog().info("factory: " + artifactFactory.toString());
-        
-        Artifact sourceArtifact = artifactFactory.createArtifactWithClassifier( "junit", "junit", "3.8.1", "java-source", "sources" );        
-        Set artifacts = null;
-        ArtifactResolutionResult result = null;  
-        try {
-			artifactResolver.resolve( sourceArtifact, remoteArtifactRepositories, localRepository );
-			
-			// see org.apache.maven.artifact.ant.DependenciesTask
-			Dependency dependency = new Dependency();
-			dependency.setArtifactId("easymock");
-			dependency.setGroupId("easymock");
-			dependency.setVersion("1.1");
-			Dependency dependency1 = new Dependency();
-			dependency1.setArtifactId("commons-dbcp");
-			dependency1.setGroupId("commons-dbcp");
-			dependency1.setVersion("1.2");
-			Dependency dependency2 = new Dependency();
-			dependency2.setArtifactId("log4j");
-			dependency2.setGroupId("log4j");
-			dependency2.setVersion("1.2.8");			
-			List dependencies = new ArrayList();
-			dependencies.add(dependency);
-			dependencies.add(dependency1);
-			dependencies.add(dependency2);			
-
-            Artifact pomArtifact = artifactFactory.createBuildArtifact( "log4j", "log4j", "1.2.9", "jar");			
-            Map managedDependencies = Collections.EMPTY_MAP;			
-            artifacts = MavenMetadataSource.createArtifacts( artifactFactory, dependencies, null, null, null );			
-            result = artifactResolver.resolveTransitively( artifacts, pomArtifact, managedDependencies, localRepository,
-                    remoteArtifactRepositories, metadataSource);
-
-            
-		} catch (ArtifactResolutionException e) {
-			e.printStackTrace();
-		} catch (ArtifactNotFoundException e) {
-			e.printStackTrace();
-		} catch (InvalidDependencyVersionException e) {
-			e.printStackTrace();
-		}
-
-        for ( Iterator i = artifacts.iterator(); i.hasNext(); )
-        {
-            Artifact artifact = (Artifact) i.next();
-            System.out.println("art: " + artifact.getId());
-        }		
-		
-	    for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
-        {
-            Artifact artifact = (Artifact) i.next();
-            System.out.println("res " + artifact.getId());
-        }		
-		getLog().info("deployDescriptor: " + new File(deployDescriptor).getAbsolutePath());
-        getLog().info("sourceArtifact: " + sourceArtifact.toString());
-        getLog().info("sourceArtifact path: " + sourceArtifact.getFile().getAbsolutePath());                
-        getLog().info("sourceArtifact exists: " + sourceArtifact.getFile().exists());        
-
-    }	
-	
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.
+ */
+package org.apache.cocoon.maven.deployer;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.project.artifact.MavenMetadataSource;
+
+/**
+ * @goal deploy
+ * @requiresProject false
+ */
+public class DeployMojo extends AbstractMojo {
+
+    /**
+     * Artifact factory, needed to download source jars for inclusion in classpath.
+     *
+     * @component role="org.apache.maven.artifact.factory.ArtifactFactory"
+     * @required
+     * @readonly
+     */
+    private ArtifactFactory artifactFactory;	
+    
+    /**
+     * Artifact resolver, needed to download source jars for inclusion in classpath.
+     *
+     * @component role="org.apache.maven.artifact.resolver.ArtifactResolver"
+     * @required
+     * @readonly
+     */
+    private ArtifactResolver artifactResolver;   
+    
+    /**
+     * Artifact resolver, needed to download source jars for inclusion in classpath.
+     *
+     * @component role="org.apache.maven.artifact.metadata.ArtifactMetadataSource"
+     * @required
+     * @readonly
+     */
+    private MavenMetadataSource metadataSource;    
+    
+    /**
+     * Local maven repository.
+     *
+     * @parameter expression="${localRepository}"
+     * @required
+     * @readonly
+     */
+    private ArtifactRepository localRepository;    
+    
+
+    /**
+     * Remote repositories which will be searched for blocks.
+     *
+     * @parameter expression="${project.remoteArtifactRepositories}"
+     * @required
+     * @readonly
+     */
+    private List remoteArtifactRepositories;  
+    
+    /**
+     * The source directory containing *.xsd files
+     * 
+     * @parameter expression="${basedir}/deploy.xml"
+     */
+    private String deployDescriptor;    
+	
+    public void execute() throws MojoExecutionException 
+    {
+        getLog().info("Cocoon block deployer");
+        getLog().info("factory: " + artifactFactory.toString());
+         
+        Set artifacts = null;
+        ArtifactResolutionResult result = null;  
+        try {
+			
+			// see org.apache.maven.artifact.ant.DependenciesTask
+			Dependency dependency = new Dependency();
+			dependency.setArtifactId("easymock");
+			dependency.setGroupId("easymock");
+			dependency.setVersion("1.1");
+			Dependency dependency1 = new Dependency();
+			dependency1.setArtifactId("commons-dbcp");
+			dependency1.setGroupId("commons-dbcp");
+			dependency1.setVersion("1.2");
+			Dependency dependency2 = new Dependency();
+			dependency2.setArtifactId("log4j");
+			dependency2.setGroupId("log4j");
+			dependency2.setVersion("1.2.8");			
+			List dependencies = new ArrayList();
+			dependencies.add(dependency);
+			dependencies.add(dependency1);
+			dependencies.add(dependency2);			
+
+            Artifact pomArtifact = artifactFactory.createBuildArtifact( "log4j", "log4j", "1.2.9", "jar");			
+            Map managedDependencies = Collections.EMPTY_MAP;			
+            artifacts = MavenMetadataSource.createArtifacts( artifactFactory, dependencies, null, null, null );			
+            result = artifactResolver.resolveTransitively( artifacts, pomArtifact, managedDependencies, localRepository,
+                    remoteArtifactRepositories, metadataSource);
+
+            
+		} catch (ArtifactResolutionException e) {
+			e.printStackTrace();
+		} catch (ArtifactNotFoundException e) {
+			e.printStackTrace();
+		} catch (InvalidDependencyVersionException e) {
+			e.printStackTrace();
+		}
+
+        for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+        {
+            Artifact artifact = (Artifact) i.next();
+            System.out.println("art: " + artifact.getId());
+        }		
+		
+	    for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+        {
+            Artifact artifact = (Artifact) i.next();
+            System.out.println("res " + artifact.getId());
+        }		
+	    
+		getLog().info("deployDescriptor: " + new File(deployDescriptor).getAbsolutePath());   
+
+    }	
+	
 }

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/DeployMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenArtifactProvider.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenArtifactProvider.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenArtifactProvider.java (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenArtifactProvider.java Sun Jan 22 08:21:41 2006
@@ -108,6 +108,11 @@
      * @see org.apache.cocoon.deployer.ArtifactProvider#getArtifact(java.lang.String[])
      */
     public final File[] getArtifact(String[] artifactIds) {
+    	
+    	// FIXME (reinhard) this doesn't use transitive dependency resolving!
+    	
+    	Validate.notNull(artifactIds, "artifactIds mustn't be null");
+    	Validate.noNullElements(artifactIds, "Quering a 'null'-artifact is not possible");
         final File[] files = new File[artifactIds.length];
 
         for(int i = 0; i < artifactIds.length; i++) {
@@ -129,6 +134,8 @@
      */
     private Artifact getArtifactFor(final String artifactSpec)
         throws ArtifactResolutionException, ArtifactNotFoundException {
+        this.log.debug("[MavenArtifactProvider.getArtifactFor: artifactSpec=" + artifactSpec);    	
+    	
         final int p1 = artifactSpec.indexOf(':');
         Validate.isTrue(p1 > 0, "invalid artifact specifier: " + artifactSpec);
 
@@ -137,14 +144,26 @@
         Validate.isTrue(p2 > 0, "invalid artifact specifier: " + artifactSpec);
 
         final String artifactId = artifactSpec.substring(p1 + 1, p2);
-        final int p3 = artifactId.indexOf(':', p2 + 1);
+        final int p3 = artifactSpec.indexOf(':', p2 + 1);
+        System.out.println("p3: " + p3);
         final String version =
             (p3 > 0) ? artifactSpec.substring(p2 + 1, p3) : artifactSpec.substring(p2 + 1);
         final String type = (p3 > 0) ? artifactSpec.substring(p3 + 1) : "jar";
-        final Artifact artifact =
-            this.artifactFactory.createBuildArtifact(groupId, artifactId, version, type);
-        this.artifactResolver.resolve(artifact, remoteArtifactRepositories, localRepository);
-
+        
+        this.log.debug("[MavenArtifactProvider.getArtifactFor: groupId=" + groupId);
+        this.log.debug("[MavenArtifactProvider.getArtifactFor: artifactId=" + artifactId);
+        this.log.debug("[MavenArtifactProvider.getArtifactFor: version=" + version);       
+        this.log.debug("[MavenArtifactProvider.getArtifactFor: type=" + type);            
+        
+        final Artifact artifact = 
+        	this.artifactFactory.createBuildArtifact(groupId, artifactId, version, type);
+        
+        this.artifactResolver.resolve(artifact, this.remoteArtifactRepositories, 
+            this.localRepository);
+
+        this.log.debug("[MavenArtifactProvider.getArtifactFor: found " + 
+            artifact.getFile().getAbsolutePath());
+        
         return artifact;
     }
 }

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenArtifactProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/MavenLoggingWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SimpleDeployMojo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SimpleDeployMojo.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SimpleDeployMojo.java (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SimpleDeployMojo.java Sun Jan 22 08:21:41 2006
@@ -37,7 +37,7 @@
 /**
  * DOCUMENT ME!
  *
- * @goal simple-deploy
+ * @goal simple-deploy-giacomo
  * @phase package
  * @requiresProject false
  */

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SimpleDeployMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java (original)
+++ cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java Sun Jan 22 08:21:41 2006
@@ -30,64 +30,79 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.MavenMetadataSource;
 
 import java.util.List;
 
 
 /**
- * DOCUMENT ME!
+ * This Mojo is used to deploy a single Cocoon block, usually just at development time. All block dependencies
+ * are resolved automatically (auto-wiring is true). If you need more, use the @link org.apache.cocoon.maven.deployer.DeployMojo
+ * that requires a deployment configuration file.
  *
- * @goal test-deploy
- * @phase package
+ * @goal simple-deploy
  * @requiresProject true
+ * @description
+ * @execute phase="install"
  */
 public class SingleBlockDeployMojo
     extends AbstractMojo {
     //~ Instance fields ---------------------------------------------------------------------------------
 
     /**
+     * The project whose project files to create.
+     *
+     * @parameter expression="${project}"
+     * @required
+     */
+    private MavenProject project;	
+	
+    /**
      * Artifact factory, needed to download source jars for inclusion in classpath.
      *
      * @component role="org.apache.maven.artifact.factory.ArtifactFactory"
      * @required
      * @readonly
      */
-    private ArtifactFactory artifactFactory;
-
+    private ArtifactFactory artifactFactory;	
+    
     /**
-     * Local maven repository.
+     * Artifact resolver, needed to download source jars for inclusion in classpath.
      *
+     * @component role="org.apache.maven.artifact.resolver.ArtifactResolver"
      * @required
      * @readonly
      */
-    private ArtifactRepository localRepository;
-
+    private ArtifactResolver artifactResolver;   
+    
     /**
      * Artifact resolver, needed to download source jars for inclusion in classpath.
      *
-     * @component role="org.apache.maven.artifact.resolver.ArtifactResolver"
+     * @component role="org.apache.maven.artifact.metadata.ArtifactMetadataSource"
      * @required
      * @readonly
      */
-    private ArtifactResolver artifactResolver;
-
+    private MavenMetadataSource metadataSource;    
+    
     /**
-     * Remote repositories which will be searched for blocks.
+     * Local maven repository.
      *
+     * @parameter expression="${localRepository}"
      * @required
      * @readonly
      */
-    private List remoteArtifactRepositories;
+    private ArtifactRepository localRepository;    
+    
 
     /**
-     * Artifact resolver, needed to download source jars for inclusion in classpath.
+     * Remote repositories which will be searched for blocks.
      *
-     * @component role="org.apache.maven.artifact.metadata.ArtifactMetadataSource"
+     * @parameter expression="${project.remoteArtifactRepositories}"
      * @required
      * @readonly
      */
-    private MavenMetadataSource metadataSource;
+    private List remoteArtifactRepositories;      
 
     //~ Methods -----------------------------------------------------------------------------------------
 
@@ -98,32 +113,52 @@
      */
     public void execute()
         throws MojoExecutionException {
-        getLog().info("Start deployment of ...");
+        
+    	// collecting information from POM
+        String projectName = this.project.getName();
+        String artifactId = this.project.getArtifactId();
+        String groupId = this.project.getGroupId();        
+        String version = this.project.getVersion();
+        
+        String urn = groupId + ":" + artifactId + ":" + version;
+        
+        // inform user what's happening
+        this.getLog().info("Start deployment of '" + projectName + "'");
+        this.getLog().info("[" + urn + "]");        
 
+        // create the Cocoon object
         Cocoon cocoon = new Cocoon();
         cocoon.setExclusive(true);
-        cocoon.setUrl("target/webapp/xyz");
+        cocoon.setUrl("target/cocoon-webapp");
         cocoon.setVersion("2.2");
 
         Block block = new Block();
+        block.setId(artifactId);
         block.setAutoWire(true);
-        block.setLocation("blah");
-
         Mount mount = new Mount();
-        mount.setPath("xyz");
+        mount.setPath("/");
         block.setMount(mount);
-        block.setUrn("blah");
+        
+        block.setUrn(urn);
+        // Disabled for now! Using block.setLocation() make rapid application development possible.
+        // block.setLocation("target/classes");
 
+        // create the deployment object
         Deploy deploy = new Deploy();
         deploy.setCocoon(cocoon);
         deploy.addBlock(block);
-
+        
         BlockDeployer blockDeployer =
-            new BlockDeployer(new MavenArtifactProvider(this.artifactResolver, this.artifactFactory,
+            new BlockDeployer(new MavenArtifactProvider(this.artifactResolver, 
+            											this.artifactFactory,
                                                         this.localRepository,
                                                         this.remoteArtifactRepositories,
-                                                        this.metadataSource, this.getLog()),
-                              new NullVariableResolver(), new MavenLoggingWrapper(this.getLog()));
+                                                        this.metadataSource, 
+                                                        this.getLog()),
+                              new NullVariableResolver(),
+                              new MavenLoggingWrapper(this.getLog()));
+        
         blockDeployer.deploy(deploy);
+        
     }
 }

Propchange: cocoon/trunk/cocoon-plugins/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/SingleBlockDeployMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jan 22 08:21:41 2006
@@ -0,0 +1,5 @@
+
+.classpath
+.project
+.wtpmodules
+target

Added: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/pom.xml?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/pom.xml (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/pom.xml Sun Jan 22 08:21:41 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed 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.
+-->
+<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>
+  
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-plugins</artifactId>    
+    <version>1.0-SNAPSHOT</version>
+  </parent>  
+  
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-minimal-webapp</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  
+  <packaging>war</packaging>
+
+  <name>Minimal Cocoon web application</name>
+  
+  <url>http://cocoon.apache.org</url>
+  
+</project>

Propchange: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/web.xml?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/web.xml (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/web.xml Sun Jan 22 08:21:41 2006
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!--+
+    | This is the BlocksManagerTestCase web-app configurations file
+    +-->
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+  <!-- Servlet Configuration ========================================== -->
+
+  <servlet>
+    <servlet-name>BlocksManager</servlet-name>
+    <display-name>BlocksManager</display-name>
+    <description>BlocksManager</description>
+
+    <servlet-class>org.apache.cocoon.blocks.BlocksManager</servlet-class>
+
+    <init-param>
+      <param-name>work-directory</param-name>
+      <param-value>work</param-value>
+    </init-param>
+
+    <!--
+      Set encoding used by the container. If not set the ISO-8859-1 encoding
+      will be assumed.
+      Since the servlet specification requires that the ISO-8859-1 encoding
+      is used (by default), you should never change this value unless
+      you have a buggy servlet container.
+    -->
+    <init-param>
+      <param-name>container-encoding</param-name>
+      <param-value>ISO-8859-1</param-value>
+    </init-param>
+
+  </servlet>
+
+  <!-- URL space mappings ============================================= -->
+
+  <servlet-mapping>
+    <servlet-name>BlocksManager</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+
+</web-app>

Propchange: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/wiring.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/wiring.xml?rev=371333&view=auto
==============================================================================
--- cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/wiring.xml (added)
+++ cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/wiring.xml Sun Jan 22 08:21:41 2006
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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. 
+-->
+<wiring xmlns="http://apache.org/cocoon/blocks/wiring/1.0"/>

Propchange: cocoon/trunk/cocoon-plugins/cocoon-minimal-webapp/src/main/webapp/WEB-INF/wiring.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-plugins/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-plugins/pom.xml?rev=371333&r1=371332&r2=371333&view=diff
==============================================================================
--- cocoon/trunk/cocoon-plugins/pom.xml (original)
+++ cocoon/trunk/cocoon-plugins/pom.xml Sun Jan 22 08:21:41 2006
@@ -32,5 +32,7 @@
   <version>1.0-SNAPSHOT</version>
   <modules>
     <module>cocoon-deployer-plugin</module>
+    <module>cocoon-deployer-plugin-demo</module>
+    <module>cocoon-minimal-webapp</module>        
   </modules>
 </project>

Propchange: cocoon/trunk/cocoon-plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message