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 2007/10/04 12:27:01 UTC

svn commit: r581835 - in /cocoon/whiteboard/osgi: cocoon-osgi-main/pom.xml cocoon-osgi-main/src/main/resources/config.properties core/cocoon-spring-osgi/cocoon-spring-osgi-impl/pom.xml pom.xml

Author: danielf
Date: Thu Oct  4 03:26:58 2007
New Revision: 581835

URL: http://svn.apache.org/viewvc?rev=581835&view=rev
Log:
Starting to use the spring-osgi extensions in cocoon-osgi.

Modified:
    cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml
    cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties
    cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-impl/pom.xml
    cocoon/whiteboard/osgi/pom.xml

Modified: cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml?rev=581835&r1=581834&r2=581835&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml (original)
+++ cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml Thu Oct  4 03:26:58 2007
@@ -176,6 +176,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-spring-osgi-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-store-impl-osgi</artifactId>
     </dependency>
     <dependency>

Modified: cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties?rev=581835&r1=581834&r2=581835&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties (original)
+++ cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties Thu Oct  4 03:26:58 2007
@@ -78,6 +78,7 @@
  file:bundle/cocoon-servlet-service-demo2-osgi-1.0.0-SNAPSHOT.jar \
  file:bundle/cocoon-servlet-service-impl-osgi-1.0.0-RC1-SNAPSHOT.jar \
  file:bundle/cocoon-spring-configurator-osgi-1.0.1-SNAPSHOT.jar \
+ file:bundle/cocoon-spring-osgi-impl-1.0.0-SNAPSHOT.jar \
  file:bundle/cocoon-store-impl-osgi-1.0.0-RC2-SNAPSHOT.jar \
  file:bundle/cocoon-thread-api-osgi-1.0.0-RC2-SNAPSHOT.jar \
  file:bundle/cocoon-thread-impl-osgi-1.0.0-RC2-SNAPSHOT.jar \

Modified: cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-impl/pom.xml?rev=581835&r1=581834&r2=581835&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-impl/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-spring-osgi/cocoon-spring-osgi-impl/pom.xml Thu Oct  4 03:26:58 2007
@@ -34,10 +34,12 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
+      <scope>provided</scope>
     </dependency>
     
     <dependency>

Modified: cocoon/whiteboard/osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/pom.xml?rev=581835&r1=581834&r2=581835&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/pom.xml Thu Oct  4 03:26:58 2007
@@ -473,6 +473,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-spring-osgi-impl</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-configuration-api-osgi</artifactId>
         <version>1.0.1-SNAPSHOT</version>
       </dependency>