You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2011/10/05 14:55:24 UTC
svn commit: r1179206 - in /aries/trunk/blueprint: ./ blueprint-bundle/
blueprint-core/ blueprint-core/src/main/java/org/apache/aries/blueprint/ext/
blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/
blueprint-core/src/main/java/org/...
Author: timothyjward
Date: Wed Oct 5 12:55:23 2011
New Revision: 1179206
URL: http://svn.apache.org/viewvc?rev=1179206&view=rev
Log:
ARIES-727: Separate JEXL evaluator into a different bundle
Added:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
- copied, changed from r1179099, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyEvaluator.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/packageinfo
aries/trunk/blueprint/blueprint-jexl-evaluator/
aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
aries/trunk/blueprint/blueprint-jexl-evaluator/src/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlExpressionParser.java
- copied, changed from r1179099, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlExpressionParser.java
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java
- copied, changed from r1179099, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlPropertyEvaluator.java
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/blueprint/
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/blueprint/jexl.xml
Removed:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyEvaluator.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
aries/trunk/blueprint/pom.xml
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Wed Oct 5 12:55:23 2011
@@ -58,7 +58,6 @@
org.apache.aries.blueprint.annotation.service;resolution:=optional,
org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
- org.apache.commons.jexl2;resolution:=optional,
*
</aries.osgi.import>
<!-- Export package versions are maintained in packageinfo files -->
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Wed Oct 5 12:55:23 2011
@@ -57,7 +57,6 @@
org.apache.aries.blueprint.annotation.service;resolution:=optional,
org.apache.aries.quiesce.manager;version="[0.2,1.0)";resolution:=optional,
org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
- org.apache.commons.jexl2;resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.private.pkg />
@@ -121,11 +120,6 @@
<version>3.2</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<version>0.3.1-SNAPSHOT</version>
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java Wed Oct 5 12:55:23 2011
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.aries.blueprint.ExtendedReferenceListMetadata;
import org.apache.aries.blueprint.ParserContext;
+import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
import org.apache.aries.blueprint.mutable.MutableCollectionMetadata;
import org.apache.aries.blueprint.mutable.MutableComponentMetadata;
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java Wed Oct 5 12:55:23 2011
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java (from r1179099, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyEvaluator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java?p2=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyEvaluator.java&r1=1179099&r2=1179206&rev=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyEvaluator.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java Wed Oct 5 12:55:23 2011
@@ -1,4 +1,4 @@
-package org.apache.aries.blueprint.ext;
+package org.apache.aries.blueprint.ext.evaluator;
import java.util.Dictionary;
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/packageinfo?rev=1179206&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/packageinfo Wed Oct 5 12:55:23 2011
@@ -0,0 +1,19 @@
+#
+# 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 0.3.2
Modified: aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml Wed Oct 5 12:55:23 2011
@@ -33,12 +33,5 @@
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
</service>
-
- <service interface="org.apache.aries.blueprint.ext.PropertyEvaluator">
- <service-properties>
- <entry key="org.apache.aries.blueprint.ext.evaluator.name" value="jexl" />
- </service-properties>
- <bean class="org.apache.aries.blueprint.ext.evaluator.jexl.JexlPropertyEvaluator"/>
- </service>
</blueprint>
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Wed Oct 5 12:55:23 2011
@@ -63,6 +63,12 @@
<version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
+ <scope>test</scope>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
Modified: aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java (original)
+++ aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java Wed Oct 5 12:55:23 2011
@@ -70,6 +70,7 @@ public class Helper {
"asm/asm-all",
"org.apache.commons/commons-jexl",
"org.osgi/org.osgi.compendium"),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),
((startBlueprint) ? mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint") :
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").noStart())
Added: aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1179206&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml (added)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml Wed Oct 5 12:55:23 2011
@@ -0,0 +1,75 @@
+<!--
+ 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.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries Blueprint JEXL evaluator</name>
+ <version>0.1.0-SNAPSHOT</version>
+ <description>
+ This bundle contains a plugin to the "ext" namespace handler for evaluating expressions using JEXL
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core</url>
+ </scm>
+ <properties>
+
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg/>
+ <aries.osgi.import>
+ org.apache.aries.blueprint.ext.evaluator;version="[0.3.2,0.4)",
+ org.apache.commons.jexl2,
+ org.slf4j,
+ org.osgi.service.blueprint
+ </aries.osgi.import>
+ <aries.osgi.private.pkg>
+ org.apache.aries.blueprint.jexl.evaluator
+ </aries.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Copied: aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlExpressionParser.java (from r1179099, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlExpressionParser.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlExpressionParser.java?p2=aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlExpressionParser.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlExpressionParser.java&r1=1179099&r2=1179206&rev=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlExpressionParser.java (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlExpressionParser.java Wed Oct 5 12:55:23 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.aries.blueprint.ext.evaluator.jexl;
+package org.apache.aries.blueprint.jexl.evaluator;
import java.util.Map;
Copied: aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java (from r1179099, aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlPropertyEvaluator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java?p2=aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java&p1=aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlPropertyEvaluator.java&r1=1179099&r2=1179206&rev=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/jexl/JexlPropertyEvaluator.java (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java Wed Oct 5 12:55:23 2011
@@ -1,11 +1,11 @@
-package org.apache.aries.blueprint.ext.evaluator.jexl;
+package org.apache.aries.blueprint.jexl.evaluator;
import java.util.Collection;
import java.util.Dictionary;
import java.util.Map;
import java.util.Set;
-import org.apache.aries.blueprint.ext.PropertyEvaluator;
+import org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Added: aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/blueprint/jexl.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/blueprint/jexl.xml?rev=1179206&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/blueprint/jexl.xml (added)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/resources/OSGI-INF/blueprint/jexl.xml Wed Oct 5 12:55:23 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
+
+ <service interface="org.apache.aries.blueprint.ext.evaluator.PropertyEvaluator">
+ <service-properties>
+ <entry key="org.apache.aries.blueprint.ext.evaluator.name" value="jexl" />
+ </service-properties>
+ <bean class="org.apache.aries.blueprint.jexl.evaluator.JexlPropertyEvaluator"/>
+ </service>
+
+</blueprint>
Modified: aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1179206&r1=1179205&r2=1179206&view=diff
==============================================================================
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Wed Oct 5 12:55:23 2011
@@ -42,6 +42,7 @@
<module>blueprint-core</module>
<module>blueprint-cm</module>
<module>blueprint-bundle</module>
+ <module>blueprint-jexl-evaluator</module>
<module>blueprint-sample</module>
<module>blueprint-annotation-api</module>
<module>blueprint-annotation-impl</module>