cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r569653 - in /cocoon/whiteboard/osgi: ./ cocoon-osgi-main/ cocoon-osgi-main/src/main/resources/ core/cocoon-servlet-service-demo1-osgi/ core/cocoon-servlet-service-demo2-osgi/ core/cocoon-servlet-service-impl-osgi/
Date Sat, 25 Aug 2007 10:30:22 GMT
Author: danielf
Date: Sat Aug 25 03:30:21 2007
New Revision: 569653

URL: http://svn.apache.org/viewvc?rev=569653&view=rev
Log:
After the recent changes in the servlet service fw and changed the logging bundle the OSGi
samples work.
* Changed from the ordinary Commons Logging and Log4J bundles to OPS4J Pax Logging, as the
classloader handling in Commons Logging is really hard to get working with OSGi. Pax Logging
supports all popular logging frameworks and works well with OSGi.
* The Eclipse Equinox bundles are downloaded from the OPS4J Maven repository, so no manual
downloads are needed anymore.
* The Cocoon bundles are started at a higher start level than the Spring OSGi extender, which
ensures that the Spring bean services are started automatically.

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-servlet-service-demo1-osgi/pom.xml
    cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo2-osgi/pom.xml
    cocoon/whiteboard/osgi/core/cocoon-servlet-service-impl-osgi/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=569653&r1=569652&r2=569653&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml (original)
+++ cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml Sat Aug 25 03:30:21 2007
@@ -113,54 +113,12 @@
       </exclusions>
     </dependency>
 
-    <!-- Depends on more than it should e.g.logkit
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-logging</artifactId>
-      <version>1.1.0-0001-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    -->
-
     <dependency>
       <groupId>org.apache.felix.commons</groupId>
       <artifactId>org.apache.felix.commons.excalibur-sourceresolve</artifactId>
       <version>2.2.3-0001-SNAPSHOT</version>
     </dependency>
 
-    <!-- Depends on more than it should e.g.javax.mail
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.log4j</artifactId>
-      <version>1.2.12-0001-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    -->
-
-    <!-- Needs 2.4
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.servlet-api</artifactId>
-      <version>2.3.0-0001-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    -->
-
     <!-- Spring -->
     <dependency>
       <groupId>org.springframework.osgi</groupId>
@@ -214,49 +172,40 @@
       <!-- Would be better with -SNAPSHOT, but we need to know the jar name in config.properties
-->
       <version>3.0-20070801.084708-154</version>
     </dependency>
-    <!-- Package version numbers doesn't work with the Jetty bundle
+
+    <!-- OPS4J -->
     <dependency>
-      <groupId>org.springframework.osgi</groupId>
-      <artifactId>commons-logging.osgi</artifactId>
-      <version>1.1-20070508.010416-230</version>
+      <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>api</artifactId>
+      <version>0.9.4</version>
     </dependency>
-    -->
     <dependency>
-      <groupId>org.springframework.osgi</groupId>
-      <artifactId>log4j.osgi</artifactId>
-      <!-- Would be better with -SNAPSHOT, but we need to know the jar name in config.properties
-->
-      <version>1.2.13-20070801.084708-251</version>
+      <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>jcl</artifactId>
+      <version>0.9.4</version>
     </dependency>
-
-    <!-- Equinox (These has to be downloaded manually from http://download.eclipse.org/eclipse/equinox/)
-->
-    <!-- The Felix http service doesn't support Servlet 2.4 -->
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet</artifactId>
       <version>2.4.0</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>javax.servlet.jsp</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
       <version>2.0.0</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.apache.commons.logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>org.eclipse.equinox</groupId>
       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
       <version>1.0.0</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>org.eclipse.equinox</groupId>
       <artifactId>org.eclipse.equinox.http.servlet</artifactId>
       <version>1.0.0</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>org.mortbay.jetty</groupId>
       <artifactId>org.mortbay.jetty</artifactId>
       <version>5.1.11</version>
     </dependency>
@@ -307,6 +256,16 @@
       <name>Apache Snapshot Repository</name>
       <url>
         http://people.apache.org/maven-snapshot-repository
+      </url>
+    </repository>
+    <repository>
+      <snapshots>
+         <enabled>false</enabled>
+      </snapshots>
+      <id>ops4j</id>
+      <name>OPS4J Repository</name>
+      <url>
+        http://repository.ops4j.org/maven2
       </url>
     </repository>
   </repositories>

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=569653&r1=569652&r2=569653&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 Sat Aug 25
03:30:21 2007
@@ -29,14 +29,11 @@
 felix.cache.dir=.felix
 felix.cache.profile=cocoon
 felix.auto.start.1= \
+ file:bundle/api-0.9.4.jar \
  file:bundle/backport-util-concurrent-3.0-20070801.084708-154.jar \
- file:bundle/cocoon-servlet-service-demo1-osgi-1.0.0-SNAPSHOT.jar \
- 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/javax.servlet-2.4.0.jar \
  file:bundle/javax.servlet.jsp-2.0.0.jar \
- file:bundle/log4j.osgi-1.2.13-20070801.084708-251.jar \
- file:bundle/org.apache.commons.logging-1.0.4.jar \
+ file:bundle/jcl-0.9.4.jar \
  file:bundle/org.apache.felix.bundlerepository-1.0.0.jar \
  file:bundle/org.apache.felix.commons.aopalliance-1.0.0-0001-20070316.210408-1.jar \
  file:bundle/org.apache.felix.commons.avalon-framework-4.3.1-0001-SNAPSHOT.jar \
@@ -56,8 +53,12 @@
  file:bundle/spring-osgi-extender-1.0-m2.jar \
  file:bundle/spring-osgi-io-1.0-m2.jar \
  file:bundle/spring-web-2.0.5-osgi-m2.jar
-felix.startlevel.framework=1
-felix.startlevel.bundle=1
+felix.auto.start.2= \
+ file:bundle/cocoon-servlet-service-demo1-osgi-1.0.0-SNAPSHOT.jar \
+ 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
+felix.startlevel.framework=2
+felix.startlevel.bundle=2
 #framework.service.urlhandlers=false
 
 #

Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo1-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo1-osgi/pom.xml?rev=569653&r1=569652&r2=569653&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo1-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo1-osgi/pom.xml Sat Aug 25 03:30:21
2007
@@ -50,14 +50,14 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet</artifactId>
       <version>2.4.0</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>org.apache.commons.logging</artifactId>
-      <version>1.0.4</version>
+      <groupId>org.ops4j.pax.logging</groupId>
+      <artifactId>jcl</artifactId>
+      <version>0.9.4</version>
     </dependency>
   </dependencies>
   <build>

Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo2-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo2-osgi/pom.xml?rev=569653&r1=569652&r2=569653&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo2-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service-demo2-osgi/pom.xml Sat Aug 25 03:30:21
2007
@@ -45,7 +45,7 @@
       <version>1.0.0-RC1-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet</artifactId>
       <version>2.4.0</version>
     </dependency>

Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service-impl-osgi/pom.xml?rev=569653&r1=569652&r2=569653&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service-impl-osgi/pom.xml Sat Aug 25 03:30:21
2007
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: cocoon/whiteboard/osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/pom.xml?rev=569653&r1=569652&r2=569653&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/pom.xml Sat Aug 25 03:30:21 2007
@@ -44,6 +44,19 @@
     <!--module>cocoon-osgi-main</module-->
   </modules>
 
+  <repositories>
+    <repository>
+      <snapshots>
+         <enabled>false</enabled>
+      </snapshots>
+      <id>ops4j</id>
+      <name>OPS4J Repository</name>
+      <url>
+        http://repository.ops4j.org/maven2
+      </url>
+    </repository>
+  </repositories>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/osgi</connection>
   </scm>



Mime
View raw message