You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/03/27 23:41:52 UTC
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/
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>