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/09 21:54:16 UTC
svn commit: r574059 - in /cocoon/whiteboard/osgi: ./ cocoon-osgi-main/
cocoon-osgi-main/src/main/resources/ core/cocoon-core-osgi/
core/cocoon-core-osgi/src/ core/cocoon-core-osgi/src/main/
core/cocoon-core-osgi/src/main/resources/ core/cocoon-core-osg...
Author: danielf
Date: Sun Sep 9 12:54:14 2007
New Revision: 574059
URL: http://svn.apache.org/viewvc?rev=574059&view=rev
Log:
Adding the Cocoon core with dependencies:
* It is not possible to add separate bundles for cocoon-[pipeline|sitemap]-[api|components|impl] and cocoon-core as they are sharing packages and OSGi doesn't allow that. So all these jars are put together to one bundle.
* The META-INF/spring.[handlers|schema] is just a merge of the corresponding files from the jars.
* Needed dependencies are added to the runtime assembly.
* The bundle is installed and started successfully in the OSGi runtime.
* I have started to activate the beans, this far a couple of beans from pipeline-impl and pipeline-components works.
* The Avalon bridge seem to work inside OSGi.
* No beans are exported as OSGi services yet.
Added:
cocoon/whiteboard/osgi/core/cocoon-core-osgi/ (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml (with props)
Modified:
cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml
cocoon/whiteboard/osgi/cocoon-osgi-main/src/main/resources/config.properties
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=574059&r1=574058&r2=574059&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml (original)
+++ cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml Sun Sep 9 12:54:14 2007
@@ -148,6 +148,10 @@
<!-- Cocoon -->
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-configuration-api-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=574059&r1=574058&r2=574059&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 9 12:54:14 2007
@@ -46,10 +46,14 @@
file:bundle/org.apache.felix.commons.concurrent-1.3.4-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.ehcache-1.2.4-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.excalibur-instrument-api-2.2.1-0001-SNAPSHOT.jar \
+ file:bundle/org.apache.felix.commons.excalibur-pool-api-2.2.1-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.excalibur-sourceresolve-2.2.3-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.excalibur-store-2.2.1-0001-SNAPSHOT.jar \
+ file:bundle/org.apache.felix.commons.excalibur-xmlutil-2.2.1-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.jakarta-regexp-1.4-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.js-1.6R5-0001-SNAPSHOT.jar \
+ file:bundle/org.apache.felix.commons.xalan-2.7.0-0001-SNAPSHOT.jar \
+ file:bundle/org.apache.felix.commons.xercesImpl-2.8.1-0001-20070316.210408-1.jar \
file:bundle/org.apache.felix.commons.xml-apis-1.3.4-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.xml-resolver-1.2.0-0001-20070316.210408-1.jar \
file:bundle/org.apache.felix.shell-1.0.0.jar \
@@ -68,6 +72,7 @@
file:bundle/spring-web-2.0.5-osgi-m2.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 \
file:bundle/cocoon-expression-language-api-osgi-1.0.0-M1-SNAPSHOT.jar \
file:bundle/cocoon-expression-language-impl-osgi-1.0.0-M1-SNAPSHOT.jar \
file:bundle/cocoon-servlet-service-demo1-osgi-1.0.0-SNAPSHOT.jar \
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 9 12:54:14 2007
@@ -0,0 +1,4 @@
+.project
+.settings
+target
+.classpath
Added: 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=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml Sun Sep 9 12:54:14 2007
@@ -0,0 +1,244 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-osgi-modules</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>cocoon-core</pkgArtifactId>
+ <pkgVersion>2.2.0-RC2-SNAPSHOT</pkgVersion>
+ <pkgVersion2>1.0.0-RC2-SNAPSHOT</pkgVersion2>
+ <osgiVersion>${pkgVersion}</osgiVersion>
+ </properties>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>${pkgArtifactId}-osgi</artifactId>
+ <version>${osgiVersion}</version>
+ <packaging>bundle</packaging>
+ <name>${pkgArtifactId} bundle</name>
+ <description>
+ This bundle wraps ${pkgArtifactId}-${pkgVersion}.jar and
+ the pipeline and sitemap jars.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-pipeline-api</artifactId>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-pipeline-components</artifactId>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-pipeline-impl</artifactId>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-sitemap-api</artifactId>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-sitemap-components</artifactId>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-sitemap-impl</artifactId>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-spring-configurator-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-expression-language-impl-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-store-impl-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-thread-impl-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-util-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xml-impl-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xml-resolver-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xml-util-osgi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix.commons</groupId>
+ <artifactId>org.apache.felix.commons.excalibur-pool-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.commons</groupId>
+ <artifactId>org.apache.felix.commons.excalibur-sourceresolve</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.commons</groupId>
+ <artifactId>org.apache.felix.commons.excalibur-xmlutil</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.commons</groupId>
+ <artifactId>org.apache.felix.commons.xalan</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.commons</groupId>
+ <artifactId>org.apache.felix.commons.xercesImpl</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${pom.artifactId}
+ </Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.cocoon;version=${pkgVersion},
+ org.apache.cocoon.acting;version=${pkgVersion},
+ org.apache.cocoon.caching;version=${pkgVersion},
+ org.apache.cocoon.caching.impl;version=${pkgVersion},
+ org.apache.cocoon.classloader;version=${pkgVersion},
+ org.apache.cocoon.classloader.reloading;version=${pkgVersion},
+ org.apache.cocoon.components;version=${pkgVersion},
+ org.apache.cocoon.components.crawler;version=${pkgVersion},
+ org.apache.cocoon.components.fam;version=${pkgVersion},
+ org.apache.cocoon.components.flow;version=${pkgVersion},
+ org.apache.cocoon.components.modules.input;version=${pkgVersion},
+ org.apache.cocoon.components.modules.output;version=${pkgVersion},
+ org.apache.cocoon.components.notification;version=${pkgVersion},
+ org.apache.cocoon.components.persistence;version=${pkgVersion},
+ org.apache.cocoon.components.pipeline;version=${pkgVersion},
+ org.apache.cocoon.components.pipeline.impl;version=${pkgVersion},
+ org.apache.cocoon.components.pipeline.spring;version=${pkgVersion},
+ org.apache.cocoon.components.sax;version=${pkgVersion},
+ org.apache.cocoon.components.source;version=${pkgVersion},
+ org.apache.cocoon.components.source.helpers;version=${pkgVersion},
+ org.apache.cocoon.components.source.impl;version=${pkgVersion},
+ org.apache.cocoon.components.source.impl.validity;version=${pkgVersion},
+ org.apache.cocoon.components.source.util;version=${pkgVersion},
+ org.apache.cocoon.components.treeprocessor;version=${pkgVersion},
+ org.apache.cocoon.components.treeprocessor.sitemap;version=${pkgVersion},
+ org.apache.cocoon.components.treeprocessor.variables;version=${pkgVersion},
+ org.apache.cocoon.components.xpointer;version=${pkgVersion},
+ org.apache.cocoon.components.xpointer.parser;version=${pkgVersion},
+ org.apache.cocoon.components.xslt;version=${pkgVersion},
+ org.apache.cocoon.core;version=${pkgVersion},
+ org.apache.cocoon.core.container.spring.avalon;version=${pkgVersion},
+ org.apache.cocoon.core.container.spring.pipeline;version=${pkgVersion},
+ org.apache.cocoon.core.xml.avalon;version=${pkgVersion},
+ org.apache.cocoon.environment;version=${pkgVersion},
+ org.apache.cocoon.environment.background;version=${pkgVersion},
+ org.apache.cocoon.environment.http;version=${pkgVersion},
+ org.apache.cocoon.environment.impl;version=${pkgVersion},
+ org.apache.cocoon.environment.internal;version=${pkgVersion},
+ org.apache.cocoon.environment.wrapper;version=${pkgVersion},
+ org.apache.cocoon.generation;version=${pkgVersion},
+ org.apache.cocoon.i18n;version=${pkgVersion},
+ 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},
+ org.apache.cocoon.selection;version=${pkgVersion},
+ org.apache.cocoon.serialization;version=${pkgVersion},
+ org.apache.cocoon.servlet;version=${pkgVersion},
+ org.apache.cocoon.servlet.multipart;version=${pkgVersion},
+ org.apache.cocoon.sitemap;version=${pkgVersion},
+ org.apache.cocoon.sitemap.impl;version=${pkgVersion},
+ org.apache.cocoon.sitemap.schema;version=${pkgVersion},
+ org.apache.cocoon.transformation;version=${pkgVersion},
+ org.apache.cocoon.transformation.helpers;version=${pkgVersion},
+ org.apache.cocoon.transformation.pagination;version=${pkgVersion},
+ org.apache.cocoon.util.jxpath;version=${pkgVersion},
+ org.apache.cocoon.util.location;version=${pkgVersion},
+ org.apache.cocoon.xml;version=${pkgVersion},
+ org.apache.cocoon.xml.dom;version=${pkgVersion},
+ org.apache.cocoon.xml.xlink;version=${pkgVersion}
+ </Export-Package>
+ <Include-Resource>
+ src/main/resources/,
+ @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/*,
+ @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/cocoon/avalon/*,
+ @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/cocoon/properties/*,
+ @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/cocoon/properties/dev/*,
+ @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/cocoon/spring/*,
+ @cocoon-pipeline-components-${pkgVersion2}.jar!/META-INF/cocoon/avalon/*,
+ @cocoon-pipeline-components-${pkgVersion2}.jar!/META-INF/cocoon/spring/*,
+ @cocoon-pipeline-impl-${pkgVersion2}.jar!/META-INF/cocoon/spring/*,
+ @cocoon-sitemap-components-${pkgVersion2}.jar!/META-INF/cocoon/avalon/*,
+ @cocoon-sitemap-impl-${pkgVersion2}.jar!/META-INF/cocoon/avalon/*,
+ @cocoon-sitemap-impl-${pkgVersion2}.jar!/META-INF/cocoon/properties/*,
+ @cocoon-sitemap-impl-${pkgVersion2}.jar!/META-INF/cocoon/properties/dev/*,
+ @cocoon-sitemap-impl-${pkgVersion2}.jar!/META-INF/cocoon/spring/*
+ </Include-Resource>
+ <Import-Package>
+ com.sun.image.codec.jpeg;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers?rev=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers Sun Sep 9 12:54:14 2007
@@ -0,0 +1,17 @@
+# 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.
+#
+http\://cocoon.apache.org/schema/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler
+http\://cocoon.apache.org/schema/pipeline=org.apache.cocoon.core.container.spring.pipeline.PipelineNamespaceHandler
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.handlers
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas?rev=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas Sun Sep 9 12:54:14 2007
@@ -0,0 +1,17 @@
+# 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.
+#
+http\://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd
+http\://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd=org/apache/cocoon/core/container/spring/pipeline/cocoon-pipeline-1.0.xsd
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml?rev=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml Sun Sep 9 12:54:14 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xmlns:avalon="http://cocoon.apache.org/schema/avalon"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd
+ http://cocoon.apache.org/schema/avalon http://cocoon.apache.org/schema/avalon/cocoon-avalon-1.0.xsd">
+
+ <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings readFromClasspath="false" readFromGlobalLocation="false" extractBlockResources="false">
+ <configurator:include-properties dir="/META-INF/cocoon/properties"/>
+ </configurator:settings>
+
+ <!-- Activate Avalon Bridge -->
+ <avalon:bridge location="/META-INF/spring/core.xconf"/>
+
+</beans>
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/avalon-components.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf?rev=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf Sun Sep 9 12:54:14 2007
@@ -0,0 +1,38 @@
+<?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.
+-->
+<!--+
+ | $Id$
+ +-->
+<cocoon version="2.2">
+
+ <!--+
+ | Include the core roles definitions.
+ +-->
+ <include src="resource://org/apache/cocoon/cocoon.roles"/>
+
+ <!--+
+ | Include all Avalon configuration files from cocoon-pipeline-components
+ +-->
+ <include src="/META-INF/cocoon/avalon/cocoon-core-xpath-processor.xconf"/>
+ <!--
+ <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-processor.xconf"/>
+ <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-saxon.xconf"/>
+ <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-xalan.xconf"/>
+ <include src="/META-INF/cocoon/avalon/cocoon-core-xslt-xsltc.xconf"/>
+ -->
+</cocoon>
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/core.xconf
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml?rev=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml Sun Sep 9 12:54:14 2007
@@ -0,0 +1,37 @@
+<?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.
+-->
+<!--+
+ | Publish components from pipeline-components
+ |
+ | @version $Id$
+ +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+ <import resource="../cocoon/spring/cocoon-core-generators.xml"/>
+ <import resource="../cocoon/spring/cocoon-core-readers.xml"/>
+ <import resource="../cocoon/spring/cocoon-core-serializers.xml"/>
+
+ <osgi:reference id="org.apache.cocoon.core.xml.DOMParser" interface="org.apache.cocoon.core.xml.DOMParser"/>
+ <osgi:reference id="org.apache.cocoon.core.xml.SAXParser" interface="org.apache.cocoon.core.xml.SAXParser"/>
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-components.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: 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=574059&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml Sun Sep 9 12:54:14 2007
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!--+
+ | Publish components from pipeline-impl
+ |
+ | @version $Id$
+ +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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/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"/>
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-core-osgi/src/main/resources/META-INF/spring/pipeline-impl.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/whiteboard/osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/pom.xml?rev=574059&r1=574058&r2=574059&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/pom.xml Sun Sep 9 12:54:14 2007
@@ -51,6 +51,7 @@
<module>commons/js</module>
<module>commons/xalan</module>
<module>commons/xml-apis</module>
+ <module>core/cocoon-core-osgi</module>
<module>core/cocoon-configuration/cocoon-configuration-api-osgi</module>
<module>core/cocoon-configuration/cocoon-spring-configurator-osgi</module>
<module>core/cocoon-expression-language/cocoon-expression-language-api-osgi</module>
@@ -230,6 +231,12 @@
<groupId>org.apache.felix.commons</groupId>
<artifactId>org.apache.felix.commons.xercesImpl</artifactId>
<version>2.8.1-0001-20070316.210408-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix.commons</groupId>
@@ -367,6 +374,11 @@
</dependency>
<!-- Cocoon -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-osgi</artifactId>
+ <version>2.2.0-RC2-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-configuration-api-osgi</artifactId>