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 22:20:09 UTC
svn commit: r389254 - in /cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1: ./ META-INF/ META-INF/MANIFEST.MF META-INF/components.xml README.txt pom.xml src/ src/test/

Author: danielf
Date: Mon Mar 27 12:20:08 2006
New Revision: 389254

URL: http://svn.apache.org/viewcvs?rev=389254&view=rev
Log:
Just example code left in cocoon-blocks-fw-osgi-impl so I renamed it to something more appropriate. Step I

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/
      - copied from r388891, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/
      - copied from r389251, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/META-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/README.txt
      - copied unchanged from r389251, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/README.txt
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml
      - copied, changed from r389251, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/pom.xml
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/
      - copied from r389251, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/src/
Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/test/
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/MANIFEST.MF
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/components.xml

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

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/components.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/components.xml?rev=389254&r1=389251&r2=389254&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/components.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/META-INF/components.xml Mon Mar 27 12:20:08 2006
@@ -28,21 +28,21 @@
   </scr:component>
   
   <scr:component name="cocoon.servlet1">
-    <scr:implementation class="org.apache.cocoon.blocks.osgi.TestServlet"/>
+    <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.osgi.TestServlet2"/>
+    <scr:implementation class="org.apache.cocoon.blocks.demo1.TestServlet2"/>
     <scr:service>
       <scr:provide interface="javax.servlet.Servlet"/>
 	</scr:service>
   </scr:component>
   
   <scr:component name="cocoon.servlet3">
-    <scr:implementation class="org.apache.cocoon.blocks.osgi.TestServlet"/>
+    <scr:implementation class="org.apache.cocoon.blocks.demo1.TestServlet"/>
     <scr:service>
       <scr:provide interface="javax.servlet.Servlet"/>
 	</scr:service>

Copied: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml (from r389251, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/pom.xml)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml?p2=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml&p1=cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/pom.xml&r1=389251&r2=389254&rev=389254&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-osgi-impl/pom.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-demo1/pom.xml Mon Mar 27 12:20:08 2006
@@ -7,16 +7,21 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
-  <artifactId>cocoon-blocks-fw-osgi-impl</artifactId>
+  <artifactId>cocoon-blocks-fw-demo1</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>Blocks Framework OSGi</name>
+  <name>OSGi Demo Block 1</name>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-blocks-fw-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>