You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dk...@apache.org on 2011/11/17 17:00:21 UTC
svn commit: r1203229 - in /aries/trunk/blueprint: blueprint-cm/pom.xml
blueprint-itests/pom.xml
blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java
Author: dkulp
Date: Thu Nov 17 16:00:21 2011
New Revision: 1203229
URL: http://svn.apache.org/viewvc?rev=1203229&view=rev
Log:
Get blueprint completely building error free in eclipse
Reconfigure how pax-exam is setup in blueprint-itests so some of the
tests will run from within eclipse
Modified:
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1203229&r1=1203228&r2=1203229&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Thu Nov 17 16:00:21 2011
@@ -64,6 +64,12 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parser</artifactId>
+ <version>0.4.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>0.4.1-SNAPSHOT</version>
</dependency>
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1203229&r1=1203228&r2=1203229&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Thu Nov 17 16:00:21 2011
@@ -206,6 +206,11 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>${project.build.directory}/test-resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -232,7 +237,7 @@
<goal>generate-depends-file</goal>
</goals>
<configuration>
- <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
+ <outputFile>${project.build.directory}/test-resources/META-INF/maven/dependencies.properties</outputFile>
</configuration>
</execution>
</executions>
Modified: aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/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?rev=1203229&r1=1203228&r2=1203229&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/src/main/java/org/apache/aries/blueprint/jexl/evaluator/JexlPropertyEvaluator.java Thu Nov 17 16:00:21 2011
@@ -32,7 +32,6 @@ public class JexlPropertyEvaluator imple
private JexlExpressionParser jexlParser;
private Dictionary<String, String> properties;
- @Override
public String evaluate(String expression, Dictionary<String, String> properties) {
JexlExpressionParser parser = getJexlParser();
this.properties = properties;
@@ -60,63 +59,51 @@ public class JexlPropertyEvaluator imple
private Map<String, Object> toMap() {
return new Map<String, Object>() {
- @Override
public boolean containsKey(Object o) {
return properties.get(o) != null;
}
- @Override
public Object get(Object o) {
return properties.get(o);
}
// following are not important
- @Override
public Object put(String s, Object o) {
throw new UnsupportedOperationException();
}
- @Override
public int size() {
throw new UnsupportedOperationException();
}
- @Override
public boolean isEmpty() {
throw new UnsupportedOperationException();
}
- @Override
public boolean containsValue(Object o) {
throw new UnsupportedOperationException();
}
- @Override
public Object remove(Object o) {
throw new UnsupportedOperationException();
}
- @Override
public void putAll(Map<? extends String, ? extends Object> map) {
throw new UnsupportedOperationException();
}
- @Override
public void clear() {
throw new UnsupportedOperationException();
}
- @Override
public Set<String> keySet() {
throw new UnsupportedOperationException();
}
- @Override
public Collection<Object> values() {
throw new UnsupportedOperationException();
}
- @Override
public Set<Entry<String, Object>> entrySet() {
throw new UnsupportedOperationException();
}