You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@aries.apache.org by Jeremy Hughes <hu...@apache.org> on 2011/09/13 12:32:34 UTC
Re: svn commit: r1170091 - in /aries/branches/0.3-RCx/blueprint: ./
blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/
blueprint-api/ blueprint-bundle/ blueprint-cm/src/main/java/org/apache/aries/ blueprint-cm/src/main/java/o
Hi Rex, thanks for reversing this. I noticed you missed off the
'ARIES-797' from the commit, so I added it in JIRA using:
svn ps svn:log --revprop -r1170091 "ARIES-797 blueprint 0.3.x is
developing in trunk now, so revert the changes in this branch."
Thanks,
Jeremy
On 13 September 2011 09:52, <rw...@apache.org> wrote:
> Author: rwonly
> Date: Tue Sep 13 08:52:30 2011
> New Revision: 1170091
>
> URL: http://svn.apache.org/viewvc?rev=1170091&view=rev
> Log:
> blueprint 0.3.x is developing in trunk now, so revert the changes in this branch.
>
> Added:
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderTest.java
> - copied unchanged from r1073243, aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderTest.java
> 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-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-api/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java
> 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-core/src/main/resources/org/apache/aries/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/ (props changed)
> 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/AbstractMultiBundleTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
> aries/branches/0.3-RCx/blueprint/blueprint-sample/ (props changed)
> aries/branches/0.3-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/ (props changed)
> aries/branches/0.3-RCx/blueprint/pom.xml
>
> 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=1170091&r1=1170090&r2=1170091&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 Tue Sep 13 08:52:30 2011
> @@ -24,14 +24,9 @@ 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.FileNotFoundException;
> -import java.io.IOException;
> -import java.io.InputStream;
> +import java.io.*;
> +import java.net.URISyntaxException;
> import java.net.URL;
> import java.text.SimpleDateFormat;
> import java.util.ArrayList;
> @@ -44,8 +39,11 @@ 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;
> @@ -206,28 +204,7 @@ 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: aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java Tue Sep 13 08:52:30 2011
> @@ -23,12 +23,15 @@ 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;
> @@ -36,7 +39,10 @@ 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 {
> @@ -77,20 +83,33 @@ public class BlueprintAnnotationTest ext
> @org.ops4j.pax.exam.junit.Configuration
> public static Option[] configuration() {
> Option[] options = options(
> - // 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.aries.blueprint", "org.apache.aries.blueprint"),
> - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.annotation.api"),
> - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.annotation.impl"),
> - mavenBundle("org.apache.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"),
> + // 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.aries.blueprint", "org.apache.aries.blueprint.annotation.api"),
> + mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
> + mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.annotation.impl"),
> + mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample-annotation"),
> + //mavenBundle("org.apache.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"),
>
> - );
> - options = combine (getSharedOptions(), options);
> + equinox().version("3.5.0")
> + );
> options = updateOptions(options);
> return options;
> }
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-api/
> ('svn:mergeinfo' removed)
>
> 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=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml Tue Sep 13 08:52:30 2011
> @@ -49,7 +49,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.export>
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
> ('svn:mergeinfo' removed)
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> 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=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml Tue Sep 13 08:52:30 2011
> @@ -48,7 +48,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.export.service>
> @@ -100,22 +99,17 @@
> <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>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.commons</groupId>
> - <artifactId>commons-jexl</artifactId>
> + <groupId>org.apache.aries.proxy</groupId>
> + <artifactId>org.apache.aries.proxy.api</artifactId>
> </dependency>
> </dependencies>
>
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
> ('svn:mergeinfo' removed)
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java Tue Sep 13 08:52:30 2011
> @@ -52,8 +52,6 @@ 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.
> @@ -62,8 +60,6 @@ import org.slf4j.LoggerFactory;
> */
> public abstract class AbstractPropertyPlaceholder implements ComponentDefinitionRegistryProcessor {
>
> - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPropertyPlaceholder.class);
> -
> private String placeholderPrefix = "${";
> private String placeholderSuffix = "}";
> private Pattern pattern;
> @@ -197,15 +193,11 @@ 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 = retrieveValue(matcher.group(1));
> + String rep = getProperty(matcher.group(1));
> if (rep != null) {
> str = str.replace(matcher.group(0), rep);
> matcher.reset(str);
> @@ -237,12 +229,8 @@ 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;
> }
>
> 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=1170091&r1=1170090&r2=1170091&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 Tue Sep 13 08:52:30 2011
> @@ -21,11 +21,9 @@ 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;
> @@ -50,8 +48,7 @@ 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;
> }
> @@ -142,101 +139,4 @@ 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();
> - }
> - };
> - }
> }
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml Tue Sep 13 08:52:30 2011
> @@ -127,11 +127,6 @@
> <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>
> @@ -160,6 +155,7 @@
> <type>bundle</type>
> <scope>compile</scope>
> </dependency>
> +
> </dependencies>
>
> <build>
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> 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=1170091&r1=1170090&r2=1170091&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 Tue Sep 13 08:52:30 2011
> @@ -24,14 +24,8 @@ 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.FileNotFoundException;
> -import java.io.IOException;
> -import java.io.InputStream;
> +import java.io.*;
> import java.net.URL;
> import java.text.SimpleDateFormat;
> import java.util.ArrayList;
> @@ -46,8 +40,11 @@ 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;
> @@ -208,28 +205,7 @@ 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: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java Tue Sep 13 08:52:30 2011
> @@ -22,6 +22,9 @@ 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;
> @@ -32,6 +35,10 @@ 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: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java Tue Sep 13 08:52:30 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,6 +31,7 @@ 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,18 +112,31 @@ public class BlueprintContainer2BTCustom
> @org.ops4j.pax.exam.junit.Configuration
> public static Option[] configuration() {
> Option[] options = options(
> -
> - // 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.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.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);
> + // 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.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.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")
> + );
> +
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java Tue Sep 13 08:52:30 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,17 +65,29 @@ 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.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.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"),
>
> - // 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.blueprint", "org.apache.aries.blueprint.sample").noStart(),
> - mavenBundle("org.apache.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);
> + equinox().version("3.5.0")
> + );
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java Tue Sep 13 08:52:30 2011
> @@ -19,9 +19,11 @@
> 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 static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
> +import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
>
> import java.io.InputStream;
> import java.net.URL;
> @@ -31,6 +33,7 @@ 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;
> @@ -108,28 +111,39 @@ public class BlueprintContainerBTCustomi
> @org.ops4j.pax.exam.junit.Configuration
> public static Option[] configuration() {
> Option[] options = options(
> -
> - // 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.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.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);
> + // 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.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.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")
> + );
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java Tue Sep 13 08:52:30 2011
> @@ -18,19 +18,29 @@
> */
> 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.util.HashSet;
> +import java.text.SimpleDateFormat;
> +import java.util.Currency;
> import java.util.Hashtable;
> +import java.util.HashSet;
>
> +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;
>
> @@ -72,18 +82,29 @@ 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.aries.blueprint", "org.apache.aries.blueprint"),
> + mavenBundle("org.apache.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"),
>
> - // 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.blueprint", "org.apache.aries.blueprint"),
> - mavenBundle("org.apache.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);
> + equinox().version("3.5.0")
> + );
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java Tue Sep 13 08:52:30 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,18 +37,29 @@ 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.blueprint", "org.apache.aries.blueprint"),
> - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
> - mavenBundle("org.apache.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);
> + // 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.aries.blueprint", "org.apache.aries.blueprint"),
> + mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
> + mavenBundle("org.apache.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")
> + );
> options = updateOptions(options);
> return options;
> }
>
> 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=1170091&r1=1170090&r2=1170091&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 Tue Sep 13 08:52:30 2011
> @@ -17,8 +17,10 @@ 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;
>
> @@ -36,14 +38,19 @@ 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{
> @@ -84,23 +91,38 @@ 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.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.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")
> -
> - //new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
> - );
> -
> - options = combine (getSharedOptions(), 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.aries.blueprint", "org.apache.aries.blueprint"),
> + 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"),
> + //mavenBundle("org.apache.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"));
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Tue Sep 13 08:52:30 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,16 +165,29 @@ public class TestConfigAdmin extends Abs
> @org.ops4j.pax.exam.junit.Configuration
> public static Option[] configuration() {
> Option[] options = options(
> - // 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.blueprint", "org.apache.aries.blueprint"),
> - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart()
> - );
> - options = combine (getSharedOptions(), 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.aries.blueprint", "org.apache.aries.blueprint"),
> + mavenBundle("org.apache.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")
> + );
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java Tue Sep 13 08:52:30 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,16 +128,29 @@ public class TestReferences extends Abst
> @org.ops4j.pax.exam.junit.Configuration
> public static Option[] configuration() {
> Option[] options = options(
> - // 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.blueprint", "org.apache.aries.blueprint"),
> - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample")
> - );
> - options = combine (getSharedOptions(), 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.aries.blueprint", "org.apache.aries.blueprint"),
> + mavenBundle("org.apache.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")
> + );
> options = updateOptions(options);
> return options;
> }
>
> Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java (original)
> +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java Tue Sep 13 08:52:30 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,16 +69,29 @@ public class TestRegistrationListener ex
> @org.ops4j.pax.exam.junit.Configuration
> public static Option[] configuration() {
> Option[] options = options(
> - // this is how you set the default log level when using pax logging (logProfile)
> + // 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"),
> -
> - // 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.aries.blueprint", "org.apache.aries.blueprint"),
> - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample")
> - );
> - options = combine (getSharedOptions(), options);
> + mavenBundle("org.apache.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"));
> options = updateOptions(options);
> return options;
> }
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-sample/
> ('svn:mergeinfo' removed)
>
> Propchange: aries/branches/0.3-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
> ('svn:mergeinfo' removed)
>
> Modified: aries/branches/0.3-RCx/blueprint/pom.xml
> URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/pom.xml?rev=1170091&r1=1170090&r2=1170091&view=diff
> ==============================================================================
> --- aries/branches/0.3-RCx/blueprint/pom.xml (original)
> +++ aries/branches/0.3-RCx/blueprint/pom.xml Tue Sep 13 08:52:30 2011
> @@ -145,25 +145,20 @@
> <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>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.aries.proxy</groupId>
> - <artifactId>org.apache.aries.proxy</artifactId>
> - <version>0.3</version>
> - <scope>test</scope>
> + <groupId>org.apache.aries.proxy</groupId>
> + <artifactId>org.apache.aries.proxy.api</artifactId>
> + <version>0.3</version>
> </dependency>
> <dependency>
> - <groupId>org.apache.commons</groupId>
> - <artifactId>commons-jexl</artifactId>
> - <version>2.0</version>
> + <groupId>org.apache.aries.proxy</groupId>
> + <artifactId>org.apache.aries.proxy</artifactId>
> + <version>0.3</version>
> + <scope>test</scope>
> </dependency>
> </dependencies>
> </dependencyManagement>
>
>
>
Re: svn commit: r1170091 - in /aries/branches/0.3-RCx/blueprint: ./
blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/
blueprint-api/ blueprint-bundle/ blueprint-cm/src/main/java/org/apache/aries/ blueprint-cm/src/main/java/o
Posted by Jeremy Hughes <hu...@apache.org>.
Phew, I'm glad someone is concentrating :-)
On 14 September 2011 04:08, Rex Wang <rw...@gmail.com> wrote:
> 2011/9/13 Jeremy Hughes <hu...@apache.org>
>
>> Hi Rex, thanks for reversing this. I noticed you missed off the
>> 'ARIES-797' from the commit, so I added it in JIRA using:
>>
>
> Thanks, and it is ARIES-727... Just changed it..
>
> -Rex
>
>>
>> svn ps svn:log --revprop -r1170091 "ARIES-797 blueprint 0.3.x is
>> developing in trunk now, so revert the changes in this branch."
>>
>> Thanks,
>> Jeremy
>>
>> On 13 September 2011 09:52, <rw...@apache.org> wrote:
>> > Author: rwonly
>> > Date: Tue Sep 13 08:52:30 2011
>> > New Revision: 1170091
>> >
>> > URL: http://svn.apache.org/viewvc?rev=1170091&view=rev
>> > Log:
>> > blueprint 0.3.x is developing in trunk now, so revert the changes in this
>> branch.
>> >
>> > Added:
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderTest.java
>> > - copied unchanged from r1073243,
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderTest.java
>> > 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-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
>> > aries/branches/0.3-RCx/blueprint/blueprint-api/ (props changed)
>> > aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
>> (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
>> (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
>> (props changed)
>> > aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
>> (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
>> (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java
>> >
>> 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-core/src/main/resources/org/apache/aries/
>> (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
>> (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
>> > aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
>> (props changed)
>> >
>> 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/AbstractMultiBundleTest.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
>> > aries/branches/0.3-RCx/blueprint/blueprint-sample/ (props changed)
>> >
>> aries/branches/0.3-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
>> (props changed)
>> > aries/branches/0.3-RCx/blueprint/pom.xml
>> >
>> > 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=1170091&r1=1170090&r2=1170091&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
>> Tue Sep 13 08:52:30 2011
>> > @@ -24,14 +24,9 @@ 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.FileNotFoundException;
>> > -import java.io.IOException;
>> > -import java.io.InputStream;
>> > +import java.io.*;
>> > +import java.net.URISyntaxException;
>> > import java.net.URL;
>> > import java.text.SimpleDateFormat;
>> > import java.util.ArrayList;
>> > @@ -44,8 +39,11 @@ 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;
>> > @@ -206,28 +204,7 @@ 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:
>> aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
>> Tue Sep 13 08:52:30 2011
>> > @@ -23,12 +23,15 @@ 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;
>> > @@ -36,7 +39,10 @@ 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 {
>> > @@ -77,20 +83,33 @@ public class BlueprintAnnotationTest ext
>> > @org.ops4j.pax.exam.junit.Configuration
>> > public static Option[] configuration() {
>> > Option[] options = options(
>> > - // 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > - mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.annotation.api"),
>> > - mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.annotation.impl"),
>> > - mavenBundle("org.apache.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"),
>> > + // 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.aries.blueprint",
>> "org.apache.aries.blueprint.annotation.api"),
>> > + mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > + mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.annotation.impl"),
>> > + mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.sample-annotation"),
>> > + //mavenBundle("org.apache.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"),
>> >
>> > - );
>> > - options = combine (getSharedOptions(), options);
>> > + equinox().version("3.5.0")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Propchange: aries/branches/0.3-RCx/blueprint/blueprint-api/
>> > ('svn:mergeinfo' removed)
>> >
>> > 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=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > --- aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml (original)
>> > +++ aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml Tue Sep 13
>> 08:52:30 2011
>> > @@ -49,7 +49,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.export>
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
>> > ('svn:mergeinfo' removed)
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > 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=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > --- aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml (original)
>> > +++ aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml Tue Sep 13
>> 08:52:30 2011
>> > @@ -48,7 +48,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.export.service>
>> > @@ -100,22 +99,17 @@
>> > <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>
>> > - </dependency>
>> > -
>> > - <dependency>
>> > - <groupId>org.apache.commons</groupId>
>> > - <artifactId>commons-jexl</artifactId>
>> > + <groupId>org.apache.aries.proxy</groupId>
>> > + <artifactId>org.apache.aries.proxy.api</artifactId>
>> > </dependency>
>> > </dependencies>
>> >
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
>> > ('svn:mergeinfo' removed)
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
>> Tue Sep 13 08:52:30 2011
>> > @@ -52,8 +52,6 @@ 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.
>> > @@ -62,8 +60,6 @@ import org.slf4j.LoggerFactory;
>> > */
>> > public abstract class AbstractPropertyPlaceholder implements
>> ComponentDefinitionRegistryProcessor {
>> >
>> > - private static final Logger LOGGER =
>> LoggerFactory.getLogger(AbstractPropertyPlaceholder.class);
>> > -
>> > private String placeholderPrefix = "${";
>> > private String placeholderSuffix = "}";
>> > private Pattern pattern;
>> > @@ -197,15 +193,11 @@ 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 = retrieveValue(matcher.group(1));
>> > + String rep = getProperty(matcher.group(1));
>> > if (rep != null) {
>> > str = str.replace(matcher.group(0), rep);
>> > matcher.reset(str);
>> > @@ -237,12 +229,8 @@ 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;
>> > }
>> >
>> > 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=1170091&r1=1170090&r2=1170091&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
>> Tue Sep 13 08:52:30 2011
>> > @@ -21,11 +21,9 @@ 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;
>> > @@ -50,8 +48,7 @@ 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;
>> > }
>> > @@ -142,101 +139,4 @@ 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();
>> > - }
>> > - };
>> > - }
>> > }
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > --- aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml (original)
>> > +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml Tue Sep 13
>> 08:52:30 2011
>> > @@ -127,11 +127,6 @@
>> > <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>
>> > @@ -160,6 +155,7 @@
>> > <type>bundle</type>
>> > <scope>compile</scope>
>> > </dependency>
>> > +
>> > </dependencies>
>> >
>> > <build>
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > 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=1170091&r1=1170090&r2=1170091&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
>> Tue Sep 13 08:52:30 2011
>> > @@ -24,14 +24,8 @@ 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.FileNotFoundException;
>> > -import java.io.IOException;
>> > -import java.io.InputStream;
>> > +import java.io.*;
>> > import java.net.URL;
>> > import java.text.SimpleDateFormat;
>> > import java.util.ArrayList;
>> > @@ -46,8 +40,11 @@ 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;
>> > @@ -208,28 +205,7 @@ 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:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
>> Tue Sep 13 08:52:30 2011
>> > @@ -22,6 +22,9 @@ 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;
>> > @@ -32,6 +35,10 @@ 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:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
>> Tue Sep 13 08:52:30 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,6 +31,7 @@ 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,18 +112,31 @@ public class BlueprintContainer2BTCustom
>> > @org.ops4j.pax.exam.junit.Configuration
>> > public static Option[] configuration() {
>> > Option[] options = options(
>> > -
>> > - // 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.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.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);
>> > + // 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.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.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")
>> > + );
>> > +
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
>> Tue Sep 13 08:52:30 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,17 +65,29 @@ 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.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.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"),
>> >
>> > - // 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.blueprint",
>> "org.apache.aries.blueprint.sample").noStart(),
>> > - mavenBundle("org.apache.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);
>> > + equinox().version("3.5.0")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
>> Tue Sep 13 08:52:30 2011
>> > @@ -19,9 +19,11 @@
>> > 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 static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
>> > +import static
>> org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
>> >
>> > import java.io.InputStream;
>> > import java.net.URL;
>> > @@ -31,6 +33,7 @@ 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;
>> > @@ -108,28 +111,39 @@ public class BlueprintContainerBTCustomi
>> > @org.ops4j.pax.exam.junit.Configuration
>> > public static Option[] configuration() {
>> > Option[] options = options(
>> > -
>> > - // 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.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.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);
>> > + // 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.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.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")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
>> Tue Sep 13 08:52:30 2011
>> > @@ -18,19 +18,29 @@
>> > */
>> > 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.util.HashSet;
>> > +import java.text.SimpleDateFormat;
>> > +import java.util.Currency;
>> > import java.util.Hashtable;
>> > +import java.util.HashSet;
>> >
>> > +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;
>> >
>> > @@ -72,18 +82,29 @@ 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > + mavenBundle("org.apache.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"),
>> >
>> > - // 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.blueprint",
>> "org.apache.aries.blueprint"),
>> > - mavenBundle("org.apache.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);
>> > + equinox().version("3.5.0")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
>> Tue Sep 13 08:52:30 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,18 +37,29 @@ 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.blueprint",
>> "org.apache.aries.blueprint"),
>> > - mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.testbundlea").noStart(),
>> > - mavenBundle("org.apache.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);
>> > + // 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > + mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.testbundlea").noStart(),
>> > + mavenBundle("org.apache.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")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > 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=1170091&r1=1170090&r2=1170091&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
>> Tue Sep 13 08:52:30 2011
>> > @@ -17,8 +17,10 @@ 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;
>> >
>> > @@ -36,14 +38,19 @@ 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{
>> > @@ -84,23 +91,38 @@ 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.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.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")
>> > -
>> > - //new VMOption( "-Xdebug
>> -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
>> > - );
>> > -
>> > - options = combine (getSharedOptions(), 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > + 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"),
>> > + //mavenBundle("org.apache.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"));
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
>> Tue Sep 13 08:52:30 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,16 +165,29 @@ public class TestConfigAdmin extends Abs
>> > @org.ops4j.pax.exam.junit.Configuration
>> > public static Option[] configuration() {
>> > Option[] options = options(
>> > - // 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.blueprint",
>> "org.apache.aries.blueprint"),
>> > - mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.sample").noStart()
>> > - );
>> > - options = combine (getSharedOptions(), 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > + mavenBundle("org.apache.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")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
>> Tue Sep 13 08:52:30 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,16 +128,29 @@ public class TestReferences extends Abst
>> > @org.ops4j.pax.exam.junit.Configuration
>> > public static Option[] configuration() {
>> > Option[] options = options(
>> > - // 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.blueprint",
>> "org.apache.aries.blueprint"),
>> > - mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.sample")
>> > - );
>> > - options = combine (getSharedOptions(), 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > + mavenBundle("org.apache.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")
>> > + );
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Modified:
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > ---
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
>> (original)
>> > +++
>> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
>> Tue Sep 13 08:52:30 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,16 +69,29 @@ public class TestRegistrationListener ex
>> > @org.ops4j.pax.exam.junit.Configuration
>> > public static Option[] configuration() {
>> > Option[] options = options(
>> > - // this is how you set the default log level when using
>> pax logging (logProfile)
>> > + // 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"),
>> > -
>> > - //
>> 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.aries.blueprint",
>> "org.apache.aries.blueprint"),
>> > - mavenBundle("org.apache.aries.blueprint",
>> "org.apache.aries.blueprint.sample")
>> > - );
>> > - options = combine (getSharedOptions(), options);
>> > + mavenBundle("org.apache.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"));
>> > options = updateOptions(options);
>> > return options;
>> > }
>> >
>> > Propchange: aries/branches/0.3-RCx/blueprint/blueprint-sample/
>> > ('svn:mergeinfo' removed)
>> >
>> > Propchange:
>> aries/branches/0.3-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
>> > ('svn:mergeinfo' removed)
>> >
>> > Modified: aries/branches/0.3-RCx/blueprint/pom.xml
>> > URL:
>> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/pom.xml?rev=1170091&r1=1170090&r2=1170091&view=diff
>> >
>> ==============================================================================
>> > --- aries/branches/0.3-RCx/blueprint/pom.xml (original)
>> > +++ aries/branches/0.3-RCx/blueprint/pom.xml Tue Sep 13 08:52:30 2011
>> > @@ -145,25 +145,20 @@
>> > <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>
>> > - </dependency>
>> > - <dependency>
>> > - <groupId>org.apache.aries.proxy</groupId>
>> > - <artifactId>org.apache.aries.proxy</artifactId>
>> > - <version>0.3</version>
>> > - <scope>test</scope>
>> > + <groupId>org.apache.aries.proxy</groupId>
>> > + <artifactId>org.apache.aries.proxy.api</artifactId>
>> > + <version>0.3</version>
>> > </dependency>
>> > <dependency>
>> > - <groupId>org.apache.commons</groupId>
>> > - <artifactId>commons-jexl</artifactId>
>> > - <version>2.0</version>
>> > + <groupId>org.apache.aries.proxy</groupId>
>> > + <artifactId>org.apache.aries.proxy</artifactId>
>> > + <version>0.3</version>
>> > + <scope>test</scope>
>> > </dependency>
>> > </dependencies>
>> > </dependencyManagement>
>> >
>> >
>> >
>>
>
>
>
> --
> Lei Wang (Rex)
> rwonly AT apache.org
>
Re: svn commit: r1170091 - in /aries/branches/0.3-RCx/blueprint: ./
blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/
blueprint-api/ blueprint-bundle/ blueprint-cm/src/main/java/org/apache/aries/ blueprint-cm/src/main/java/o
Posted by Rex Wang <rw...@gmail.com>.
2011/9/13 Jeremy Hughes <hu...@apache.org>
> Hi Rex, thanks for reversing this. I noticed you missed off the
> 'ARIES-797' from the commit, so I added it in JIRA using:
>
Thanks, and it is ARIES-727... Just changed it..
-Rex
>
> svn ps svn:log --revprop -r1170091 "ARIES-797 blueprint 0.3.x is
> developing in trunk now, so revert the changes in this branch."
>
> Thanks,
> Jeremy
>
> On 13 September 2011 09:52, <rw...@apache.org> wrote:
> > Author: rwonly
> > Date: Tue Sep 13 08:52:30 2011
> > New Revision: 1170091
> >
> > URL: http://svn.apache.org/viewvc?rev=1170091&view=rev
> > Log:
> > blueprint 0.3.x is developing in trunk now, so revert the changes in this
> branch.
> >
> > Added:
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderTest.java
> > - copied unchanged from r1073243,
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholderTest.java
> > 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-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
> > aries/branches/0.3-RCx/blueprint/blueprint-api/ (props changed)
> > aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml
> >
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
> (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
> (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
> (props changed)
> > aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
> (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
> (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/JexlExpressionParser.java
> >
> 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-core/src/main/resources/org/apache/aries/
> (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
> (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/ext/PropertyPlaceholderTest.java
> > aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
> (props changed)
> >
> 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/AbstractMultiBundleTest.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
> >
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
> > aries/branches/0.3-RCx/blueprint/blueprint-sample/ (props changed)
> >
> aries/branches/0.3-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
> (props changed)
> > aries/branches/0.3-RCx/blueprint/pom.xml
> >
> > 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=1170091&r1=1170090&r2=1170091&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
> Tue Sep 13 08:52:30 2011
> > @@ -24,14 +24,9 @@ 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.FileNotFoundException;
> > -import java.io.IOException;
> > -import java.io.InputStream;
> > +import java.io.*;
> > +import java.net.URISyntaxException;
> > import java.net.URL;
> > import java.text.SimpleDateFormat;
> > import java.util.ArrayList;
> > @@ -44,8 +39,11 @@ 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;
> > @@ -206,28 +204,7 @@ 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:
> aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
> Tue Sep 13 08:52:30 2011
> > @@ -23,12 +23,15 @@ 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;
> > @@ -36,7 +39,10 @@ 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 {
> > @@ -77,20 +83,33 @@ public class BlueprintAnnotationTest ext
> > @org.ops4j.pax.exam.junit.Configuration
> > public static Option[] configuration() {
> > Option[] options = options(
> > - // 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > - mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.annotation.api"),
> > - mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.annotation.impl"),
> > - mavenBundle("org.apache.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"),
> > + // 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.aries.blueprint",
> "org.apache.aries.blueprint.annotation.api"),
> > + mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint"),
> > + mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.annotation.impl"),
> > + mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.sample-annotation"),
> > + //mavenBundle("org.apache.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"),
> >
> > - );
> > - options = combine (getSharedOptions(), options);
> > + equinox().version("3.5.0")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Propchange: aries/branches/0.3-RCx/blueprint/blueprint-api/
> > ('svn:mergeinfo' removed)
> >
> > 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=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > --- aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml (original)
> > +++ aries/branches/0.3-RCx/blueprint/blueprint-bundle/pom.xml Tue Sep 13
> 08:52:30 2011
> > @@ -49,7 +49,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.export>
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
> > ('svn:mergeinfo' removed)
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > 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=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > --- aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml (original)
> > +++ aries/branches/0.3-RCx/blueprint/blueprint-core/pom.xml Tue Sep 13
> 08:52:30 2011
> > @@ -48,7 +48,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.export.service>
> > @@ -100,22 +99,17 @@
> > <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>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.commons</groupId>
> > - <artifactId>commons-jexl</artifactId>
> > + <groupId>org.apache.aries.proxy</groupId>
> > + <artifactId>org.apache.aries.proxy.api</artifactId>
> > </dependency>
> > </dependencies>
> >
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
> > ('svn:mergeinfo' removed)
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/AbstractPropertyPlaceholder.java
> Tue Sep 13 08:52:30 2011
> > @@ -52,8 +52,6 @@ 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.
> > @@ -62,8 +60,6 @@ import org.slf4j.LoggerFactory;
> > */
> > public abstract class AbstractPropertyPlaceholder implements
> ComponentDefinitionRegistryProcessor {
> >
> > - private static final Logger LOGGER =
> LoggerFactory.getLogger(AbstractPropertyPlaceholder.class);
> > -
> > private String placeholderPrefix = "${";
> > private String placeholderSuffix = "}";
> > private Pattern pattern;
> > @@ -197,15 +193,11 @@ 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 = retrieveValue(matcher.group(1));
> > + String rep = getProperty(matcher.group(1));
> > if (rep != null) {
> > str = str.replace(matcher.group(0), rep);
> > matcher.reset(str);
> > @@ -237,12 +229,8 @@ 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;
> > }
> >
> > 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=1170091&r1=1170090&r2=1170091&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
> Tue Sep 13 08:52:30 2011
> > @@ -21,11 +21,9 @@ 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;
> > @@ -50,8 +48,7 @@ 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;
> > }
> > @@ -142,101 +139,4 @@ 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();
> > - }
> > - };
> > - }
> > }
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > Modified: aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > --- aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml (original)
> > +++ aries/branches/0.3-RCx/blueprint/blueprint-itests/pom.xml Tue Sep 13
> 08:52:30 2011
> > @@ -127,11 +127,6 @@
> > <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>
> > @@ -160,6 +155,7 @@
> > <type>bundle</type>
> > <scope>compile</scope>
> > </dependency>
> > +
> > </dependencies>
> >
> > <build>
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > 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=1170091&r1=1170090&r2=1170091&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
> Tue Sep 13 08:52:30 2011
> > @@ -24,14 +24,8 @@ 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.FileNotFoundException;
> > -import java.io.IOException;
> > -import java.io.InputStream;
> > +import java.io.*;
> > import java.net.URL;
> > import java.text.SimpleDateFormat;
> > import java.util.ArrayList;
> > @@ -46,8 +40,11 @@ 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;
> > @@ -208,28 +205,7 @@ 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:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
> Tue Sep 13 08:52:30 2011
> > @@ -22,6 +22,9 @@ 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;
> > @@ -32,6 +35,10 @@ 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:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
> Tue Sep 13 08:52:30 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,6 +31,7 @@ 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,18 +112,31 @@ public class BlueprintContainer2BTCustom
> > @org.ops4j.pax.exam.junit.Configuration
> > public static Option[] configuration() {
> > Option[] options = options(
> > -
> > - // 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.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.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);
> > + // 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.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.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")
> > + );
> > +
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
> Tue Sep 13 08:52:30 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,17 +65,29 @@ 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.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.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"),
> >
> > - // 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.blueprint",
> "org.apache.aries.blueprint.sample").noStart(),
> > - mavenBundle("org.apache.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);
> > + equinox().version("3.5.0")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
> Tue Sep 13 08:52:30 2011
> > @@ -19,9 +19,11 @@
> > 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 static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
> > +import static
> org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
> >
> > import java.io.InputStream;
> > import java.net.URL;
> > @@ -31,6 +33,7 @@ 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;
> > @@ -108,28 +111,39 @@ public class BlueprintContainerBTCustomi
> > @org.ops4j.pax.exam.junit.Configuration
> > public static Option[] configuration() {
> > Option[] options = options(
> > -
> > - // 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.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.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);
> > + // 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.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.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")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
> Tue Sep 13 08:52:30 2011
> > @@ -18,19 +18,29 @@
> > */
> > 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.util.HashSet;
> > +import java.text.SimpleDateFormat;
> > +import java.util.Currency;
> > import java.util.Hashtable;
> > +import java.util.HashSet;
> >
> > +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;
> >
> > @@ -72,18 +82,29 @@ 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > + mavenBundle("org.apache.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"),
> >
> > - // 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.blueprint",
> "org.apache.aries.blueprint"),
> > - mavenBundle("org.apache.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);
> > + equinox().version("3.5.0")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
> Tue Sep 13 08:52:30 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,18 +37,29 @@ 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.blueprint",
> "org.apache.aries.blueprint"),
> > - mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.testbundlea").noStart(),
> > - mavenBundle("org.apache.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);
> > + // 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > + mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.testbundlea").noStart(),
> > + mavenBundle("org.apache.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")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > 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=1170091&r1=1170090&r2=1170091&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
> Tue Sep 13 08:52:30 2011
> > @@ -17,8 +17,10 @@ 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;
> >
> > @@ -36,14 +38,19 @@ 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{
> > @@ -84,23 +91,38 @@ 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.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.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")
> > -
> > - //new VMOption( "-Xdebug
> -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
> > - );
> > -
> > - options = combine (getSharedOptions(), 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > + 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"),
> > + //mavenBundle("org.apache.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"));
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
> Tue Sep 13 08:52:30 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,16 +165,29 @@ public class TestConfigAdmin extends Abs
> > @org.ops4j.pax.exam.junit.Configuration
> > public static Option[] configuration() {
> > Option[] options = options(
> > - // 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.blueprint",
> "org.apache.aries.blueprint"),
> > - mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.sample").noStart()
> > - );
> > - options = combine (getSharedOptions(), 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > + mavenBundle("org.apache.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")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
> Tue Sep 13 08:52:30 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,16 +128,29 @@ public class TestReferences extends Abst
> > @org.ops4j.pax.exam.junit.Configuration
> > public static Option[] configuration() {
> > Option[] options = options(
> > - // 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.blueprint",
> "org.apache.aries.blueprint"),
> > - mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.sample")
> > - );
> > - options = combine (getSharedOptions(), 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > + mavenBundle("org.apache.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")
> > + );
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Modified:
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > ---
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
> (original)
> > +++
> aries/branches/0.3-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
> Tue Sep 13 08:52:30 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,16 +69,29 @@ public class TestRegistrationListener ex
> > @org.ops4j.pax.exam.junit.Configuration
> > public static Option[] configuration() {
> > Option[] options = options(
> > - // this is how you set the default log level when using
> pax logging (logProfile)
> > + // 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"),
> > -
> > - //
> 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.aries.blueprint",
> "org.apache.aries.blueprint"),
> > - mavenBundle("org.apache.aries.blueprint",
> "org.apache.aries.blueprint.sample")
> > - );
> > - options = combine (getSharedOptions(), options);
> > + mavenBundle("org.apache.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"));
> > options = updateOptions(options);
> > return options;
> > }
> >
> > Propchange: aries/branches/0.3-RCx/blueprint/blueprint-sample/
> > ('svn:mergeinfo' removed)
> >
> > Propchange:
> aries/branches/0.3-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
> > ('svn:mergeinfo' removed)
> >
> > Modified: aries/branches/0.3-RCx/blueprint/pom.xml
> > URL:
> http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/pom.xml?rev=1170091&r1=1170090&r2=1170091&view=diff
> >
> ==============================================================================
> > --- aries/branches/0.3-RCx/blueprint/pom.xml (original)
> > +++ aries/branches/0.3-RCx/blueprint/pom.xml Tue Sep 13 08:52:30 2011
> > @@ -145,25 +145,20 @@
> > <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>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.aries.proxy</groupId>
> > - <artifactId>org.apache.aries.proxy</artifactId>
> > - <version>0.3</version>
> > - <scope>test</scope>
> > + <groupId>org.apache.aries.proxy</groupId>
> > + <artifactId>org.apache.aries.proxy.api</artifactId>
> > + <version>0.3</version>
> > </dependency>
> > <dependency>
> > - <groupId>org.apache.commons</groupId>
> > - <artifactId>commons-jexl</artifactId>
> > - <version>2.0</version>
> > + <groupId>org.apache.aries.proxy</groupId>
> > + <artifactId>org.apache.aries.proxy</artifactId>
> > + <version>0.3</version>
> > + <scope>test</scope>
> > </dependency>
> > </dependencies>
> > </dependencyManagement>
> >
> >
> >
>
--
Lei Wang (Rex)
rwonly AT apache.org