cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r368836 - in /cocoon/trunk/cocoon-deployer/src: main/resources/xsd/ test/mocks/validBlock-01/ test/mocks/validBlock-01/blockRoot/META-INF/ test/mocks/validBlock-02/ test/mocks/validBlock-02/blockRoot/META-INF/ test/mocks/validBlock-03/ test...
Date Fri, 13 Jan 2006 20:02:46 GMT
Author: reinhard
Date: Fri Jan 13 12:01:23 2006
New Revision: 368836

URL: http://svn.apache.org/viewcvs?rev=368836&view=rev
Log:
add servlets and components part

Modified:
    cocoon/trunk/cocoon-deployer/src/main/resources/xsd/cob-schema-1.0.xsd
    cocoon/trunk/cocoon-deployer/src/main/resources/xsd/sample-block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/valid-block-1.0.jar
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/valid-block-1.0.jar
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/valid-block-1.0.jar
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/valid-block-1.0.jar
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/valid-block-1.0.jar
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/valid-block-1.0.jar
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml
    cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/valid-block-1.0.jar

Modified: cocoon/trunk/cocoon-deployer/src/main/resources/xsd/cob-schema-1.0.xsd
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/main/resources/xsd/cob-schema-1.0.xsd?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/main/resources/xsd/cob-schema-1.0.xsd (original)
+++ cocoon/trunk/cocoon-deployer/src/main/resources/xsd/cob-schema-1.0.xsd Fri Jan 13 12:01:23
2006
@@ -27,11 +27,12 @@
         <xs:element name="state" type="state"/>        
         <xs:element name="license" type="href"/>
         <xs:element name="author" type="href"/>
-        <xs:element name="sitemap" type="src" minOccurs="0"/>
         <xs:element name="properties" type="properties" minOccurs="0"/>
         <xs:element name="requirements" type="requirements" minOccurs="0"/>
         <xs:element name="implements" type="implements" minOccurs="0"/>
         <xs:element name="extends" type="extends" minOccurs="0"/>
+        <xs:element name="components" type="configuration" minOccurs="0"/>
+        <xs:element name="servlets" type="servlets" minOccurs="0"/>        
       </xs:all>
       <xs:attribute name="id" type="xs:anyURI" use="required"/>
     </xs:complexType>
@@ -117,9 +118,32 @@
   	<xs:attribute name="id" type="xs:anyURI" use="required"/>
   </xs:complexType>  	  	
 
-  <!-- implements -->
+  <!-- extends -->
   <xs:complexType name="extends">
   	<xs:attribute name="block" type="xs:anyURI" use="required"/>
-  </xs:complexType>  	  	
+  </xs:complexType>  	 
+  
+  <!-- configuration -->
+  <xs:complexType name="configuration">
+    <xs:sequence>
+      <xs:any namespace="##any"  minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+    </xs:sequence>
+    <xs:attribute name="class" type="java-classes" use="required"/>
+  </xs:complexType>  	    	
+
+  <!-- servlets -->
+  <xs:complexType name="servlets">
+    <xs:sequence>
+      <xs:element name="servlet" type="configuration" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>  
+  
+  
+  <!-- type for class attributes -->
+  <xs:simpleType name="java-classes">
+    <xs:restriction base="xs:string">
+      <!-- add here the regexp to test for valid package + class name -->
+    </xs:restriction>
+  </xs:simpleType>      
 
 </xs:schema>

Modified: cocoon/trunk/cocoon-deployer/src/main/resources/xsd/sample-block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/main/resources/xsd/sample-block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/main/resources/xsd/sample-block.xml (original)
+++ cocoon/trunk/cocoon-deployer/src/main/resources/xsd/sample-block.xml Fri Jan 13 12:01:23
2006
@@ -15,9 +15,8 @@
   limitations under the License. 
 -->
 <block xmlns="http://apache.org/cocoon/blocks/cob/1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://apache.org/cocoon/blocks/cob/1.0 cob-schema-1.0.xsd"
 	id="http://cocoon.apache.org/blocks/anyblock/1.0">
+	
 	<name>anyblock</name>
 	<description href="http://cocoon.apache.org/blocks/anyblock/1.0">
 		A block based on the Apache Cocoon portal
@@ -29,7 +28,6 @@
 		implementation="stable"/>
 	<license href="http://www.apache.org/licenses/">Apache License 2.0</license>
 	<author href="http://cocoon.apache.org">Apache Cocoon community</author>
-	<sitemap src="sitemap.xmap"/>
 	<properties>
 		<property name="mailserver">
 			<default>localhost</default>
@@ -50,4 +48,15 @@
 	<implements>
 		<interface id="http://cocoon.apache.org/interface/bla/1.0"/>
 	</implements>
+  
+  <servlets>
+    <servlet class="org.apache.cocoon.servlet.SitemapServlet">
+      <sitemap>COB-INF/sitemap.xmap</sitemap>
+    </servlet>
+  </servlets>
+  
+  <components class="org.apache.cocoon.some.component.manager">
+    <include>META-INF/block.xconf</include>
+  </components>
+  
 </block>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,6 +26,4 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
-  
 </block>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-01/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,7 +26,6 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
   <properties>
     <property name="prop1">
       <default>defaultValue1</default>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-02/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,7 +26,6 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
   <properties>
     <property name="prop1">
       <default>defaultValue1</default>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-03/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,7 +26,6 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
   
   <implements>
     <interface id="db-interface01"/>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-04/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,7 +26,6 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
   
   <implements>
     <interface id="interface-01"/>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-05/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,7 +26,6 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
   
   <implements>
     <interface id="interface-02"/>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-06/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
--- cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml
(original)
+++ cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/blockRoot/META-INF/block.xml
Fri Jan 13 12:01:23 2006
@@ -26,7 +26,6 @@
          implementation="stable"/>
   <license href="http://www.apache.org/licenses/">Apache License 2.0</license>
   <author href="http://cocoon.apache.org">Apache Cocoon community</author>
-  <sitemap src="block-sitemap.xmap"/>
   
   <implements>
     <interface id="interface-03"/>

Modified: cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/valid-block-1.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-deployer/src/test/mocks/validBlock-07/valid-block-1.0.jar?rev=368836&r1=368835&r2=368836&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message