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

svn commit: r376968 - in /cocoon/trunk/cocoon-block-deployer: ./ cocoon-archetype-block/ cocoon-archetype-block/src/main/resources/ cocoon-archetype-block/src/main/resources/META-INF/ cocoon-archetype-block/src/main/resources/archetype-resources/ cocoo...

Author: reinhard
Date: Sat Feb 11 03:11:08 2006
New Revision: 376968

URL: http://svn.apache.org/viewcvs?rev=376968&view=rev
Log:
svn:eol-style native

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/pom.xml   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/META-INF/archetype.xml   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/test.xml   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/block.xml   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/makeDescriptor.pl   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/block/impl/LocalBlock10.java   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/build.xml   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-06/deploy.xml   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/README.txt   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml   (props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/sitemap.xmap   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/test.xml   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/META-INF/block.xml   (contents, props changed)
    cocoon/trunk/cocoon-block-deployer/pom.xml

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap Sat Feb 11 03:11:08 2006
@@ -1,29 +1,29 @@
-<?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 type="xml"/>
-      </map:match>
-    </map:pipeline>
-  </map:pipelines>
-
-</map:sitemap>
-
+<?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 type="xml"/>
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
+
+</map:sitemap>
+

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/test.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/test.xml?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/test.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/test.xml Sat Feb 11 03:11:08 2006
@@ -1,17 +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.
--->
+<?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>${groupId}:${artifactId}</test>

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/block.xml?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/block.xml Sat Feb 11 03:11:08 2006
@@ -1,37 +1,37 @@
-<?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="${groupId}:${artifactId}:1.0-SNAPSHOT">
-  
-  <name>${artifactId}</name>
-  <description href="http://your-company.com">
-    A Cocoon block
-  </description>
-  <state href="http://company.com/${artifactId}/1.0/state.html" 
-         community="committed" 
-         interfaces="unstable" 
-         implementation="unstable"/>
-  <license href="http://company.com/licenses/">[license]</license>
-  <author href="http://company.com">[author]</author>
-  <servlet class="org.apache.cocoon.sitemap.SitemapServlet">
-    <sitemap file="COB-INF/sitemap.xmap"/>
-  </servlet>  
-  <requirements>
-    <requires interface="http://cocoon.apache.org/blocks/core-components/1.0" 
-      name="core" default="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT"/>
-  </requirements>
+<?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="${groupId}:${artifactId}:1.0-SNAPSHOT">
+  
+  <name>${artifactId}</name>
+  <description href="http://your-company.com">
+    A Cocoon block
+  </description>
+  <state href="http://company.com/${artifactId}/1.0/state.html" 
+         community="committed" 
+         interfaces="unstable" 
+         implementation="unstable"/>
+  <license href="http://company.com/licenses/">[license]</license>
+  <author href="http://company.com">[author]</author>
+  <servlet class="org.apache.cocoon.sitemap.SitemapServlet">
+    <sitemap file="COB-INF/sitemap.xmap"/>
+  </servlet>  
+  <requirements>
+    <requires interface="http://cocoon.apache.org/blocks/core-components/1.0" 
+      name="core" default="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT"/>
+  </requirements>
 </block>

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

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-archetype-block/src/main/resources/makeDescriptor.pl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/block/impl/LocalBlock10.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/block/impl/LocalBlock10.java?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/block/impl/LocalBlock10.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/block/impl/LocalBlock10.java Sat Feb 11 03:11:08 2006
@@ -1,72 +1,72 @@
-/*
- * Copyright 2005 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.deployer.block.impl;
-
-import org.apache.cocoon.deployer.block.LocalBlock;
-import org.apache.cocoon.deployer.generated.block.x10.Block;
-
-public class LocalBlock10 implements LocalBlock {
-
-	private String id;
-	private String namespace;
-	private String baseDirectory;
-	private Block blockDescriptor;
-	private org.apache.cocoon.deployer.generated.deploy.x10.Block deployDescriptor;
-	
-	public void setNameSpace(String namespace) {
-		this.namespace = namespace;
-	}
-	
-	public String getNamespace() {
-		return this.namespace;
-	}
-
-	public void setBlockDescriptor(Block blockDescriptor) {
-		this.blockDescriptor = blockDescriptor;
-	}
-	
-	public Block getBlockDescriptor() {
-		return this.blockDescriptor;
-	}
-
-	public void setDeployDescriptor(org.apache.cocoon.deployer.generated.deploy.x10.Block deployDescriptor) {
-		this.deployDescriptor = deployDescriptor;
-	}
-	
-	public org.apache.cocoon.deployer.generated.deploy.x10.Block getDeployDescriptor() {
-		return this.deployDescriptor;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-	
-	public String getId() {
-		return this.id;
-	}
-
-	public void setBaseDirectory(String baseDirectory) {
-		this.baseDirectory = baseDirectory;
-	}
-	
-	public String getBaseDirectory() {
-		return baseDirectory;
-	}
-
-}
+/*
+ * Copyright 2005 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.deployer.block.impl;
+
+import org.apache.cocoon.deployer.block.LocalBlock;
+import org.apache.cocoon.deployer.generated.block.x10.Block;
+
+public class LocalBlock10 implements LocalBlock {
+
+	private String id;
+	private String namespace;
+	private String baseDirectory;
+	private Block blockDescriptor;
+	private org.apache.cocoon.deployer.generated.deploy.x10.Block deployDescriptor;
+	
+	public void setNameSpace(String namespace) {
+		this.namespace = namespace;
+	}
+	
+	public String getNamespace() {
+		return this.namespace;
+	}
+
+	public void setBlockDescriptor(Block blockDescriptor) {
+		this.blockDescriptor = blockDescriptor;
+	}
+	
+	public Block getBlockDescriptor() {
+		return this.blockDescriptor;
+	}
+
+	public void setDeployDescriptor(org.apache.cocoon.deployer.generated.deploy.x10.Block deployDescriptor) {
+		this.deployDescriptor = deployDescriptor;
+	}
+	
+	public org.apache.cocoon.deployer.generated.deploy.x10.Block getDeployDescriptor() {
+		return this.deployDescriptor;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+	
+	public String getId() {
+		return this.id;
+	}
+
+	public void setBaseDirectory(String baseDirectory) {
+		this.baseDirectory = baseDirectory;
+	}
+	
+	public String getBaseDirectory() {
+		return baseDirectory;
+	}
+
+}

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/block/impl/LocalBlock10.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-06/deploy.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-06/deploy.xml?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-06/deploy.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-06/deploy.xml Sat Feb 11 03:11:08 2006
@@ -1,24 +1,24 @@
-<?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. 
--->
-<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
-  
-  <cocoon target-url=".target/test/validDeploy-02/myServer" 
-    urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>    
-  
-  <block id="db" urn="validBlock-04:validBlock-04:1.0" location="src/test/mocks/validBlock-06/blockRoot"/>  
-  
+<?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. 
+-->
+<deploy xmlns="http://apache.org/cocoon/blocks/deploy/1.0">
+  
+  <cocoon target-url=".target/test/validDeploy-02/myServer" 
+    urn="org.apache.cocoon:cocoon-minimal-webapp:1.0-SNAPSHOT:war" exclusive="true"/>    
+  
+  <block id="db" urn="validBlock-04:validBlock-04:1.0" location="src/test/mocks/validBlock-06/blockRoot"/>  
+  
 </deploy>

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validDeploy-06/deploy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/README.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/README.txt?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/README.txt (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-plugin/README.txt Sat Feb 11 03:11:08 2006
@@ -1,5 +1,5 @@
-This project is a minimal sample of a web application that hosts Cocoon blocks. It is used by the 
-block deployer if no webapp is available.
-
-When the development of the block deployer has stabilized, this block will become an archetype instead.
-
+This project is a minimal sample of a web application that hosts Cocoon blocks. It is used by the 
+block deployer if no webapp is available.
+
+When the development of the block deployer has stabilized, this block will become an archetype instead.
+

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

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/sitemap.xmap?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/sitemap.xmap Sat Feb 11 03:11:08 2006
@@ -1,29 +1,29 @@
-<?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 type="xml"/>
-      </map:match>
-    </map:pipeline>
-  </map:pipelines>
-
-</map:sitemap>
-
+<?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 type="xml"/>
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
+
+</map:sitemap>
+

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/test.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/test.xml?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/test.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/test.xml Sat Feb 11 03:11:08 2006
@@ -1,17 +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.
--->
+<?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>org.apache.cocoon:cocoon-tutorial-simple-block</test>

Propchange: cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/COB-INF/test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/META-INF/block.xml?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/META-INF/block.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-tutorial-simple-block/src/main/resources/META-INF/block.xml Sat Feb 11 03:11:08 2006
@@ -1,37 +1,37 @@
-<?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-tutorial-simple-block:1.0-SNAPSHOT">
-  
-  <name>cocoon-tutorial-simple-block</name>
-  <description href="http://your-company.com">
-    A Cocoon block
-  </description>
-  <state href="http://company.com/cocoon-tutorial-simple-block/1.0/state.html" 
-         community="committed" 
-         interfaces="unstable" 
-         implementation="unstable"/>
-  <license href="http://company.com/licenses/">[license]</license>
-  <author href="http://company.com">[author]</author>
-  <servlet class="org.apache.cocoon.sitemap.SitemapServlet">
-    <sitemap file="COB-INF/sitemap.xmap"/>
-  </servlet>  
-  <requirements>
-    <requires interface="http://cocoon.apache.org/blocks/core-components/1.0" 
-      name="core" default="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT"/>
-  </requirements>
+<?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-tutorial-simple-block:1.0-SNAPSHOT">
+  
+  <name>cocoon-tutorial-simple-block</name>
+  <description href="http://your-company.com">
+    A Cocoon block
+  </description>
+  <state href="http://company.com/cocoon-tutorial-simple-block/1.0/state.html" 
+         community="committed" 
+         interfaces="unstable" 
+         implementation="unstable"/>
+  <license href="http://company.com/licenses/">[license]</license>
+  <author href="http://company.com">[author]</author>
+  <servlet class="org.apache.cocoon.sitemap.SitemapServlet">
+    <sitemap file="COB-INF/sitemap.xmap"/>
+  </servlet>  
+  <requirements>
+    <requires interface="http://cocoon.apache.org/blocks/core-components/1.0" 
+      name="core" default="org.apache.cocoon:cocoon-core-components:1.0-SNAPSHOT"/>
+  </requirements>
 </block>

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

Modified: cocoon/trunk/cocoon-block-deployer/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/pom.xml?rev=376968&r1=376967&r2=376968&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/pom.xml (original)
+++ cocoon/trunk/cocoon-block-deployer/pom.xml Sat Feb 11 03:11:08 2006
@@ -36,6 +36,7 @@
   <name>Cocoon Deployer - Projects</name>
 
   <modules>
+    <module>cocoon-archetype-block</module>
     <module>cocoon-deployer-core</module>  
     <module>cocoon-deployer-plugin</module>
     <module>cocoon-deployer-plugin-demo</module>