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/06 23:13:14 UTC
svn commit: r573380 - in /cocoon/whiteboard/osgi: ./ cocoon-osgi-main/
cocoon-osgi-main/src/main/resources/ commons/commons-jexl/
commons/commons-jxpath/
core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/
...
Author: danielf
Date: Thu Sep 6 14:13:09 2007
New Revision: 573380
URL: http://svn.apache.org/viewvc?rev=573380&view=rev
Log:
Adding expression language with services and dependencies to the OSGi runtime. The JXPath bundle from Felix didn't export a package that is needed for the EL, so I forked it.
Added:
cocoon/whiteboard/osgi/commons/commons-jxpath/
cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml (with props)
cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.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/commons/commons-jexl/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=573380&r1=573379&r2=573380&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml (original)
+++ cocoon/whiteboard/osgi/cocoon-osgi-main/pom.xml Thu Sep 6 14:13:09 2007
@@ -156,6 +156,14 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-expression-language-api-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-servlet-service-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=573380&r1=573379&r2=573380&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 Sep 6 14:13:09 2007
@@ -40,6 +40,8 @@
file:bundle/org.apache.felix.commons.avalon-framework-4.3.1-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.commons-collections-3.2.0-0001-20070316.210408-1.jar \
file:bundle/org.apache.felix.commons.commons-io-1.3.0-0001-20070316.210408-1.jar \
+ file:bundle/org.apache.felix.commons.commons-jexl-1.0.0-0001-SNAPSHOT.jar \
+ file:bundle/org.apache.felix.commons.commons-jxpath-1.2.0-0001-SNAPSHOT.jar \
file:bundle/org.apache.felix.commons.commons-lang-2.2.0-0001-20070316.210408-1.jar \
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 \
@@ -47,6 +49,7 @@
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.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.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 \
@@ -65,6 +68,8 @@
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-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 \
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 \
Modified: cocoon/whiteboard/osgi/commons/commons-jexl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/commons/commons-jexl/pom.xml?rev=573380&r1=573379&r2=573380&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/commons/commons-jexl/pom.xml (original)
+++ cocoon/whiteboard/osgi/commons/commons-jexl/pom.xml Thu Sep 6 14:13:09 2007
@@ -30,7 +30,7 @@
<pkgArtifactId>commons-jexl</pkgArtifactId>
<pkgVersion>1.0</pkgVersion>
<pomVersion>0001</pomVersion>
- <osgiVersion>${pkgVersion}</osgiVersion>
+ <osgiVersion>${pkgVersion}.0</osgiVersion>
</properties>
<groupId>org.apache.felix.commons</groupId>
<artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
@@ -65,20 +65,20 @@
${pom.artifactId}
</Bundle-SymbolicName>
<Export-Package>
- org.apache.commons.jexl;version=${pkgVersion},
- org.apache.commons.jexl.context;version=${pkgVersion},
- org.apache.commons.jexl.junit;version=${pkgVersion},
- org.apache.commons.jexl.parser;version=${pkgVersion},
- org.apache.commons.jexl.resolver;version=${pkgVersion},
- org.apache.commons.jexl.util;version=${pkgVersion},
- org.apache.commons.jexl.util.introspection;version=${pkgVersion}
+ org.apache.commons.jexl;version=${pkgVersion},
+ org.apache.commons.jexl.context;version=${pkgVersion},
+ org.apache.commons.jexl.junit;version=${pkgVersion},
+ org.apache.commons.jexl.parser;version=${pkgVersion},
+ org.apache.commons.jexl.resolver;version=${pkgVersion},
+ org.apache.commons.jexl.util;version=${pkgVersion},
+ org.apache.commons.jexl.util.introspection;version=${pkgVersion}
</Export-Package>
<Include-Resource>
@${pkgArtifactId}-${pkgVersion}.jar!/META-INF/*
</Include-Resource>
<Import-Package>
junit.framework;resolution:=optional,
- *
+ *
</Import-Package>
</instructions>
</configuration>
Added: cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml?rev=573380&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml (added)
+++ cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml Thu Sep 6 14:13:09 2007
@@ -0,0 +1,92 @@
+<?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.felix.commons</groupId>
+ <artifactId>build</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ </parent>
+ <properties>
+ <pkgArtifactId>commons-jxpath</pkgArtifactId>
+ <pkgVersion>1.2</pkgVersion>
+ <pomVersion>0001</pomVersion>
+ <osgiVersion>${pkgVersion}.0</osgiVersion>
+ </properties>
+ <groupId>org.apache.felix.commons</groupId>
+ <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+ <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>${pkgArtifactId} bundle</name>
+ <description>
+ This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ </description>
+ <organization>
+ <name>Apache Felix Project</name>
+ <url>http://felix.apache.org/</url>
+ </organization>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/commons-jxpath</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/felix/trunk/commons/commons-jxpath</developerConnection>
+ <url>http://svn.apache.org/viewcvs/felix/trunk/commons/commons-jxpath</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgArtifactId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>
+ ${pom.artifactId}
+ </Bundle-SymbolicName>
+ <Export-Package>
+ *;version=${pkgVersion}
+ </Export-Package>
+ <Include-Resource>
+ @${pkgArtifactId}-${pkgVersion}.jar!/META-INF/*
+ </Include-Resource>
+ <Import-Package>
+ javax.servlet;resolution:=optional,
+ javax.servlet.http;resolution:=optional,
+ javax.servlet.jsp;resolution:=optional,
+ org.apache.commons.beanutils;resolution:=optional,
+ org.jdom;resolution:=optional,
+ org.jdom.input;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/commons/commons-jxpath/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml?rev=573380&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml Thu Sep 6 14:13:09 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.
+-->
+<!--+
+ | Publish the default expression factory
+ |
+ | @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/DefaultExpressionFactory.xml"/>
+ <import resource="../cocoon/spring/JavaScriptCompiler.xml"/>
+ <import resource="../cocoon/spring/JexlCompiler.xml"/>
+ <import resource="../cocoon/spring/JXPathCompiler.xml"/>
+ <import resource="../cocoon/spring/RhinoScope.xml"/>
+
+ <osgi:service ref="org.apache.cocoon.el.ExpressionFactory" interface="org.apache.cocoon.el.ExpressionFactory"/>
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/expression-factory.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml?rev=573380&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml Thu Sep 6 14:13:09 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 the object model providers
+ |
+ | @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/ObjectModelProviders.xml"/>
+
+ <osgi:service ref="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"
+ interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
+ <osgi:service ref="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"
+ interface="org.apache.cocoon.el.objectmodel.ObjectModelProvider"/>
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/object-model-providers.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.xml?rev=573380&view=auto
==============================================================================
--- cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.xml (added)
+++ cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.xml Thu Sep 6 14:13:09 2007
@@ -0,0 +1,39 @@
+<?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 the string template parsers
+ |
+ | @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/AbstractStringTemplateParser.xml"/>
+ <import resource="../cocoon/spring/DefaultStringTemplateParser.xml"/>
+ <import resource="../cocoon/spring/LegacyStringTemplateParser.xml"/>
+
+ <osgi:service ref="org.apache.cocoon.el.parsing.StringTemplateParser/default"
+ interface="org.apache.cocoon.el.parsing.StringTemplateParser"/>
+ <osgi:service ref="org.apache.cocoon.el.parsing.StringTemplateParser/legacy"
+ interface="org.apache.cocoon.el.parsing.StringTemplateParser"/>
+</beans>
\ No newline at end of file
Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/whiteboard/osgi/core/cocoon-expression-language/cocoon-expression-language-impl-osgi/src/main/resources/META-INF/spring/string-template-parsers.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/whiteboard/osgi/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/osgi/pom.xml?rev=573380&r1=573379&r2=573380&view=diff
==============================================================================
--- cocoon/whiteboard/osgi/pom.xml (original)
+++ cocoon/whiteboard/osgi/pom.xml Thu Sep 6 14:13:09 2007
@@ -38,6 +38,7 @@
<modules>
<module>commons/avalon-framework</module>
<module>commons/commons-jexl</module>
+ <module>commons/commons-jxpath</module>
<module>commons/concurrent</module>
<module>commons/ehcache</module>
<module>commons/excalibur-instrument-api</module>
@@ -152,22 +153,12 @@
<dependency>
<groupId>org.apache.felix.commons</groupId>
<artifactId>org.apache.felix.commons.commons-jexl</artifactId>
- <version>1.0-0001-SNAPSHOT</version>
+ <version>1.0.0-0001-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix.commons</groupId>
<artifactId>org.apache.felix.commons.commons-jxpath</artifactId>
- <version>1.2.0-0001-20070316.210408-1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.2.0-0001-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix.commons</groupId>