You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/09/23 09:07:16 UTC
svn commit: r1174557 - in /geronimo/external/trunk/blueprint-0.3: ./
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-co...
Author: rwonly
Date: Fri Sep 23 07:07:15 2011
New Revision: 1174557
URL: http://svn.apache.org/viewvc?rev=1174557&view=rev
Log:
merge in the fixes in ARIES 727 (rev 1162308 - rev 1163899)
Added:
geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java (with props)
geronimo/external/trunk/blueprint-0.3/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java (with props)
Modified:
geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-bundle/pom.xml
geronimo/external/trunk/blueprint-0.3/blueprint-core/pom.xml
geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/pom.xml
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
geronimo/external/trunk/blueprint-0.3/pom.xml
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Fri Sep 23 07:07:15 2011
@@ -24,9 +24,14 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+import static org.ops4j.pax.exam.OptionUtils.combine;
-import java.io.*;
-import java.net.URISyntaxException;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -39,11 +44,8 @@ import org.apache.aries.blueprint.sample
import org.junit.After;
import org.junit.Before;
import org.ops4j.pax.exam.CoreOptions;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
-import static org.ops4j.pax.exam.OptionUtils.combine;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -204,7 +206,28 @@ public abstract class AbstractIntegratio
throw new FileNotFoundException( "File [" + filePath + "] could not be found: " + e.getMessage() );
}
}
+
+ protected static Option[] getSharedOptions() {
+ return options(
+ // Log
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+ // Felix Config Admin
+ mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
+ // Felix mvn url handler
+ mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+
+ // Bundles
+ mavenBundle("org.osgi", "org.osgi.compendium"),
+ mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
+ //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")
+ );
+ }
protected static Option[] updateOptions(Option[] options) {
// We need to add pax-exam-junit here when running with the ibm
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java Fri Sep 23 07:07:15 2011
@@ -23,15 +23,12 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.text.SimpleDateFormat;
import java.util.Currency;
-import java.util.Hashtable;
-import java.util.Set;
import org.apache.aries.blueprint.sample.Bar;
import org.apache.aries.blueprint.sample.Foo;
@@ -39,10 +36,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.BlueprintContainer;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
@RunWith(JUnit4TestRunner.class)
public class BlueprintAnnotationTest extends AbstractIntegrationTest {
@@ -83,33 +77,20 @@ public class BlueprintAnnotationTest ext
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.xbean", "xbean-finder"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.annotation.api"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.annotation.impl"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample-annotation"),
- //mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample"),
- mavenBundle("org.osgi", "org.osgi.compendium"),
- //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.xbean", "xbean-finder"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.annotation.api"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.annotation.impl"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample-annotation")
+ //mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
+ //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- equinox().version("3.5.0")
- );
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-bundle/pom.xml?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-bundle/pom.xml (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-bundle/pom.xml Fri Sep 23 07:07:15 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: geronimo/external/trunk/blueprint-0.3/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-core/pom.xml?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-core/pom.xml (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-core/pom.xml Fri Sep 23 07:07:15 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>
@@ -99,17 +100,22 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.api</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.aries.quiesce</groupId>
+ <artifactId>org.apache.aries.quiesce.api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
</dependency>
</dependencies>
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java Fri Sep 23 07:07:15 2011
@@ -52,6 +52,8 @@ import org.osgi.service.blueprint.reflec
import org.osgi.service.blueprint.reflect.ServiceMetadata;
import org.osgi.service.blueprint.reflect.Target;
import org.osgi.service.blueprint.reflect.ValueMetadata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract class for property placeholders.
@@ -60,6 +62,8 @@ import org.osgi.service.blueprint.reflec
*/
public abstract class AbstractPropertyPlaceholder implements ComponentDefinitionRegistryProcessor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPropertyPlaceholder.class);
+
private String placeholderPrefix = "${";
private String placeholderSuffix = "}";
private Pattern pattern;
@@ -193,11 +197,15 @@ public abstract class AbstractPropertyPl
return new LateBindingValueMetadata(metadata);
}
+ protected String retrieveValue(String expression) {
+ return getProperty(expression);
+ }
+
protected String processString(String str) {
// TODO: we need to handle escapes on the prefix / suffix
Matcher matcher = getPattern().matcher(str);
while (matcher.find()) {
- String rep = getProperty(matcher.group(1));
+ String rep = retrieveValue(matcher.group(1));
if (rep != null) {
str = str.replace(matcher.group(0), rep);
matcher.reset(str);
@@ -229,8 +237,12 @@ public abstract class AbstractPropertyPl
public String getStringValue() {
if (!retrieved) {
+ String v = metadata.getStringValue();
+ LOGGER.debug("Before process: {}", v);
+ retrievedValue = processString(v);
+ LOGGER.debug("After process: {}", retrievedValue);
+
retrieved = true;
- retrievedValue = processString(metadata.getStringValue());
}
return retrievedValue;
}
Added: geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java?rev=1174557&view=auto
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java (added)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java Fri Sep 23 07:07:15 2011
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.aries.blueprint.ext;
+
+import java.util.Map;
+
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.MapContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Rev: 907189 $ $Date: 2010-02-06 16:01:43 +0800 (Sat, 06 Feb 2010) $
+ */
+public class JexlExpressionParser {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JexlExpressionParser.class);
+
+ protected final JexlContext context;
+ private final JexlEngine engine;
+
+ public JexlExpressionParser(final Map<String, Object> vars) {
+ if (vars == null) {
+ throw new IllegalArgumentException("vars: " + vars);
+ }
+ engine = new JexlEngine();
+ context = new MapContext(vars);
+
+ LOGGER.trace("Using variables: {}", vars);
+ }
+
+ public Object evaluate(final String expression) throws Exception {
+ if (expression == null) {
+ throw new IllegalArgumentException("expression: " + expression);
+ }
+
+ LOGGER.trace("Evaluating expression: {}", expression);
+ return engine.createExpression(expression).evaluate(context);
+
+ }
+
+}
Propchange: geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java Fri Sep 23 07:07:15 2011
@@ -21,9 +21,11 @@ package org.apache.aries.blueprint.ext;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +50,8 @@ public class PropertyPlaceholder extends
private List<URL> locations;
private boolean ignoreMissingLocations;
private SystemProperties systemProperties = SystemProperties.fallback;
-
+ private transient JexlExpressionParser jexlParser;
+
public Map getDefaultProperties() {
return defaultProperties;
}
@@ -139,4 +142,101 @@ public class PropertyPlaceholder extends
return v != null ? v.toString() : null;
}
+ @Override
+ protected String retrieveValue(String expression) {
+ LOGGER.debug("Retrieving Value from expression: {}", expression);
+ String result = super.retrieveValue(expression);
+
+ if (result == null){
+ try {
+ 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 (ClassNotFoundException e) {
+ LOGGER.info("Could not evaluate expression: {}", expression);
+ LOGGER.info("Exception:", e);
+ }
+ }
+ return result;
+ }
+
+ private synchronized JexlExpressionParser getJexlParser() {
+ if (jexlParser == null) {
+ jexlParser = new JexlExpressionParser(toMap());
+ }
+ return jexlParser;
+ }
+
+ private Map<String, Object> toMap() {
+ return new Map<String, Object>() {
+ @Override
+ public boolean containsKey(Object o) {
+ return getProperty((String) o) != null;
+ }
+
+ @Override
+ public Object get(Object o) {
+ return getProperty((String) 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();
+ }
+ };
+ }
}
Added: geronimo/external/trunk/blueprint-0.3/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java?rev=1174557&view=auto
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java (added)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java Fri Sep 23 07:07:15 2011
@@ -0,0 +1,93 @@
+/**
+ * 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.
+ */
+package org.apache.aries.blueprint.ext;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.osgi.service.blueprint.reflect.ValueMetadata;
+
+public class PropertyPlaceholderTest extends PropertyPlaceholder {
+ private final Map<String,String> values = new HashMap<String,String>();
+ private LateBindingValueMetadata sut;
+
+ @Before
+ public void setup() {
+ values.clear();
+ bind("prop1","hello");
+ bind("prop2","world");
+ bind("prop3","10");
+ bind("prop4","20");
+ }
+
+ @Test
+ public void singleProp() {
+ sut = makeProperty("${prop1}");
+ assertEquals("hello", sut.getStringValue());
+ }
+
+ @Test
+ public void multipleProps() {
+ sut = makeProperty("say ${prop1} ${prop2}");
+ assertEquals("say hello world", sut.getStringValue());
+ }
+
+ @Test
+ public void evaluateStringProps() {
+ sut = makeProperty("${prop1+prop2}");
+ assertEquals("helloworld", sut.getStringValue());
+ }
+
+ @Test
+ public void evaluateIntProps() {
+ sut = makeProperty("${prop3+prop4}");
+ assertEquals("30", sut.getStringValue());
+ }
+
+
+
+ /*
+ * Test helper methods
+ */
+
+ // Override to simulate actual property retrieval
+ protected String getProperty(String prop) {
+ return values.get(prop);
+ }
+
+ private void bind(String prop, String val) {
+ values.put(prop, val);
+ }
+
+ private LateBindingValueMetadata makeProperty(final String prop) {
+ return new LateBindingValueMetadata(new ValueMetadata() {
+ public String getType() {
+ return null;
+ }
+
+ public String getStringValue() {
+ return prop;
+ }
+ });
+ }
+}
Propchange: geronimo/external/trunk/blueprint-0.3/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/pom.xml?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/pom.xml (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/pom.xml Fri Sep 23 07:07:15 2011
@@ -127,6 +127,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
</dependency>
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Fri Sep 23 07:07:15 2011
@@ -24,8 +24,14 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+import static org.ops4j.pax.exam.OptionUtils.combine;
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -40,11 +46,8 @@ import org.apache.aries.blueprint.sample
import org.junit.After;
import org.junit.Before;
import org.ops4j.pax.exam.CoreOptions;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
-import static org.ops4j.pax.exam.OptionUtils.combine;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -205,7 +208,28 @@ public abstract class AbstractIntegratio
throw new FileNotFoundException( "File [" + filePath + "] could not be found: " + e.getMessage() );
}
}
+
+ protected static Option[] getSharedOptions() {
+ return options(
+ // Log
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+ // Felix Config Admin
+ mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
+ // Felix mvn url handler
+ mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+
+ // Bundles
+ mavenBundle("org.osgi", "org.osgi.compendium"),
+ mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
+ //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")
+ );
+ }
protected static Option[] updateOptions(Option[] options) {
// We need to add pax-exam-junit here when running with the ibm
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java Fri Sep 23 07:07:15 2011
@@ -22,9 +22,6 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import java.util.ArrayList;
import java.util.List;
@@ -35,10 +32,6 @@ import org.apache.aries.blueprint.testbu
import org.apache.aries.blueprint.testbundlea.ProcessableBean;
import org.apache.aries.blueprint.testbundlea.ProcessableBean.Phase;
import org.apache.aries.blueprint.testbundleb.TestBean;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.BlueprintContainer;
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java Fri Sep 23 07:07:15 2011
@@ -19,9 +19,9 @@
package org.apache.aries.blueprint.itests;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.io.InputStream;
import java.net.URL;
@@ -31,7 +31,6 @@ import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
@@ -112,31 +111,18 @@ public class BlueprintContainer2BTCustom
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint").noStart(),
- // don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
- // mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
- mavenBundle("org.osgi", "org.osgi.compendium"),
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
- equinox().version("3.5.0")
- );
-
+
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint").noStart()
+ // don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
+ // mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
+ // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java Fri Sep 23 07:07:15 2011
@@ -19,9 +19,9 @@
package org.apache.aries.blueprint.itests;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.util.Hashtable;
@@ -65,29 +65,17 @@ public class BlueprintContainer2Test ext
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint").noStart(),
- mavenBundle("org.osgi", "org.osgi.compendium"),
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- equinox().version("3.5.0")
- );
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint").noStart()
+
+ // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java Fri Sep 23 07:07:15 2011
@@ -19,11 +19,9 @@
package org.apache.aries.blueprint.itests;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.io.InputStream;
import java.net.URL;
@@ -33,7 +31,6 @@ import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
@@ -111,39 +108,28 @@ public class BlueprintContainerBTCustomi
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- // don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
- //mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
- mavenBundle("org.osgi", "org.osgi.compendium"),
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
- /* For debugging, uncomment the next two lines */
-// vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
-// waitForFrameworkStartup(),
-
- /* For debugging, uncomment the next two lines
- and add these imports:
- import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
- import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
- */
- equinox().version("3.5.1")
- );
+
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint")
+ // don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
+ //mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
+
+ //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+ /* For debugging, uncomment the next two lines */
+ //vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
+ //waitForFrameworkStartup(),
+
+ /* For debugging, uncomment the next two lines
+ and add these imports:
+ import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+ import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+ */
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java Fri Sep 23 07:07:15 2011
@@ -18,29 +18,19 @@
*/
package org.apache.aries.blueprint.itests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
-import java.text.SimpleDateFormat;
-import java.util.Currency;
-import java.util.Hashtable;
import java.util.HashSet;
+import java.util.Hashtable;
-import org.apache.aries.blueprint.sample.Bar;
-import org.apache.aries.blueprint.sample.Foo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
-import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -82,29 +72,18 @@ public class BlueprintContainerTest exte
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
- mavenBundle("org.osgi", "org.osgi.compendium"),
- //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- equinox().version("3.5.0")
- );
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart()
+
+ //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java Fri Sep 23 07:07:15 2011
@@ -18,9 +18,9 @@
*/
package org.apache.aries.blueprint.itests;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,29 +37,18 @@ public class MultiBundleWithAsmTest exte
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart(),
- mavenBundle("org.osgi", "org.osgi.compendium"),
- // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
- equinox().version("3.5.0")
- );
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart()
+
+ // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java Fri Sep 23 07:07:15 2011
@@ -17,10 +17,8 @@ package org.apache.aries.blueprint.itest
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
@@ -38,19 +36,14 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.options.BootDelegationOption;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Filter;
-import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
-import org.osgi.util.tracker.ServiceTracker;
@RunWith(JUnit4TestRunner.class)
public class QuiesceBlueprintTest extends AbstractIntegrationTest{
@@ -91,38 +84,23 @@ public class QuiesceBlueprintTest extend
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- bootDelegationPackages("javax.transaction", "javax.transaction.*"),
- vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,
javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.name
space,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.
PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
-
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
- // this is how you set the default log level when using pax
- // logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("asm","asm-all"),
-
- mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart(),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testquiescebundle"),
- //mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.cm"),
- mavenBundle("org.osgi", "org.osgi.compendium"),
-
-// new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
-
- equinox().version("3.5.0"));
+ bootDelegationPackages("javax.transaction", "javax.transaction.*"),
+ vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callb
ack,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.
namespace,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.
omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
+
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart(),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.testquiescebundle")
+
+ //new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
+ );
+
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Fri Sep 23 07:07:15 2011
@@ -20,9 +20,9 @@ package org.apache.aries.blueprint.itest
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.util.Currency;
import java.util.Hashtable;
@@ -165,29 +165,16 @@ public class TestConfigAdmin extends Abs
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
- mavenBundle("org.osgi","org.osgi.compendium"),
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
- equinox().version("3.5.0")
- );
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+
+ // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample").noStart()
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java Fri Sep 23 07:07:15 2011
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.util.Hashtable;
import java.util.List;
@@ -128,29 +128,16 @@ public class TestReferences extends Abst
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
- // this is how you set the default log level when using pax logging (logProfile)
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
-
- // Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample"),
- mavenBundle("org.osgi", "org.osgi.compendium"),
-
-// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
- equinox().version("3.5.0")
- );
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+
+ // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample")
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java (original)
+++ geronimo/external/trunk/blueprint-0.3/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java Fri Sep 23 07:07:15 2011
@@ -21,9 +21,9 @@ package org.apache.aries.blueprint.itest
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.OptionUtils.combine;
import java.util.Map;
@@ -69,29 +69,16 @@ public class TestRegistrationListener ex
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- // Log
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
- // Felix Config Admin
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
- // Felix mvn url handler
- mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
- // this is how you set the default log level when using pax
- // logging (logProfile)
+ // this is how you set the default log level when using pax logging (logProfile)
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
-
+
+ // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
// Bundles
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample"),
- mavenBundle("org.osgi", "org.osgi.compendium"),
-
- // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
- equinox().version("3.5.0"));
+ mavenBundle("org.apache.geronimo.ext.aries.blueprint", "org.apache.aries.blueprint.sample")
+ );
+ options = combine (getSharedOptions(), options);
options = updateOptions(options);
return options;
}
Modified: geronimo/external/trunk/blueprint-0.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/blueprint-0.3/pom.xml?rev=1174557&r1=1174556&r2=1174557&view=diff
==============================================================================
--- geronimo/external/trunk/blueprint-0.3/pom.xml (original)
+++ geronimo/external/trunk/blueprint-0.3/pom.xml Fri Sep 23 07:07:15 2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <name>Apache Aries Blueprint</name>
+ <name>Apache Geronimo's Aries Blueprint fork</name>
<version>0.3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -145,20 +145,25 @@
<version>0.3</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.3</version>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>0.3</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.3</version>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>0.3</version>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.0</version>
</dependency>
</dependencies>
</dependencyManagement>