You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by rw...@apache.org on 2011/09/01 05:27:58 UTC
svn commit: r1163899 - in /aries/branches/0.3-RCx/blueprint:
blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/
blueprint-bundle/ blueprint-core/
blueprint-core/src/main/java/org/apache/aries/blueprint/ext/
blueprint-itests/src...
Author: rwonly
Date: Thu Sep 1 03:27:57 2011
New Revision: 1163899
URL: http://svn.apache.org/viewvc?rev=1163899&view=rev
Log:
ARIES-727 make the commons-jexl a optional dependency. People won't need this if they don't use the syntax ${a+b} in blueprint-ext.
Modified:
aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml
aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml
aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
Modified: aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=1163899&r1=1163898&r2=1163899&view=diff
==============================================================================
--- aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Thu Sep 1 03:27:57 2011
@@ -222,7 +222,8 @@ public abstract class AbstractIntegratio
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.commons", "commons-jexl"),
+ //no syntax like ${a+b} is used in blueprint-ext of the blueprint samples, so don't need this
+ //mavenBundle("org.apache.commons", "commons-jexl"),
equinox().version("3.5.0")
);
Modified: aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml?rev=1163899&r1=1163898&r2=1163899&view=diff
==============================================================================
--- aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml Thu Sep 1 03:27:57 2011
@@ -49,6 +49,7 @@
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.export>
Modified: aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml?rev=1163899&r1=1163898&r2=1163899&view=diff
==============================================================================
--- aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml (original)
+++ aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml Thu Sep 1 03:27:57 2011
@@ -48,6 +48,7 @@
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.export.service>
Modified: aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java?rev=1163899&r1=1163898&r2=1163899&view=diff
==============================================================================
--- aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java (original)
+++ aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java Thu Sep 1 03:27:57 2011
@@ -148,13 +148,19 @@ public class PropertyPlaceholder extends
String result = super.retrieveValue(expression);
if (result == null){
- JexlExpressionParser parser = getJexlParser();
try {
- Object obj = parser.evaluate(expression);
- if (obj!=null) {
- result = obj.toString();
+ Class.forName("org.apache.commons.jexl2.JexlEngine");
+ JexlExpressionParser parser = getJexlParser();
+ try {
+ Object obj = parser.evaluate(expression);
+ if (obj!=null) {
+ result = obj.toString();
+ }
+ } catch (Exception e) {
+ LOGGER.info("Could not evaluate expression: {}", expression);
+ LOGGER.info("Exception:", e);
}
- } catch (Exception e) {
+ } catch (ClassNotFoundException e) {
LOGGER.info("Could not evaluate expression: {}", expression);
LOGGER.info("Exception:", e);
}
Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=1163899&r1=1163898&r2=1163899&view=diff
==============================================================================
--- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Thu Sep 1 03:27:57 2011
@@ -224,7 +224,8 @@ public abstract class AbstractIntegratio
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.commons", "commons-jexl"),
+ //no syntax like ${a+b} is used in blueprint-ext of the blueprint samples, so don't need this
+ //mavenBundle("org.apache.commons", "commons-jexl"),
equinox().version("3.5.0")
);
Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1163899&r1=1163898&r2=1163899&view=diff
==============================================================================
--- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java (original)
+++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java Thu Sep 1 03:27:57 2011
@@ -91,8 +91,8 @@ public class QuiesceBlueprintTest extend
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
// Bundles
- mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
- mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testquiescebundle")