aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1606837 [8/27] - in /aries/branches/subsystemsR6: ./ application/ application/application-api/ application/application-bundle/ application/application-converters/ application/application-default-local-platform/ application/application-depl...
Date Mon, 30 Jun 2014 16:55:06 GMT
Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java Mon Jun 30 16:54:57 2014
@@ -18,6 +18,16 @@
  */
 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.composite;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Currency;
 
@@ -26,21 +36,14 @@ import org.apache.aries.blueprint.sample
 import org.apache.aries.blueprint.sample.Bar;
 import org.apache.aries.blueprint.sample.Foo;
 import org.apache.aries.itest.RichBundleContext;
-
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.osgi.framework.Bundle;
 import org.osgi.service.blueprint.container.BlueprintContainer;
-import static org.apache.aries.itest.ExtraOptions.*;
-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.waitForFrameworkStartup; 
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 public class Helper {
+    private static final String SAMPLE_SYM_NAME = "org.apache.aries.blueprint.sample";
+
     public static BlueprintContainer getBlueprintContainerForBundle(RichBundleContext context, String symbolicName) {
         return context.getService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=" + symbolicName + ")");
     }
@@ -49,85 +52,72 @@ public class Helper {
         return context.getService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=" + symbolicName + ")", timeout);
     }
     
-    public static Option[] blueprintBundles() {
+    public static Option blueprintBundles() {
         return blueprintBundles(true);
     }
     
-    public static Option[] debug(int port) {
-      return flatOptions(vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + port),waitForFrameworkStartup());
+    public static Option debug(int port) {
+      return CoreOptions.vmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=" + port);
     }
     
-    public static Option[] blueprintBundles(boolean startBlueprint) {
-        return flatOptions(
-                bundles(
-                    // Felix Config Admin
-                    "org.apache.felix/org.apache.felix.configadmin",
-                    // Felix mvn url handler
-                    "org.ops4j.pax.url/pax-url-mvn",
-                    
-                    "org.apache.aries/org.apache.aries.util",
-                    "org.apache.aries.proxy/org.apache.aries.proxy",
-                   
-                    "org.apache.commons/commons-jexl",
-                    "org.osgi/org.osgi.compendium"),
-                    mavenBundle("org.ow2.asm", "asm-all"),
-                    mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),
-                    
-                ((startBlueprint) ? mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint") :
-                    mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").noStart())
+    public static Option blueprintBundles(boolean startBlueprint) {
+        return composite(
+                mvnBundle("org.ow2.asm", "asm-debug-all"),
+                mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
+                mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
+                mvnBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
+                mvnBundle("org.apache.aries", "org.apache.aries.util"),
+                mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+                mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
+                mvnBundle("org.apache.commons", "commons-jexl"),
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),
+                mvnBundle("org.apache.xbean", "xbean-asm4-shaded"),
+                mvnBundle("org.apache.xbean", "xbean-bundleutils"),
+                mvnBundle("org.apache.xbean", "xbean-finder-shaded"),
+                mvnBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api", startBlueprint),
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api", startBlueprint),
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core", startBlueprint),
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.cm", startBlueprint),
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.annotation.api", startBlueprint),
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.annotation.impl", startBlueprint)
         );
     }
-    
+
+    public static Option mvnBundle(String groupId, String artifactId) {
+        return mavenBundle(groupId, artifactId).versionAsInProject();
+    }
+
+    public static Option mvnBundle(String groupId, String artifactId, boolean start) {
+        return mavenBundle(groupId, artifactId).versionAsInProject().start(start);
+    }
+
     public static void testBlueprintContainer(RichBundleContext context, Bundle bundle) throws Exception {
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle(context, "org.apache.aries.blueprint.sample");
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle(context, SAMPLE_SYM_NAME);
         assertNotNull(blueprintContainer);
 
-        Object obj = blueprintContainer.getComponentInstance("bar");
-        assertNotNull(obj);
-        assertEquals(Bar.class, obj.getClass());
-        Bar bar = (Bar) obj;
-        assertNotNull(bar.getContext());
-        assertEquals("Hello FooBar", bar.getValue());
-        assertNotNull(bar.getList());
-        assertEquals(2, bar.getList().size());
-        assertEquals("a list element", bar.getList().get(0));
-        assertEquals(Integer.valueOf(5), bar.getList().get(1));
-        obj = blueprintContainer.getComponentInstance("foo");
-        assertNotNull(obj);
-        assertEquals(Foo.class, obj.getClass());
-        Foo foo = (Foo) obj;
-        assertEquals(5, foo.getA());
-        assertEquals(10, foo.getB());
-        assertSame(bar, foo.getBar());
-        assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
-        assertEquals(new SimpleDateFormat("yyyy.MM.dd").parse("2009.04.17"),
-                foo.getDate());
-
-        assertTrue(foo.isInitialized());
-        assertFalse(foo.isDestroyed());
+        Bar bar = getInstance(blueprintContainer, "bar", Bar.class);
+        checkBar(bar);
+        
+        Foo foo = getInstance(blueprintContainer, "foo", Foo.class);
+        checkFoo(bar, foo);
 
-        obj = context.getService(Foo.class);
-        assertNotNull(obj);
-        assertEquals(obj, foo);
+        Foo fooService = context.getService(Foo.class);
+        assertNotNull(fooService);
+        checkFoo(bar, fooService);
         
-        obj = blueprintContainer.getComponentInstance("accountOne");
-        assertNotNull(obj);
-        Account account = (Account)obj;
+        // TODO Does not work
+        //assertEquals(obj, foo);
+        
+        Account account = getInstance(blueprintContainer, "accountOne", Account.class);
         assertEquals(1, account.getAccountNumber());
      
-        obj = blueprintContainer.getComponentInstance("accountTwo");
-        assertNotNull(obj);
-        account = (Account)obj;
-        assertEquals(2, account.getAccountNumber());
+        Account account2 = getInstance(blueprintContainer, "accountTwo", Account.class);
+        assertEquals(2, account2.getAccountNumber());
         
-        obj = blueprintContainer.getComponentInstance("accountThree");
-        assertNotNull(obj);
-        account = (Account)obj;
-        assertEquals(3, account.getAccountNumber());
+        Account account3 = getInstance(blueprintContainer, "accountThree", Account.class);
+        assertEquals(3, account3.getAccountNumber());
         
-        obj = blueprintContainer.getComponentInstance("accountFactory");
-        assertNotNull(obj);
-        AccountFactory accountFactory = (AccountFactory)obj;
+        AccountFactory accountFactory = getInstance(blueprintContainer, "accountFactory", AccountFactory.class);
         assertEquals("account factory", accountFactory.getFactoryName());
         
         bundle.stop();
@@ -135,7 +125,7 @@ public class Helper {
         Thread.sleep(1000);
 
         try {
-            blueprintContainer = getBlueprintContainerForBundle(context, "org.apache.aries.blueprint.sample", 1);
+            blueprintContainer = getBlueprintContainerForBundle(context, SAMPLE_SYM_NAME, 1);
             fail("BlueprintContainer should have been unregistered");
         } catch (Exception e) {
             // Expected, as the module container should have been unregistered
@@ -144,4 +134,34 @@ public class Helper {
         assertTrue(foo.isInitialized());
         assertTrue(foo.isDestroyed());
     }
+
+    private static void checkBar(Bar bar) {
+        assertNotNull(bar.getContext());
+        assertEquals("Hello FooBar", bar.getValue());
+        assertNotNull(bar.getList());
+        assertEquals(2, bar.getList().size());
+        assertEquals("a list element", bar.getList().get(0));
+        assertEquals(Integer.valueOf(5), bar.getList().get(1));
+    }
+
+    private static void checkFoo(Bar bar, Foo foo) throws ParseException {
+        assertEquals(5, foo.getA());
+        assertEquals(10, foo.getB());
+        assertSame(bar, foo.getBar());
+        assertEquals(Currency.getInstance("PLN"), foo.getCurrency());
+        assertEquals(new SimpleDateFormat("yyyy.MM.dd").parse("2009.04.17"),
+                foo.getDate());
+
+        assertTrue(foo.isInitialized());
+        assertFalse(foo.isDestroyed());
+    }
+    
+    @SuppressWarnings("unchecked")
+    private static <T>T getInstance(BlueprintContainer container, String name, Class<T> clazz) {
+        Object obj = container.getComponentInstance(name);
+        assertNotNull(obj);
+        assertEquals(clazz, obj.getClass());
+        return (T) obj;
+    }
+
 }

Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java Mon Jun 30 16:54:57 2014
@@ -15,8 +15,10 @@
  */
 package org.apache.aries.blueprint.itests;
 
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
 import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -25,24 +27,25 @@ import java.util.Arrays;
 import junit.framework.Assert;
 
 import org.apache.aries.blueprint.testquiescebundle.TestBean;
-import org.apache.aries.itest.AbstractIntegrationTest;
 import org.apache.aries.quiesce.manager.QuiesceCallback;
 import org.apache.aries.quiesce.participant.QuiesceParticipant;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.options.BootDelegationOption;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
-import static org.apache.aries.itest.ExtraOptions.*;
 
-@RunWith(JUnit4TestRunner.class)
-public class QuiesceBlueprintTest extends AbstractIntegrationTest {
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class QuiesceBlueprintTest extends AbstractBlueprintIntegrationTest {
 
   private static class TestQuiesceCallback implements QuiesceCallback
   {
@@ -58,7 +61,8 @@ public class QuiesceBlueprintTest extend
   	}
   }
   
-  private QuiesceParticipant getParticipant(String bundleName) throws InvalidSyntaxException {
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+private QuiesceParticipant getParticipant(String bundleName) throws InvalidSyntaxException {
     ServiceReference[] refs = bundleContext.getServiceReferences(QuiesceParticipant.class.getName(), null);
     
     if(refs != null) {
@@ -73,19 +77,19 @@ public class QuiesceBlueprintTest extend
     return null;
   }
 
-  @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] configuration() {
-    return testOptions(
-            paxLogging("DEBUG"),
-            transactionBootDelegation(),
+  @Configuration
+  public Option[] configuration() {
+    return new Option[] {
+            baseOptions(),
+            bootDelegationPackages("javax.transaction", "javax.transaction.*"),
+            CoreOptions.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.c
 allback,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.Portable
 Server.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"),
             Helper.blueprintBundles(),
-        
-            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"),
 
-            equinox().version("3.5.0"));
+            mvnBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
+            mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundlea", false),
+            mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundleb", false),
+            mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testquiescebundle")
+    };
   }
   
   
@@ -111,12 +115,6 @@ public class QuiesceBlueprintTest extend
     return new BootDelegationOption("org.apache.aries.unittest.fixture");
   }
   
-  public static MavenArtifactProvisionOption mavenBundle(String groupId,
-      String artifactId) {
-    return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId)
-        .versionAsInProject();
-  }
-
   @Test
   public void testBasicQuieseEmptyCounter() throws Exception 
   {
@@ -129,7 +127,7 @@ public class QuiesceBlueprintTest extend
 	
 	if (obj != null)
 	{
-	  QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint");
+	  QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint.core");
 	  
 	  if (participant != null)
 	  {
@@ -188,7 +186,7 @@ public class QuiesceBlueprintTest extend
 	
 	if (obj != null)
 	{    
-		QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint");
+		QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint.core");
 		
 		if (participant != null)
 		{
@@ -249,7 +247,7 @@ public class QuiesceBlueprintTest extend
 	
 	if (obj != null)
 	{    
-		QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint");
+		QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint.core");
 		
 		if (participant != null)
 		{
@@ -306,7 +304,7 @@ public class QuiesceBlueprintTest extend
 	
 	if (obj != null)
 	{    
-		QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint");
+		QuiesceParticipant participant = getParticipant("org.apache.aries.blueprint.core");
 		
 		if (participant != null)
 		{

Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Mon Jun 30 16:54:57 2014
@@ -22,26 +22,26 @@ import java.util.Currency;
 import java.util.Hashtable;
 
 import org.apache.aries.blueprint.sample.Foo;
-import org.apache.aries.itest.AbstractIntegrationTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 
-import static org.apache.aries.itest.ExtraOptions.mavenBundle;
-import static org.apache.aries.itest.ExtraOptions.paxLogging;
-import static org.apache.aries.itest.ExtraOptions.testOptions;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
 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.junitBundles;
 
-@RunWith(JUnit4TestRunner.class)
-public class TestConfigAdmin extends AbstractIntegrationTest {
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
+public class TestConfigAdmin extends AbstractBlueprintIntegrationTest {
 
     @Test
     public void testStrategyNone() throws Exception {
@@ -118,6 +118,8 @@ public class TestConfigAdmin extends Abs
         props.put("a", "5");
         props.put("currency", "PLN");
         cf.update(props);
+        
+        Thread.sleep(2000);
 
         Bundle bundle = context().getBundleByName("org.apache.aries.blueprint.sample");
         assertNotNull(bundle);
@@ -146,6 +148,7 @@ public class TestConfigAdmin extends Abs
         assertEquals("USD", foo.getProps().get("currency"));
     }
 
+    @SuppressWarnings("rawtypes")
     @Test
     public void testManagedServiceFactory() throws Exception {
 
@@ -176,15 +179,13 @@ public class TestConfigAdmin extends Abs
 
     }
 
-    @org.ops4j.pax.exam.junit.Configuration
+    @org.ops4j.pax.exam.Configuration
     public static Option[] configuration() {
-        return testOptions(
+        return new Option[] {
+            junitBundles(),
             Helper.blueprintBundles(),
-            paxLogging("DEBUG"),
-            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
-
-            equinox().version("3.5.0")
-        );
+            mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample", false)
+        };
     }
 
 }

Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java Mon Jun 30 16:54:57 2014
@@ -18,37 +18,39 @@
  */
 package org.apache.aries.blueprint.itests;
 
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 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 java.util.Hashtable;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import junit.framework.Assert;
 
 import org.apache.aries.blueprint.sample.BindingListener;
 import org.apache.aries.blueprint.sample.DefaultRunnable;
 import org.apache.aries.blueprint.sample.DestroyTest;
 import org.apache.aries.blueprint.sample.InterfaceA;
-import org.apache.aries.itest.AbstractIntegrationTest;
-import org.apache.aries.unittest.mocks.MethodCall;
-import org.apache.aries.unittest.mocks.Skeleton;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.container.ServiceUnavailableException;
 
-import static org.apache.aries.itest.ExtraOptions.*;
-
-@RunWith(JUnit4TestRunner.class)
-public class TestReferences extends AbstractIntegrationTest {
+@RunWith(PaxExam.class)
+public class TestReferences extends AbstractBlueprintIntegrationTest {
 
+    @SuppressWarnings("rawtypes")
     @Test
     public void testUnaryReference() throws Exception {
         BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
@@ -77,7 +79,7 @@ public class TestReferences extends Abst
         assertNotNull(listener.getReference());
         assertEquals("Hello world!", a.hello("world"));
 
-        Hashtable props = new Hashtable();
+        Hashtable<String, Object> props = new Hashtable<String, Object>();
         props.put(Constants.SERVICE_RANKING, Integer.valueOf(1));
         ServiceRegistration reg2 = bundleContext.registerService(InterfaceA.class.getName(), new InterfaceA() {
             public String hello(String msg) {
@@ -119,15 +121,16 @@ public class TestReferences extends Abst
         assertNull(listener.getA());
         assertNull(listener.getReference());
 
-        List refs = (List) blueprintContainer.getComponentInstance("ref-list");
+        List<?> refs = (List<?>) blueprintContainer.getComponentInstance("ref-list");
         assertNotNull(refs);
         assertTrue(refs.isEmpty());
 
-        ServiceRegistration reg1 = bundleContext.registerService(InterfaceA.class.getName(), new InterfaceA() {
+        InterfaceA testService = new InterfaceA() {
             public String hello(String msg) {
                 return "Hello " + msg + "!";
             }
-        }, null);
+        };
+        bundleContext.registerService(InterfaceA.class.getName(), testService, null);
     
         waitForAsynchronousHandling();
         assertNotNull(listener.getA());
@@ -139,6 +142,7 @@ public class TestReferences extends Abst
 
     }
     
+    @SuppressWarnings("rawtypes")
     @Test
     public void testDefaultReference() throws Exception {
       BlueprintContainer blueprintContainer = Helper.getBlueprintContainerForBundle(context(), "org.apache.aries.blueprint.sample");
@@ -152,7 +156,12 @@ public class TestReferences extends Abst
       
       assertEquals("The default runnable was not called", 1, defaultRunnable.getCount());
       
-      Runnable mockService = Skeleton.newMock(Runnable.class);
+      final AtomicBoolean called = new AtomicBoolean(false);
+      Runnable mockService = new Runnable() {
+        public void run() {
+            called.set(true);
+        }
+      };
       
       ServiceRegistration reg = bundleContext.registerService(Runnable.class.getName(), mockService, null);
       waitForAsynchronousHandling();
@@ -162,7 +171,7 @@ public class TestReferences extends Abst
       
       assertEquals("The default runnable was called when a service was bound", 1, defaultRunnable.getCount());
       
-      Skeleton.getSkeleton(mockService).assertCalled(new MethodCall(Runnable.class, "run"));
+      Assert.assertTrue("Service should have been called", called.get());
       
       reg.unregister();
       waitForAsynchronousHandling();
@@ -208,15 +217,13 @@ public class TestReferences extends Abst
       
    }
 
-   @org.ops4j.pax.exam.junit.Configuration
+   @Configuration
     public static Option[] configuration() {
-        return testOptions(
-                paxLogging("INFO"),
-                equinox().version("3.5.0"),
+        return new Option[] {
+                CoreOptions.junitBundles(),
                 Helper.blueprintBundles(),
-                
-                bundles("org.apache.aries.blueprint/org.apache.aries.blueprint.sample")
-        );
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample")
+        };
     }
 
 }

Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java Mon Jun 30 16:54:57 2014
@@ -18,26 +18,25 @@
  */
 package org.apache.aries.blueprint.itests;
 
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
 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 java.util.Map;
 
 import org.apache.aries.blueprint.BlueprintConstants;
 import org.apache.aries.blueprint.sample.Foo;
 import org.apache.aries.blueprint.sample.FooRegistrationListener;
-import org.apache.aries.itest.AbstractIntegrationTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 
-import static org.apache.aries.itest.ExtraOptions.*;
-
-@RunWith(JUnit4TestRunner.class)
-public class TestRegistrationListener extends AbstractIntegrationTest {
+@RunWith(PaxExam.class)
+public class TestRegistrationListener extends AbstractBlueprintIntegrationTest {
 
     @Test
     public void testWithAutoExportEnabled() throws Exception {
@@ -57,7 +56,7 @@ public class TestRegistrationListener ex
         // have already been called and properties that were passed to this
         // method should have been not null
 
-        Map props = listener.getProperties();
+        Map<?, ?> props = listener.getProperties();
         assertNotNull(props);
 
         assertTrue(props.containsKey(BlueprintConstants.COMPONENT_NAME_PROPERTY));
@@ -68,14 +67,13 @@ public class TestRegistrationListener ex
 
     }
     
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-        return testOptions(
-                equinox().version("3.5.0"),
-                paxLogging("INFO"),
+    @Configuration
+    public Option[] configuration() {
+        return new Option[] {
+                baseOptions(),
                 Helper.blueprintBundles(),
-                
-                bundles("org.apache.aries.blueprint/org.apache.aries.blueprint.sample"));
+                mvnBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample")
+        };
     }
 
 }

Modified: aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/resources/log4j.properties?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/resources/log4j.properties (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-itests/src/test/resources/log4j.properties Mon Jun 30 16:54:57 2014
@@ -18,7 +18,7 @@
 ################################################################################
 
 # Root logger
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=INFO, stdout
 
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -29,5 +29,5 @@ log4j.appender.stdout.layout.ConversionP
 log4j.appender.out=org.apache.log4j.FileAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
 log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-log4j.appender.out.file=${karaf.base}/data/log/karaf.log
+log4j.appender.out.file=target/log/karaf.log
 log4j.appender.out.append=true

Modified: aries/branches/subsystemsR6/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-jexl-evaluator/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +18,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -39,8 +42,8 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-jexl-evaluator</developerConnection>
         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator</url>
     </scm>
-    <properties>
 
+    <properties>
         <!-- Export package versions are maintained in packageinfo files -->
         <aries.osgi.export.pkg />
         <aries.osgi.import>
@@ -52,8 +55,8 @@
         <aries.osgi.private.pkg>
             org.apache.aries.blueprint.jexl.evaluator
         </aries.osgi.private.pkg>
-
         <blueprint.core.version>1.0.0</blueprint.core.version>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -88,12 +91,12 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -101,9 +104,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.jexl.evaluator:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-noosgi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-noosgi/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-noosgi/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-noosgi/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +18,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -44,7 +47,7 @@
         <blueprint.api.version>1.0.0</blueprint.api.version>
         <blueprint.core.version>1.0.0</blueprint.core.version>
         <blueprint.parser.version>1.0.0</blueprint.parser.version>
-        <proxy.impl.version>1.0.0</proxy.impl.version>
+        <proxy.impl.version>1.0.3-SNAPSHOT</proxy.impl.version>
     </properties>
 
     <profiles>
@@ -106,22 +109,22 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.11</version>
+            <version>1.7.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.5.11</version>
+            <version>1.7.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,19 +18,21 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>blueprint-parser</artifactId>
     <packaging>jar</packaging>
     <name>Apache Aries Blueprint Parser</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <description>
         This bundle contains the blueprint parser in a plain jar.
     </description>
@@ -42,6 +45,7 @@
 
     <properties>
         <blueprint.api.version>1.0.0</blueprint.api.version>
+        <lastReleaseVersion>1.2.0</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -66,12 +70,12 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -79,9 +83,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:blueprint-parser:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java Mon Jun 30 16:54:57 2014
@@ -27,4 +27,6 @@ public interface ExtendedReferenceMetada
     public String getDefaultBean();
     
     public Collection<Class<?>> getProxyChildBeanClasses();
+    
+    public Collection<String> getExtraInterfaces();
 }
\ No newline at end of file

Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableReferenceMetadata.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableReferenceMetadata.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableReferenceMetadata.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableReferenceMetadata.java Mon Jun 30 16:54:57 2014
@@ -35,4 +35,5 @@ public interface MutableReferenceMetadat
     
     void setProxyChildBeanClasses(Collection<Class<?>> classes);
 
+    void setExtraInterfaces(Collection<String> interfaces);
 }
\ No newline at end of file

Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/packageinfo
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/packageinfo?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/packageinfo (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/packageinfo Mon Jun 30 16:54:57 2014
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 1.1.0
+version 1.2.0

Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/packageinfo
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/packageinfo?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/packageinfo (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/packageinfo Mon Jun 30 16:54:57 2014
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 1.1.0
+version 1.2.0

Modified: aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/ReferenceMetadataImpl.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/ReferenceMetadataImpl.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/ReferenceMetadataImpl.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/reflect/ReferenceMetadataImpl.java Mon Jun 30 16:54:57 2014
@@ -19,6 +19,7 @@
 package org.apache.aries.blueprint.reflect;
 
 import java.util.Collection;
+import java.util.Collections;
 
 import org.apache.aries.blueprint.mutable.MutableReferenceMetadata;
 import org.osgi.service.blueprint.reflect.ReferenceMetadata;
@@ -33,6 +34,7 @@ public class ReferenceMetadataImpl exten
     private long timeout;
     private String defaultBeanId;
     private Collection<Class<?>> proxyChildBeanClasses;
+    private Collection<String> extraInterfaces;
 
     public ReferenceMetadataImpl() {
     }
@@ -70,6 +72,7 @@ public class ReferenceMetadataImpl exten
                 ", filter='" + filter + '\'' +
                 ", referenceListeners=" + referenceListeners +
                 ", timeout=" + timeout +
+                ", additonalInterfaces=" + getExtraInterfaces() +
                 ']';
     }
 
@@ -80,4 +83,15 @@ public class ReferenceMetadataImpl exten
     public void setProxyChildBeanClasses(Collection<Class<?>> c) {
         proxyChildBeanClasses = c;
     }
+
+    public Collection<String> getExtraInterfaces() {
+        if (extraInterfaces == null) {
+            return Collections.emptyList();
+        }
+        return extraInterfaces;
+    }
+
+    public void setExtraInterfaces(Collection<String> interfaces) {
+        extraInterfaces = interfaces;
+    }
 }

Modified: aries/branches/subsystemsR6/blueprint/blueprint-sample-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-sample-annotation/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-sample-annotation/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-sample-annotation/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,26 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -56,6 +61,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -90,5 +96,4 @@
         </pluginManagement>
     </build>
 
-
 </project>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-sample-fragment/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-sample-fragment/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-sample-fragment/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-sample-fragment/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,26 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -53,6 +58,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -87,5 +93,4 @@
         </pluginManagement>
     </build>
 
-
 </project>

Propchange: aries/branches/subsystemsR6/blueprint/blueprint-sample-war/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 30 16:54:57 2014
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Modified: aries/branches/subsystemsR6/blueprint/blueprint-sample-war/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-sample-war/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-sample-war/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-sample-war/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,26 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -41,7 +46,6 @@
     <properties>
         <context>/</context>
         <httpPort>8080</httpPort>
-
         <blueprint.web.version>1.0.0</blueprint.web.version>
     </properties>
 
@@ -131,4 +135,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-sample/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-sample/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-sample/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,26 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -54,11 +59,11 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<scope>provided</scope>
+		</dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java Mon Jun 30 16:54:57 2014
@@ -23,6 +23,11 @@ import java.util.Map;
 
 public class Foo implements Serializable {
     
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 5557730221435945564L;
+
     private int a;
     private int b;
     private Bar bar;

Modified: aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,27 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <description>Blueprint Test Bundle A, provides NamespaceHandler, BeanProcessor etc implementations for Test Bundle B</description>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -29,6 +33,7 @@
     <name>Apache Aries Blueprint Test Bundle A</name>
     <version>1.0.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
+    <description>Blueprint Test Bundle A, provides NamespaceHandler, BeanProcessor etc implementations for Test Bundle B</description>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlea</connection>
@@ -48,6 +53,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-testbundlea/src/main/resources/OSGI-INF/blueprint/config.xml Mon Jun 30 16:54:57 2014
@@ -84,5 +84,15 @@
         </service-properties>
     </service>
     
+    <bean id="MultiService" class="org.apache.aries.blueprint.testbundlea.multi.MultiService"/>
+    <service ref="MultiService">
+    	<interfaces>
+    		<value>org.apache.aries.blueprint.testbundlea.multi.InterfaceA</value>
+    		<value>org.apache.aries.blueprint.testbundlea.multi.InterfaceB</value>
+    		<value>org.apache.aries.blueprint.testbundlea.multi.InterfaceC</value>
+    	</interfaces>
+    </service>
+    
+    
 </blueprint>
 

Modified: aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,27 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <description>Blueprint Test Bundle B, tests namespace handlers, bean processors etc provided by Test Bundle A</description>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -29,6 +33,7 @@
     <name>Apache Aries Blueprint Test Bundle B</name>
     <version>1.0.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
+    <description>Blueprint Test Bundle B, tests namespace handlers, bean processors etc provided by Test Bundle A</description>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundleb</connection>
@@ -48,6 +53,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -58,7 +64,7 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-testbundleb/src/main/resources/OSGI-INF/blueprint/config.xml Mon Jun 30 16:54:57 2014
@@ -17,7 +17,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0"
            xmlns:one="http://ns.handler.one"
            xmlns:two="http://ns.handler.two"
            xmlns:three="http://ns.handler.three"
@@ -121,5 +121,28 @@
           <mytest:foo xmlns:mytest="http://ns.handler.mytest">blah</mytest:foo>
       </seven:stuff>
   </seven:nshandlerseven> 
+  
+  
+  <reference id="OnlyA" interface="org.apache.aries.blueprint.testbundlea.multi.InterfaceA"/>
+  <reference id="AandB" interface="org.apache.aries.blueprint.testbundlea.multi.InterfaceA">
+  	<ext:additional-interfaces>
+  	    <value>org.apache.aries.blueprint.testbundlea.multi.InterfaceB</value>
+  	</ext:additional-interfaces>
+  </reference>
+  <reference id="AandBandC" interface="org.apache.aries.blueprint.testbundlea.multi.InterfaceA">
+  	<ext:additional-interfaces>
+  	    <value>org.apache.aries.blueprint.testbundlea.multi.InterfaceB</value>
+  	    <value>org.apache.aries.blueprint.testbundlea.multi.InterfaceC</value>
+  	</ext:additional-interfaces>
+  </reference>
+  <!--  this shouldn't ever resolve as D isn't bound -->
+  <reference id="AandBandCandD" interface="org.apache.aries.blueprint.testbundlea.multi.InterfaceA" timeout="100">
+  	<ext:additional-interfaces>
+  	    <value>org.apache.aries.blueprint.testbundlea.multi.InterfaceB</value>
+  	    <value>org.apache.aries.blueprint.testbundlea.multi.InterfaceC</value>
+  	    <value>org.apache.aries.blueprint.testbundlea.multi.InterfaceD</value>
+  	</ext:additional-interfaces>
+  </reference>
+  
 </blueprint>
 

Modified: aries/branches/subsystemsR6/blueprint/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-testquiescebundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-testquiescebundle/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,27 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -29,12 +33,14 @@
     <name>Apache Aries Blueprint Test Quiesce Bundle</name>
     <packaging>bundle</packaging>
     <version>1.0.1-SNAPSHOT</version>
+    <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</developerConnection>
         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle</url>
     </scm>
+
     <properties>
         <aries.osgi.activator>
             org.apache.aries.blueprint.testquiescebundle.Activator
@@ -51,6 +57,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Propchange: aries/branches/subsystemsR6/blueprint/blueprint-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 30 16:54:57 2014
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Propchange: aries/branches/subsystemsR6/blueprint/blueprint-web-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 30 16:54:57 2014
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Modified: aries/branches/subsystemsR6/blueprint/blueprint-web-osgi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-web-osgi/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-web-osgi/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-web-osgi/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,18 +18,20 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.webosgi</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <name>Apache Aries Blueprint Web OSGI</name>
     <description>
         This bundle contains an OSGI-aware Servlet ContextListener for bootstrapping
@@ -48,10 +51,10 @@
         <aries.osgi.import.pkg>
            org.osgi.framework,
            org.osgi.service.blueprint.container;provide:=true,
-           org.apache.aries.blueprint.services;provide:=true;version="[1.3,2.0)",
+           org.apache.aries.blueprint.services;provide:=true;version="[1.2,2.0)",
            javax.servlet*;version="[0.0,4)"
         </aries.osgi.import.pkg>
-        <blueprint.core.version>1.3.1-SNAPSHOT</blueprint.core.version>
+        <blueprint.core.version>1.3.0</blueprint.core.version>
     </properties>
 
     <profiles>
@@ -82,4 +85,18 @@
         </dependency>
     </dependencies>
     
+    <build>
+	    <pluginManagement>
+	        <plugins>
+	            <plugin>
+	                <groupId>org.apache.maven.plugins</groupId>
+	                <artifactId>maven-release-plugin</artifactId>
+	                <configuration>
+	                    <mavenExecutorId>forked-path</mavenExecutorId>
+	                </configuration>
+	            </plugin>
+	        </plugins>
+	    </pluginManagement>
+    </build>
+
 </project>

Modified: aries/branches/subsystemsR6/blueprint/blueprint-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-web/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-web/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-web/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +18,14 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -40,8 +43,10 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-web</developerConnection>
         <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web</url>
     </scm>
+
     <properties>
         <blueprint.nosgi.version>1.0.0</blueprint.nosgi.version>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <profiles>
@@ -74,7 +79,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -117,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -125,9 +128,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.core:1.1.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -18,25 +19,24 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>blueprint</artifactId>
     <name>Apache Aries Blueprint</name>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
-
     <description>
         Implementation of the Blueprint Container Specification
     </description>
 
-
     <modules>
         <module>blueprint-api</module>
         <module>blueprint-parser</module>
@@ -59,7 +59,6 @@
         <module>blueprint-testbundleb</module>
         <module>blueprint-testquiescebundle</module>
         <module>blueprint-itests</module>
-        <module>blueprint-annotation-itest</module>
     </modules>
 
 </project>

Modified: aries/branches/subsystemsR6/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/eba-maven-plugin/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/eba-maven-plugin/pom.xml (original)
+++ aries/branches/subsystemsR6/eba-maven-plugin/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,38 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
-
 <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
     <artifactId>eba-maven-plugin</artifactId>
     <version>1.0.1-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
-
     <name>Aries Maven EBA Plugin</name>
     <description>Builds an eba (Enterprise Bundle Archive) from the project for deployment to an aries server.
     </description>
@@ -140,4 +138,5 @@ under the License.
             </build>
         </profile>
     </profiles>
+
 </project>



Mime
View raw message