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/09/16 14:26:12 UTC
svn commit: r576087 - in /cocoon/whiteboard/osgi: ./ cocoon-osgi-main/
cocoon-osgi-main/src/main/resources/
core/cocoon-configuration/cocoon-spring-configurator-osgi/
core/cocoon-core-osgi/
core/cocoon-core-osgi/src/main/resources/META-INF/spring/ core...
Author: danielf
Date: Sun Sep 16 05:26:10 2007
New Revision: 576087
URL: http://svn.apache.org/viewvc?rev=576087&view=rev
Log:
Switching to development version of spring-osgi as I need to create some custom spring-osgi beans and it seem like a waste of time to base these on old code. The development version of spring-osgi is based on Spring 2.1 instead of 2.0, so I updated to Spring 2.1 as well.
* Spring 2.1 is packaged as OSGi bundles, so the wrapping bundles are not needed anymore.
* spring-osgi exposes as default each bundles context as a service. With the latest version of spring-osgi the context consists of numerous services, so I turned the off the default to make it easier to find the Cocoon services when listing services.
* The configuration syntax for referring to 1..n cardinality beans is changed.
Added:
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml
- copied, changed from r575942, cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
Removed:
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/ObjectModel.xml
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml
Modified:
cocoon/whiteboard/osgi/README.txt
cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml
cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties
cocoon/whiteboard/osgi/core/cocoon-configuration/cocoon-spring-configurator-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo1-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo2-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/src/main/resources/META-INF/spring/servlet-listener.xml
cocoon/whiteboard/osgi/core/cocoon-store/cocoon-store-impl-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-thread/cocoon-thread-impl-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml
cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml
cocoon/whiteboard/osgi/pom.xml
Modified: cocoon/whiteboard/osgi/README.txt
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/README.txt?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/README.txt (original)
+++ cocoon/whiteboard/osgi/README.txt Sun Sep 16 05:26:10 2007
@@ -10,10 +10,10 @@
Installation
-----------
-* Checkout and build Cocoon trunk.
+* Checkout and build Cocoon trunk with Spring 2.1 (the current version of spring-osgi uses Spring 2.1).
* Build:
- $ mvn clean install
+ $ mvn clean install -Pspring-2.1
* Create the Cocoon OSGi run time environment:
$ cd cocoon-osgi-main
Modified: cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml (original)
+++ cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml Sun Sep 16 05:26:10 2007
@@ -83,19 +83,19 @@
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
@@ -110,10 +110,6 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-io</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
<!-- OPS4J -->
<dependency>
@@ -211,45 +207,5 @@
<artifactId>cocoon-xml-util-osgi</artifactId>
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <id>spring-ext</id>
- <name>Spring External Dependencies Repository</name>
- <url>
- http://static.springframework.org/maven2
- </url>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>spring-ext-snapshot</id>
- <name>Spring External Dependencies Repository</name>
- <url>
- http://static.springframework.org/maven2-snapshots
- </url>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-snapshot</id>
- <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>
</project>
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=576087&r1=576086&r2=576087&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 Sun Sep 16 05:26:10 2007
@@ -30,7 +30,6 @@
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/javax.servlet-2.4.0.jar \
file:bundle/javax.servlet.jsp-2.0.0.jar \
file:bundle/jcl-0.9.4.jar \
@@ -62,14 +61,14 @@
file:bundle/org.eclipse.equinox.http.servlet-1.0.0.jar \
file:bundle/org.mortbay.jetty-5.1.11.jar \
file:bundle/org.osgi.compendium-0.9.0-20070713.230317-1.jar \
- file:bundle/spring-aop-2.0.5-osgi-m2.jar \
- file:bundle/spring-beans-2.0.5-osgi-m2.jar \
- file:bundle/spring-context-2.0.5-osgi-m2.jar \
- file:bundle/spring-core-2.0.5-osgi-m2.jar \
- file:bundle/spring-osgi-core-1.0-m2.jar \
- 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
+ file:bundle/spring-aop-2.1-osgi-m4-20070915.015040-23.jar \
+ file:bundle/spring-beans-2.1-m3.jar \
+ file:bundle/spring-context-2.1-m3.jar \
+ file:bundle/spring-core-2.1-m3.jar \
+ file:bundle/spring-osgi-core-1.0-m3-20070915.012505-116.jar \
+ file:bundle/spring-osgi-extender-1.0-m3-20070915.012505-116.jar \
+ file:bundle/spring-osgi-io-1.0-m3-20070915.012505-116.jar \
+ file:bundle/spring-web-2.1-m3.jar
felix.auto.start.2= \
file:bundle/cocoon-configuration-api-osgi-1.0.1-SNAPSHOT.jar \
file:bundle/cocoon-core-osgi-2.2.0-RC2-SNAPSHOT.jar \
Modified: cocoon/whiteboard/osgi/core/cocoon-configuration/cocoon-spring-configurator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-configuration/cocoon-spring-configurator-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-configuration/cocoon-spring-configurator-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-configuration/cocoon-spring-configurator-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -71,19 +71,19 @@
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
</dependencies>
Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -151,6 +151,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Export-Package>
org.apache.cocoon;version=${pkgVersion},
org.apache.cocoon.acting;version=${pkgVersion},
@@ -196,7 +197,6 @@
org.apache.cocoon.matching;version=${pkgVersion},
org.apache.cocoon.matching.modular;version=${pkgVersion},
org.apache.cocoon.objectmodel.helper;version=${pkgVersion},
- org.apache.cocoon.objectmodel.impl;version=${pkgVersion},
org.apache.cocoon.processing;version=${pkgVersion},
org.apache.cocoon.processing.impl;version=${pkgVersion},
org.apache.cocoon.reading;version=${pkgVersion},
@@ -216,6 +216,11 @@
org.apache.cocoon.xml.dom;version=${pkgVersion},
org.apache.cocoon.xml.xlink;version=${pkgVersion}
</Export-Package>
+ <Import-Package>
+ org.apache.cocoon.callstack,
+ org.apache.cocoon.objectmodel.impl,
+ *
+ </Import-Package>
<Include-Resource>
src/main/resources/,
@${pkgArtifactId}-${pkgVersion}.jar!/META-INF/*,
Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml?rev=576087&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml Sun Sep 16 05:26:10 2007
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- SVN $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+ <!-- Install the pipeline component custom scope -->
+ <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+ <property name="scopes">
+ <map>
+ <entry key="pipelineComponent">
+ <bean class="org.apache.cocoon.components.pipeline.spring.PipelineComponentScope">
+ <property name="holder" ref="org.apache.cocoon.components.pipeline.spring.PipelineComponentScopeHolder"/>
+ </bean>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- FIXME: Two level scope use doesn't work in spring-osgi
+ <bean id="org.apache.cocoon.components.pipeline.spring.PipelineComponentScopeHolder"
+ class="org.apache.cocoon.components.pipeline.spring.PipelineComponentScopeHolderImpl" scope="call">
+ <aop:scoped-proxy proxy-target-class="false"/>
+ </bean>
+ -->
+
+ <bean id="org.apache.cocoon.components.pipeline.spring.PipelineComponentScopeHolder"
+ class="org.apache.cocoon.components.pipeline.spring.PipelineComponentScopeHolderImpl">
+ <aop:scoped-proxy proxy-target-class="false"/>
+ </bean>
+
+ <bean id="org.apache.cocoon.components.pipeline.spring.PipelineComponentProxyDecorator"
+ class="org.apache.cocoon.components.pipeline.spring.PipelineComponentProxyDecorator">
+ <property name="holder" ref="org.apache.cocoon.components.pipeline.spring.PipelineComponentScopeHolder"/>
+ </bean>
+
+</beans>
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/PipelineComponentScope.xml
------------------------------------------------------------------------------
svn:keywords = Id
Copied: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml (from r575942, cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml?p2=cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml&p1=cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml&r1=575942&r2=576087&rev=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/object-model.xml Sun Sep 16 05:26:10 2007
@@ -24,11 +24,24 @@
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
xmlns:osgi="http://www.springframework.org/schema/osgi"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <import resource="../cocoon/spring/ObjectModelTemplate.xml"/>
+ <configurator:bean-map id="modelProviders" type="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
+
+ <!-- Default implementation of ObjectModel interface in pipelineComponent scope. -->
+ <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" scope="pipelineComponent"
+ class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl">
+ <aop:scoped-proxy proxy-target-class="false"/>
+ <!-- FIXME
+ <property name="initialEntries" ref="modelProviders"/>
+ -->
+ </bean>
<osgi:service ref="org.apache.cocoon.el.objectmodel.ObjectModel" interface="org.apache.cocoon.el.objectmodel.ObjectModel"/>
</beans>
Modified: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml Sun Sep 16 05:26:10 2007
@@ -28,7 +28,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <import resource="../cocoon/spring/PipelineComponentScope.xml"/>
<import resource="../cocoon/spring/cocoon-pipeline-impl-cache.xml"/>
<osgi:reference id="org.apache.excalibur.store.Store" interface="org.apache.excalibur.store.Store"/>
Modified: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -79,7 +79,7 @@
<artifactId>jcl</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
@@ -99,7 +99,9 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Export-Package>
+ org.apache.cocoon.el.impl.objectmodel;version=${pkgVersion},
org.apache.cocoon.template.expression;version=${pkgVersion}
</Export-Package>
<Private-Package>
@@ -108,7 +110,6 @@
org.apache.cocoon.el.impl.javascript;version=${pkgVersion},
org.apache.cocoon.el.impl.jexl;version=${pkgVersion},
org.apache.cocoon.el.impl.jxpath;version=${pkgVersion},
- org.apache.cocoon.el.impl.objectmodel;version=${pkgVersion},
org.apache.cocoon.el.impl.parsing;version=${pkgVersion},
org.apache.cocoon.template.expression;version=${pkgVersion},
</Private-Package>
Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo1-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo1-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo1-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo1-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -68,6 +68,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Private-Package>org.apache.cocoon.servletservice.demo1</Private-Package>
<Import-Package>
org.apache.cocoon.servletservice,
Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo2-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo2-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo2-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-demo2-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -60,6 +60,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Private-Package>org.apache.cocoon.servletservice.demo2</Private-Package>
<Import-Package>
org.apache.cocoon.servletservice,
Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -76,6 +76,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Export-Package>
org.apache.cocoon.callstack;version=${pkgVersion},
org.apache.cocoon.callstack.environment;version=${pkgVersion},
Modified: cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/src/main/resources/META-INF/spring/servlet-listener.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/src/main/resources/META-INF/spring/servlet-listener.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/src/main/resources/META-INF/spring/servlet-listener.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-servlet-service/cocoon-servlet-service-impl-osgi/src/main/resources/META-INF/spring/servlet-listener.xml Sun Sep 16 05:26:10 2007
@@ -34,7 +34,7 @@
<osgi:reference id="httpService" interface="org.osgi.service.http.HttpService"/>
- <osgi:reference id="servletService" interface="javax.servlet.Servlet" cardinality="0..n">
+ <osgi:collection id="servletService" interface="javax.servlet.Servlet">
<osgi:listener bind-method="setServlet" unbind-method="unsetServlet" ref="servletListener"/>
- </osgi:reference>
+ </osgi:collection>
</beans>
Modified: cocoon/whiteboard/osgi/core/cocoon-store/cocoon-store-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-store/cocoon-store-impl-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-store/cocoon-store-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-store/cocoon-store-impl-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -91,6 +91,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Private-Package>
org.apache.cocoon.components.store.impl;version=${pkgVersion}
</Private-Package>
Modified: cocoon/whiteboard/osgi/core/cocoon-thread/cocoon-thread-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-thread/cocoon-thread-impl-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-thread/cocoon-thread-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-thread/cocoon-thread-impl-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -67,6 +67,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Private-Package>
org.apache.cocoon.thread.impl;version=${pkgVersion}
</Private-Package>
Modified: cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-impl-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -55,15 +55,15 @@
<artifactId>jcl</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
@@ -87,6 +87,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Export-Package>
org.apache.cocoon.core.xml.impl;version=${pkgVersion}
</Export-Package>
Modified: cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/core/cocoon-xml/cocoon-xml-resolver-osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -67,6 +67,7 @@
<Bundle-SymbolicName>
${pom.artifactId}
</Bundle-SymbolicName>
+ <Spring-Context>;publish-context:=false</Spring-Context>
<Import-Package>
org.xml.sax,
*
Modified: cocoon/whiteboard/osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/pom.xml?rev=576087&r1=576086&r2=576087&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/pom.xml Sun Sep 16 05:26:10 2007
@@ -279,6 +279,86 @@
<!-- Spring -->
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.1-m3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.1-m3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.1-m3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.1-m3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.1-m3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.1-osgi-m4-20070915.015040-23</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>1.0-m3-20070915.012505-116</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>1.0-m3-20070915.012505-116</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>1.0-m3-20070915.012505-116</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-aop</artifactId>
<version>2.0.5-osgi-m2</version>
@@ -327,10 +407,9 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <!-- Would be better with -SNAPSHOT, but we need to know the jar name in config.properties -->
<version>3.0-20070801.084708-154</version>
</dependency>
-
+ -->
<!-- OPS4J -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -470,9 +549,14 @@
</repository>
<repository>
<id>springframework.org</id>
- <name>Springframework Maven Repository</name>
- <url>http://static.springframework.org/maven2/</url>
+ <name>Springframework Snapshot Maven Repository</name>
+ <url>http://static.springframework.org/maven2-snapshots</url>
</repository>
+ <repository>
+ <id>i21-s3-maven-repo</id>
+ <name>i21 S3 milestone repo</name>
+ <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+ </repository>
</repositories>
<scm>