Return-Path: 
 <cvs-return-26732-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 32001 invoked from network); 27 Mar 2006 21:42:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 27 Mar 2006 21:42:15 -0000
Received: (qmail 37062 invoked by uid 500); 27 Mar 2006 21:42:15 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 36949 invoked by uid 500); 27 Mar 2006 21:42:14 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 36938 invoked by uid 99); 27 Mar 2006 21:42:14 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Mar 2006 13:42:14 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 27 Mar 2006 13:42:13 -0800
Received: (qmail 31912 invoked by uid 65534); 27 Mar 2006 21:41:53 -0000
Message-ID: <20060327214153.31911.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r389291 - in
 /cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2: ./ META-INF/
 META-INF/MANIFEST.MF META-INF/components.xml README.txt pom.xml src/
Date: Mon, 27 Mar 2006 21:41:52 -0000
To: cvs@cocoon.apache.org
From: danielf@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: danielf
Date: Mon Mar 27 13:41:50 2006
New Revision: 389291

URL: http://svn.apache.org/viewcvs?rev=389291&view=rev
Log:
Split the demo on two blocks to be able to test starting and stopping the blocks independently (it worked). Part I

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/
      - copied from r389255, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/
      - copied from r389287, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/README.txt
      - copied unchanged from r389287, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/README.txt
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml
      - copied, changed from r389287, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/
      - copied from r389287, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/MANIFEST.MF
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/components.xml

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/MANIFEST.MF?rev=389291&r1=389287&r2=389291&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/MANIFEST.MF (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/MANIFEST.MF Mon Mar 27 13:41:50 2006
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: cocoon-blocks-fw-demo1
-Bundle-SymbolicName: org.apache.cocoon.blocks.demo1
+Bundle-Name: cocoon-blocks-fw-demo2
+Bundle-SymbolicName: org.apache.cocoon.blocks.demo2
 Bundle-Version: 1.0.0
 Service-Component: META-INF/components.xml
 Bundle-Localization: plugin

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/components.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/components.xml?rev=389291&r1=389287&r2=389291&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/components.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/META-INF/components.xml Mon Mar 27 13:41:50 2006
@@ -1,51 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-  <scr:component name="cocoon.blockServlet1">
-    <scr:implementation class="org.apache.cocoon.blocks.BlockServlet"/>
-    <scr:service>
-      <scr:provide interface="javax.servlet.Servlet"/>
-	</scr:service>
-	<scr:property name="path" value="/test1"/>
-	<scr:property name="attr" value="foo"/>
-    <scr:reference name="blockServlet"
-                   interface="javax.servlet.Servlet"
-                   target="(component.name=cocoon.servlet1)"/>
-  </scr:component>
-  
-  <scr:component name="cocoon.blockServlet2">
+  <scr:component name="org.apache.cocoon.blocks.demo2.block">
     <scr:implementation class="org.apache.cocoon.blocks.BlockServlet"/>
     <scr:service>
       <scr:provide interface="javax.servlet.Servlet"/>
 	</scr:service>
 	<scr:property name="path" value="/test2"/>
-	<scr:property name="attr" value="bar"/>
     <scr:reference name="blockServlet"
                    interface="javax.servlet.Servlet"
-                   target="(component.name=cocoon.servlet2)"/>
-    <scr:reference name="block1"
-                   interface="javax.servlet.Servlet"
-                   target="(component.name=cocoon.blockServlet1)"/>
-  </scr:component>
-  
-  <scr:component name="cocoon.servlet1">
-    <scr:implementation class="org.apache.cocoon.blocks.demo1.TestServlet"/>
-    <scr:service>
-      <scr:provide interface="javax.servlet.Servlet"/>
-	</scr:service>
-  </scr:component>
-  
-  <scr:component name="cocoon.servlet2">
-    <scr:implementation class="org.apache.cocoon.blocks.demo1.TestServlet2"/>
-    <scr:service>
-      <scr:provide interface="javax.servlet.Servlet"/>
-	</scr:service>
+                   target="(component.name=org.apache.cocoon.blocks.demo2.servlet)"/>
   </scr:component>
   
-  <scr:component name="cocoon.servlet3">
-    <scr:implementation class="org.apache.cocoon.blocks.demo1.TestServlet"/>
+  <scr:component name="org.apache.cocoon.blocks.demo2.servlet">
+    <scr:implementation class="org.apache.cocoon.blocks.demo2.DemoServlet"/>
     <scr:service>
       <scr:provide interface="javax.servlet.Servlet"/>
 	</scr:service>
-	<scr:property name="path" value="/test3"/>
   </scr:component>
 </components>

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml (from r389287, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml&r1=389287&r2=389291&rev=389291&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo2/pom.xml Mon Mar 27 13:41:50 2006
@@ -7,10 +7,10 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
-  <artifactId>cocoon-blocks-fw-demo1</artifactId>
+  <artifactId>cocoon-blocks-fw-demo2</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>OSGi Demo Block 1</name>
+  <name>OSGi Demo Block 2</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>