You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2014/06/30 18:55:06 UTC

svn commit: r1606837 [13/27] - in /aries/branches/subsystemsR6: ./ application/ application/application-api/ application/application-bundle/ application/application-converters/ application/application-default-local-platform/ application/application-dep...

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java Mon Jun 30 16:54:57 2014
@@ -21,32 +21,31 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.osgi.service.provisioning.ProvisioningService.PROVISIONING_AGENT_CONFIG;
 import static org.osgi.service.provisioning.ProvisioningService.PROVISIONING_REFERENCE;
 
-import static org.apache.aries.itest.ExtraOptions.*;
-
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Dictionary;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
-import javax.management.ObjectName;
+import javax.inject.Inject;
 import javax.management.openmbean.TabularData;
 
 import org.apache.aries.jmx.AbstractIntegrationTest;
 import org.apache.aries.jmx.codec.PropertyData;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
 import org.osgi.jmx.JmxConstants;
 import org.osgi.jmx.service.provisioning.ProvisioningServiceMBean;
 import org.osgi.service.provisioning.ProvisioningService;
-import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * 
@@ -54,69 +53,34 @@ import org.osgi.util.tracker.ServiceTrac
  * @version $Rev$ $Date$
  */
 public class ProvisioningServiceMBeanTest extends AbstractIntegrationTest {
-
+	@Inject
+	ProvisioningService ps;
 
     @Configuration
-    public static Option[] configuration() {
-        return testOptions(
-                        CoreOptions.equinox(),
-                        paxLogging("INFO"),
-                        mavenBundle("org.osgi", "org.osgi.compendium"), 
-                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
-                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
-                        mavenBundle("org.apache.aries", "org.apache.aries.util"));
-    }
-
-    @Override
-    public void doSetUp() throws Exception {
-        waitForMBean(new ObjectName(ProvisioningServiceMBean.OBJECTNAME));
+    public Option[] configuration() {
+		return options(
+				jmxRuntime()
+				);
     }
 
     @Ignore("For now.. Cannot find public repo for org.eclipse.equinox.ip")
     @Test
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked"})
     public void testMBeanInterface() throws Exception {
-
         ProvisioningServiceMBean mbean = getMBean(ProvisioningServiceMBean.OBJECTNAME, ProvisioningServiceMBean.class);
-        assertNotNull(mbean);
-        
-        ServiceTracker tracker = new ServiceTracker(bundleContext, ProvisioningService.class.getName(), null);
-        tracker.open();
-        ProvisioningService ps = (ProvisioningService) tracker.getService();
-        assertNotNull(ps);
-        
         Dictionary<String, Object> info;
         
         // add information URL (create temp zip file)
-        
-        File  provZip = File.createTempFile("Prov-jmx-itests", ".zip");
-        Manifest man = new Manifest();
-        man.getMainAttributes().putValue("Manifest-Version", "1.0");
-        man.getMainAttributes().putValue("Content-Type", "application/zip");
-        JarOutputStream jout = new JarOutputStream(new FileOutputStream(provZip), man);
-        ZipEntry entry = new ZipEntry(PROVISIONING_AGENT_CONFIG);
-        jout.putNextEntry( entry );
-        jout.write(new byte[] { 10, 20, 30 });
-        jout.closeEntry();
-        jout.flush();
-        jout.close();
-        
-        provZip.deleteOnExit();
-        
-        mbean.addInformationFromZip(provZip.toURL().toExternalForm());
+        File provZip = createProvAgentConfigZip();
+        mbean.addInformationFromZip(provZip.toURI().toURL().toExternalForm());
         
         //check the info has been added
-        
         info = ps.getInformation();
         assertNotNull(info);
         assertTrue(info.size() >= 1);
-        byte[] config = (byte[]) info.get(PROVISIONING_AGENT_CONFIG);
-        assertNotNull(config);
-        assertArrayEquals(new byte[] { 10, 20, 30 }, config);
-        
+        assertProvAgentConfigCorrect(info);
         
         // test list information
-        
         TabularData data = mbean.listInformation();
         assertNotNull(data);
         assertEquals(JmxConstants.PROPERTIES_TYPE, data.getTabularType());
@@ -124,42 +88,54 @@ public class ProvisioningServiceMBeanTes
         PropertyData<byte[]> configEntry = PropertyData.from(data.get(new Object[] {PROVISIONING_AGENT_CONFIG }));
         assertNotNull(configEntry);
         assertArrayEquals(new byte[] { 10, 20, 30 }, configEntry.getValue());
-
         
         // test add information
-        
         PropertyData<String> reference = PropertyData.newInstance(PROVISIONING_REFERENCE, "rsh://0.0.0.0/provX");
         data.put(reference.toCompositeData());
-        
         mbean.addInformation(data);
-        
         info = ps.getInformation();
         assertNotNull(info);
         assertTrue(info.size() >= 2);
-        config = (byte[]) info.get(PROVISIONING_AGENT_CONFIG);
-        assertNotNull(config);
-        assertArrayEquals(new byte[] { 10, 20, 30 }, config);
+        assertProvAgentConfigCorrect(info);
         String ref = (String) info.get(PROVISIONING_REFERENCE);
         assertNotNull(ref);
         assertEquals("rsh://0.0.0.0/provX", ref);
         
-        
         // test set information
-        
         data.clear();
         PropertyData<String> newRef = PropertyData.newInstance(PROVISIONING_REFERENCE, "rsh://0.0.0.0/newProvRef");
         data.put(newRef.toCompositeData());
-        
         mbean.setInformation(data);
         info = ps.getInformation();
         assertNotNull(info);
         assertTrue(info.size() >= 1);
         assertNull(info.get(PROVISIONING_AGENT_CONFIG));
-       
         ref = (String) info.get(PROVISIONING_REFERENCE);
         assertNotNull(ref);
         assertEquals("rsh://0.0.0.0/newProvRef", ref);
         
-        
     }
+
+	private void assertProvAgentConfigCorrect(Dictionary<String, Object> info) {
+		byte[] config = (byte[]) info.get(PROVISIONING_AGENT_CONFIG);
+        assertNotNull(config);
+        assertArrayEquals(new byte[] { 10, 20, 30 }, config);
+	}
+
+	private File createProvAgentConfigZip() throws IOException, FileNotFoundException {
+		File  provZip = File.createTempFile("Prov-jmx-itests", ".zip");
+        Manifest man = new Manifest();
+        man.getMainAttributes().putValue("Manifest-Version", "1.0");
+        man.getMainAttributes().putValue("Content-Type", "application/zip");
+        JarOutputStream jout = new JarOutputStream(new FileOutputStream(provZip), man);
+        ZipEntry entry = new ZipEntry(PROVISIONING_AGENT_CONFIG);
+        jout.putNextEntry( entry );
+        jout.write(new byte[] { 10, 20, 30 });
+        jout.closeEntry();
+        jout.flush();
+        jout.close();
+        
+        provZip.deleteOnExit();
+		return provZip;
+	}
 }

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java Mon Jun 30 16:54:57 2014
@@ -18,14 +18,13 @@
  */
 package org.apache.aries.jmx.test.blueprint;
 
-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.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 
 import java.util.Arrays;
 
+import javax.inject.Inject;
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
@@ -45,10 +44,12 @@ import org.apache.aries.jmx.test.bluepri
 import org.apache.aries.jmx.test.blueprint.framework.RegistrationListenerValidator;
 import org.apache.aries.jmx.test.blueprint.framework.ServiceValidator;
 import org.apache.aries.jmx.test.blueprint.framework.ValueValidator;
+import org.junit.Before;
 import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.util.Filter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
@@ -56,77 +57,64 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.service.blueprint.container.BlueprintContainer;
 
 public class BlueprintMBeanTest extends AbstractIntegrationTest {
+	@Inject
+	@Filter("(osgi.blueprint.container.symbolicname=org.apache.aries.blueprint)")
+	BlueprintContainer blueprintExtender;
+	
+	@Inject
+	@Filter("(osgi.blueprint.container.symbolicname=org.apache.aries.blueprint.sample)")
+	BlueprintContainer blueprintSample;
+
+	private Bundle extender;
+	private Bundle sample;
 
     @Configuration
-    public static Option[] configuration() {
-        return testOptions(
-                CoreOptions.equinox(),
-                paxLogging("INFO"),
-
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-                mavenBundle("org.apache.aries", "org.apache.aries.util"),
-                mavenBundle("org.ow2.asm", "asm-all"),
-                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
-                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
-                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator"),
-                mavenBundle("org.apache.commons", "commons-jexl"),
-                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
-                mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.blueprint"),
-                mavenBundle("org.osgi", "org.osgi.compendium")
+    public Option[] configuration() {
+        return CoreOptions.options(
+        		jmxRuntime(),
+        		blueprint(),
+        		mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.blueprint").versionAsInProject(),
+        		mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").versionAsInProject()
         );
     }
 
-    @Override
-    public void doSetUp() throws Exception {
-        waitForMBean(new ObjectName(BlueprintStateMBean.OBJECTNAME));
-        waitForMBean(new ObjectName(BlueprintMetadataMBean.OBJECTNAME));
-
-       // Wait enough time for osgi framework and blueprint bundles to be set up
-       System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Waiting for bundles to be set up");
-       context().getService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=org.apache.aries.blueprint)");
-       context().getService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=org.apache.aries.blueprint.sample)");
-    }
+	protected Option blueprint() {
+		return composite(
+				mavenBundle("org.ow2.asm", "asm-debug-all").versionAsInProject(),
+				mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+				mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
+				mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.jexl.evaluator").versionAsInProject(),
+				mavenBundle("org.apache.commons", "commons-jexl").versionAsInProject()
+				);
+	}
+	
+	@Before
+	public void setup() {
+		extender = getBundleByName("org.apache.aries.blueprint");
+		sample = getBundleByName("org.apache.aries.blueprint.sample");
+	}
 
     @Test
-    public void BlueprintSample() throws Exception {
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Start Test Blueprint Sample");
-
-        //////////////////////////////
-        //Test BlueprintStateMBean
-        //////////////////////////////
-
-        //find the Blueprint Sample bundle id and the blueprint extender bundle id
-        long sampleBundleId = -1;
-        long extenderBundleId = -1;     // the blueprint extender bundle "org.apache.geronimo.blueprint.geronimo-blueprint" is also a blueprint bundle.
-        for (Bundle bundle : bundleContext.getBundles()){
-            if (bundle.getSymbolicName().equals("org.apache.aries.blueprint.sample")) sampleBundleId = bundle.getBundleId();
-            if (bundle.getSymbolicName().equals("org.apache.aries.blueprint")) extenderBundleId = bundle.getBundleId();
-        }
-        if (-1==sampleBundleId) fail("Blueprint Sample Bundle is not found!");
-        if (-1==extenderBundleId) fail("Blueprint Extender Bundle is not found!");
-
-        //retrieve the proxy object
-        BlueprintStateMBean stateProxy = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, new ObjectName(BlueprintStateMBean.OBJECTNAME), BlueprintStateMBean.class, false);
+    public void testBlueprintStateMBean() throws Exception {
+        BlueprintStateMBean stateProxy = getMBean(BlueprintStateMBean.OBJECTNAME, BlueprintStateMBean.class);
 
         // test getBlueprintBundleIds
         long[] bpBundleIds = stateProxy.getBlueprintBundleIds();
         assertEquals("The blueprint bundle ids are: " + Arrays.toString(bpBundleIds), 3, bpBundleIds.length);
         // test getLastEvent
-        BlueprintEventValidator sampleValidator = new BlueprintEventValidator(sampleBundleId, extenderBundleId, 2);
-        sampleValidator.validate(stateProxy.getLastEvent(sampleBundleId));
+        BlueprintEventValidator sampleValidator = new BlueprintEventValidator(sample.getBundleId(), extender.getBundleId(), 2);
+        sampleValidator.validate(stateProxy.getLastEvent(sample.getBundleId()));
         // test getLastEvents
         TabularData lastEvents = stateProxy.getLastEvents();
         assertEquals(BlueprintStateMBean.OSGI_BLUEPRINT_EVENTS_TYPE,lastEvents.getTabularType());
-        sampleValidator.validate(lastEvents.get(new Long[]{sampleBundleId}));
-
-        //////////////////////////////
-        //Test BlueprintMetadataMBean
-        //////////////////////////////
-
+        sampleValidator.validate(lastEvents.get(new Long[]{sample.getBundleId()}));
+    }
+    
+    @Test
+    public void testBlueprintMetaDataMBean() throws Exception {
         //find the Blueprint Sample bundle's container service id
-        Bundle sampleBundle = bundleContext.getBundle(sampleBundleId);
         String filter = "(&(osgi.blueprint.container.symbolicname=" // no similar one in interfaces
-                + sampleBundle.getSymbolicName() + ")(osgi.blueprint.container.version=" + sampleBundle.getVersion() + "))";
+                + sample.getSymbolicName() + ")(osgi.blueprint.container.version=" + sample.getVersion() + "))";
         ServiceReference[] serviceReferences = null;
         try {
             serviceReferences = bundleContext.getServiceReferences(BlueprintContainer.class.getName(), filter);
@@ -143,39 +131,31 @@ public class BlueprintMBeanTest extends 
         assertEquals(3, bpContainerServiceIds.length);
 
         // test getBlueprintContainerServiceId
-        assertEquals(sampleBlueprintContainerServiceId, metadataProxy.getBlueprintContainerServiceId(sampleBundleId));
+        assertEquals(sampleBlueprintContainerServiceId, metadataProxy.getBlueprintContainerServiceId(sample.getBundleId()));
 
         // test getComponentMetadata
         // bean: foo
         BeanValidator bv_foo = new BeanValidator("org.apache.aries.blueprint.sample.Foo", "init", "destroy");
 
-        BeanPropertyValidator bpv_a = new BeanPropertyValidator("a");
-        bpv_a.setObjectValueValidator(new ValueValidator("5"));
-
-        BeanPropertyValidator bpv_b = new BeanPropertyValidator("b");
-        bpv_b.setObjectValueValidator(new ValueValidator("-1"));
-
+        BeanPropertyValidator bpv_a = property("a", "5");
+        BeanPropertyValidator bpv_b = property("b", "-1");
         BeanPropertyValidator bpv_bar = new BeanPropertyValidator("bar");
         bpv_bar.setObjectValueValidator(new RefValidator("bar"));
-
-        BeanPropertyValidator bpv_currency = new BeanPropertyValidator("currency");
-        bpv_currency.setObjectValueValidator(new ValueValidator("PLN"));
-
-        BeanPropertyValidator bpv_date = new BeanPropertyValidator("date");
-        bpv_date.setObjectValueValidator(new ValueValidator("2009.04.17"));
+        BeanPropertyValidator bpv_currency = property("currency", "PLN");
+        BeanPropertyValidator bpv_date = property("date", "2009.04.17");
 
         bv_foo.addPropertyValidators(bpv_a, bpv_b, bpv_bar, bpv_currency, bpv_date);
         bv_foo.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId, "foo"));
 
         // bean: bar
-        BeanPropertyValidator bpv_value = new BeanPropertyValidator("value");
-        bpv_value.setObjectValueValidator(new ValueValidator("Hello FooBar"));
-
+        BeanPropertyValidator bpv_value = property("value", "Hello FooBar");
         BeanPropertyValidator bpv_context = new BeanPropertyValidator("context");
         bpv_context.setObjectValueValidator(new RefValidator("blueprintBundleContext"));
 
         CollectionValidator cv = new CollectionValidator("java.util.List");
-        cv.addCollectionValueValidators(new ValueValidator("a list element"), new ValueValidator("5", "java.lang.Integer"));
+        cv.addCollectionValueValidators(
+        		new ValueValidator("a list element"), 
+        		new ValueValidator("5", "java.lang.Integer"));
         BeanPropertyValidator bpv_list = new BeanPropertyValidator("list");
         bpv_list.setObjectValueValidator(cv);
 
@@ -242,4 +222,10 @@ public class BlueprintMBeanTest extends 
         bv_circularReference.validate(metadataProxy.getComponentMetadata(sampleBlueprintContainerServiceId, "circularReference"));
     }
 
+	private BeanPropertyValidator property(String name, String expectedValue) {
+		BeanPropertyValidator val = new BeanPropertyValidator(name);
+        val.setObjectValueValidator(new ValueValidator(expectedValue));
+		return val;
+	}
+
 }

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/Activator.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/Activator.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/Activator.java Mon Jun 30 16:54:57 2014
@@ -25,7 +25,6 @@ import org.apache.aries.jmx.test.bundleb
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ManagedService;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -36,7 +35,6 @@ import org.osgi.util.tracker.ServiceTrac
  */
 public class Activator implements BundleActivator {
 
-    ServiceRegistration registration;
     ServiceTracker tracker;
     
     /* (non-Javadoc)
@@ -49,7 +47,8 @@ public class Activator implements Bundle
         
         Dictionary<String, Object> props = new Hashtable<String, Object>();
         props.put(Constants.SERVICE_PID, "org.apache.aries.jmx.test.ServiceA");
-        registration = context.registerService(new String[] { InterfaceA.class.getName(), ManagedService.class.getName() }, new A(tracker), props);
+        String[] interfaces = new String[] { InterfaceA.class.getName(), ManagedService.class.getName() };
+		context.registerService(interfaces, new A(tracker), props);
         
     }
 
@@ -57,7 +56,6 @@ public class Activator implements Bundle
      * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
      */
     public void stop(BundleContext context) throws Exception {
-        registration.unregister();
         tracker.close();
     }
 

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/api/InterfaceA.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/api/InterfaceA.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/api/InterfaceA.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/api/InterfaceA.java Mon Jun 30 16:54:57 2014
@@ -25,11 +25,11 @@ import org.osgi.service.cm.ManagedServic
  *
  * @version $Rev$ $Date$
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public interface InterfaceA extends ManagedService {
 
     boolean invoke();
     
-    Dictionary getConfig();
+	Dictionary getConfig();
     
 }

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/impl/A.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/impl/A.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/impl/A.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundlea/impl/A.java Mon Jun 30 16:54:57 2014
@@ -28,7 +28,7 @@ import org.osgi.util.tracker.ServiceTrac
  *
  * @version $Rev$ $Date$
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public class A implements InterfaceA {
 
     private ServiceTracker tracker;
@@ -52,7 +52,7 @@ public class A implements InterfaceA {
         
     }
 
-    public void updated(Dictionary dictionary) throws ConfigurationException {
+	public void updated(Dictionary dictionary) throws ConfigurationException {
         this.props = dictionary;
     }
     

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/Activator.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/Activator.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/Activator.java Mon Jun 30 16:54:57 2014
@@ -25,7 +25,6 @@ import org.apache.aries.jmx.test.bundleb
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ManagedServiceFactory;
 
 /**
@@ -35,27 +34,22 @@ import org.osgi.service.cm.ManagedServic
  */
 public class Activator implements BundleActivator {
 
-    ServiceRegistration plainRegistration;
-    ServiceRegistration msfRegistration;
-    
     /* (non-Javadoc)
      * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
      */
     public void start(BundleContext context) throws Exception {
         Dictionary<String, Object> props = new Hashtable<String, Object>();
         props.put(Constants.SERVICE_PID, "org.apache.aries.jmx.test.ServiceB");
-        plainRegistration = context.registerService(InterfaceB.class.getName(), new B(), props);
+        context.registerService(InterfaceB.class.getName(), new B(), props);
         Dictionary<String, Object> fprops = new Hashtable<String, Object>();
         fprops.put(Constants.SERVICE_PID, "jmx.test.B.factory");
-        msfRegistration = context.registerService(ManagedServiceFactory.class.getName(), new MSF(), fprops);
+        context.registerService(ManagedServiceFactory.class.getName(), new MSF(), fprops);
     }
 
     /* (non-Javadoc)
      * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
      */
     public void stop(BundleContext context) throws Exception {
-        plainRegistration.unregister();
-        msfRegistration.unregister();
     }
 
 }

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/InterfaceB.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/InterfaceB.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/InterfaceB.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/InterfaceB.java Mon Jun 30 16:54:57 2014
@@ -23,13 +23,13 @@ import java.util.Dictionary;
  *
  * @version $Rev$ $Date$
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public interface InterfaceB {
 
     boolean invoke();
     
     void configure(Dictionary<String, Object> props);
     
-    Dictionary getConfig();
+	Dictionary getConfig();
     
 }

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/MSF.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/MSF.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/MSF.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/api/MSF.java Mon Jun 30 16:54:57 2014
@@ -29,7 +29,7 @@ import org.osgi.service.cm.ManagedServic
  *
  * @version $Rev$ $Date$
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "rawtypes"})
 public class MSF implements ManagedServiceFactory {
 
     Map<String, InterfaceB> configured = new HashMap<String, InterfaceB>();
@@ -42,7 +42,8 @@ public class MSF implements ManagedServi
         return "jmx.test.B.factory";
     }
 
-    public void updated(String pid, Dictionary dictionary) throws ConfigurationException {
+    
+	public void updated(String pid, Dictionary dictionary) throws ConfigurationException {
         if (configured.containsKey(pid)) {
             configured.get(pid).configure(dictionary);
         } else {

Modified: aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/impl/B.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/impl/B.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/impl/B.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/bundleb/impl/B.java Mon Jun 30 16:54:57 2014
@@ -25,7 +25,7 @@ import org.apache.aries.jmx.test.bundleb
  *
  * @version $Rev$ $Date$
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings("rawtypes")
 public class B implements InterfaceB {
 
     private Dictionary<String, Object> conf;

Modified: aries/branches/subsystemsR6/jmx/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-whiteboard/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/branches/subsystemsR6/jmx/jmx-whiteboard/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.jmx</groupId>
@@ -41,7 +46,6 @@
         <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard</url>
     </scm>
 
-
     <!-- A Note on Testing ================= This project contains two kinds 
         of tests: regular unit tests running in the test phase and integration tests 
         based on PAX Exam running in the integration-test phase. Basically the complete 
@@ -75,6 +79,9 @@
         <aries.osgi.import.service>
             javax.management.MBeanServer
         </aries.osgi.import.service>
+
+        <exam.version>3.4.0</exam.version>
+        <url.version>1.6.0</url.version>
     </properties>
 
     <build>
@@ -151,23 +158,44 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
+            <artifactId>pax-exam-container-forked</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-tinybundles</artifactId>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.tinybundles</groupId>
+            <artifactId>tinybundles</artifactId>
+            <version>2.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.8.0.v20120529-1548</version>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -200,7 +228,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>
@@ -208,9 +235,6 @@
                                 <goals>
                                     <goal>version-check</goal>
                                 </goals>
-                                <configuration>
-                                    <oldArtifact>org.apache.aries.jmx:org.apache.aries.jmx.whiteboard:1.0.0</oldArtifact>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
@@ -238,4 +262,5 @@
             </snapshots>
         </repository>
     </repositories>
+
 </project>

Modified: aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java Mon Jun 30 16:54:57 2014
@@ -28,13 +28,16 @@ import org.apache.aries.jmx.whiteboard.i
 import org.apache.aries.jmx.whiteboard.integration.helper.TestClassMBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-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.PerClass;
 import org.osgi.framework.ServiceRegistration;
 
 /**
  * The <code>MBeanTest</code> tests MBean registration with MBean Servers
  */
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
 public class MBeanServerTest extends IntegrationTestBase {
 
     @Test

Modified: aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java Mon Jun 30 16:54:57 2014
@@ -31,13 +31,16 @@ import org.apache.aries.jmx.whiteboard.i
 import org.apache.aries.jmx.whiteboard.integration.helper2.TestClass2;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-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.PerClass;
 import org.osgi.framework.ServiceRegistration;
 
 /**
  * The <code>MBeanTest</code> tests MBean registration with MBean Servers
  */
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
 public class MBeanTest extends IntegrationTestBase {
 
     @Test

Modified: aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java (original)
+++ aries/branches/subsystemsR6/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java Mon Jun 30 16:54:57 2014
@@ -18,17 +18,14 @@
  */
 package org.apache.aries.jmx.whiteboard.integration.helper;
 
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+import static org.ops4j.pax.exam.CoreOptions.*;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 
 import java.io.File;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
+import javax.inject.Inject;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
@@ -39,10 +36,9 @@ import junit.framework.TestCase;
 
 import org.junit.After;
 import org.junit.Before;
+import org.ops4j.pax.exam.Configuration;
 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.PaxRunnerOptions;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
@@ -58,11 +54,6 @@ public class IntegrationTestBase {
     // the JVM option to set to enable remote debugging
     protected static final String DEBUG_VM_OPTION = "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=30303";
 
-    // the actual JVM option set, extensions may implement a static
-    // initializer overwriting this value to have the configuration()
-    // method include it when starting the OSGi framework JVM
-    protected static String paxRunnerVmOption = null;
-
     private static MBeanServer staticServer;
 
     private MBeanServer server;
@@ -81,7 +72,7 @@ public class IntegrationTestBase {
         theConfig.put(PROP_NAME, PROP_NAME);
     }
 
-    @org.ops4j.pax.exam.junit.Configuration
+    @Configuration
     public static Option[] configuration() {
         final String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP,
             BUNDLE_JAR_DEFAULT);
@@ -92,37 +83,19 @@ public class IntegrationTestBase {
                 + " system property");
         }
 
-        final Option[] base = options(
-            provision(
-                CoreOptions.bundle(bundleFile.toURI().toString()),
-                mavenBundle("org.ops4j.pax.swissbox",
-                    "pax-swissbox-tinybundles", "1.0.0"),
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin",
-                    "1.2.8"), mavenBundle("org.slf4j", "slf4j-api", "1.5.2"),
-                mavenBundle("org.slf4j", "slf4j-simple", "1.5.2")),
-            waitForFrameworkStartup());
-        final Option vmOption = (paxRunnerVmOption != null)
-                ? PaxRunnerOptions.vmOption(paxRunnerVmOption)
-                : null;
-        
-        Option[] options = combine(base, vmOption);
-        return updateOptions (options);
-    }
-    
-    // This method is copied from AbstractIntegrationTest 
-    // in org.apache.aries.jmx.itests
-    protected static Option[] updateOptions(Option[] options) {
-      // We need to add pax-exam-junit here when running with the ibm
-      // jdk to avoid the following exception during the test run:
-      // ClassNotFoundException: org.ops4j.pax.exam.junit.Configuration
-      if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
-          Option[] ibmOptions = options(
-              wrappedBundle(mavenBundle("org.ops4j.pax.exam", "pax-exam-junit"))
-          );
-          options = combine(ibmOptions, options);
-      }
-      return options;
-  }
+        final Option[] options = options(
+                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+
+                junitBundles(),
+
+                bundle(bundleFile.toURI().toString()),
+                mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "2.0.0"),
+                mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"));
+
+        return options;
+    }
 
     @Before
     public void setUp() {

Modified: aries/branches/subsystemsR6/jmx/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jmx/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jmx/pom.xml (original)
+++ aries/branches/subsystemsR6/jmx/pom.xml Mon Jun 30 16:54:57 2014
@@ -16,23 +16,23 @@
  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">
+-->
+<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.jmx</groupId>
     <artifactId>jmx</artifactId>
     <name>Apache Aries JMX</name>
     <packaging>pom</packaging>
     <version>1.1.0-SNAPSHOT</version>
-
-
     <description>Implementation of the JMX Management Model Specification - reactor pom</description>
 
     <modules>
@@ -45,6 +45,6 @@
         <module>jmx-bundle</module>
         <module>jmx-blueprint-bundle</module>
         <module>jmx-itests</module>
-  </modules>
+    </modules>
 
 </project>

Propchange: aries/branches/subsystemsR6/jndi/
------------------------------------------------------------------------------
  Merged /aries/trunk/jndi:r1535830-1605887

Modified: aries/branches/subsystemsR6/jndi/jndi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-api/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-api/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-api/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,34 +1,33 @@
+<?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>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-api</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-api</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api</url>
-     </scm>
-
     <groupId>org.apache.aries.jndi</groupId>
     <artifactId>org.apache.aries.jndi.api</artifactId>
     <packaging>bundle</packaging>
@@ -38,6 +37,12 @@
         This bundle contains the JNDI 1.0.0 API
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-api</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api</url>
+    </scm>
+
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
 
@@ -48,13 +53,14 @@
             org.apache.aries.jndi.spi
         </aries.osgi.export.pkg>
         <aries.osgi.private.pkg />
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
+
     <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>
@@ -62,9 +68,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.jndi:org.apache.aries.jndi.api:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-bundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-bundle/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.jndi</groupId>
@@ -33,11 +38,11 @@
         It's composed of the jndi-api, jndi-core and jndi-url modules.
     </description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-bundle</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-bundle</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-bundle</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle</url>
+    </scm>
 
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
@@ -56,6 +61,7 @@
         <aries.osgi.activator>
             org.apache.aries.jndi.priv.Activator
         </aries.osgi.activator>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -240,7 +246,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>
@@ -248,9 +253,6 @@
 		                        <goals>
 		                            <goal>version-check</goal>
 		                        </goals>
-		                        <configuration>
-		                            <oldArtifact>org.apache.aries.jndi:org.apache.aries.jndi:1.0.0</oldArtifact>
-		                        </configuration>
 		                    </execution>
 		                </executions>
 		            </plugin>

Modified: aries/branches/subsystemsR6/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-core/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-core/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.jndi</groupId>
@@ -34,11 +37,11 @@
       This bundle contains the core of JNDI support for OSGi.
     </description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core</url>
+    </scm>
 
     <properties>
         <aries.osgi.private.pkg>
@@ -50,6 +53,7 @@
             org.apache.aries.jndi.startup.Activator
         </aries.osgi.activator>
         <aries.osgi.export.pkg />
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -95,14 +99,13 @@
             <artifactId>org.apache.aries.util</artifactId>
             <version>1.0.0</version>
         </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>
@@ -110,9 +113,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.jndi:org.apache.aries.jndi.core:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java Mon Jun 30 16:54:57 2014
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
 
+import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -86,7 +87,7 @@ public class InitialContextTest 
   public void testLookupWithICF() throws NamingException
   {
     InitialContextFactory icf = Skeleton.newMock(InitialContextFactory.class);
-    bc.registerService(new String[] {InitialContextFactory.class.getName(), icf.getClass().getName()}, icf, new Properties());
+    bc.registerService(new String[] {InitialContextFactory.class.getName(), icf.getClass().getName()}, icf, (Dictionary) new Properties());
     Skeleton.getSkeleton(icf).setReturnValue(new MethodCall(Context.class, "lookup", "/"), Skeleton.newMock(Context.class));
     
     Properties props = new Properties();
@@ -119,7 +120,7 @@ public class InitialContextTest 
     
     Properties props = new Properties();
     props.put(JNDIConstants.JNDI_URLSCHEME, "testURL");
-    bc.registerService(ObjectFactory.class.getName(), factory, props);
+    bc.registerService(ObjectFactory.class.getName(), factory, (Dictionary) props);
     
     
     props = new Properties();
@@ -134,7 +135,7 @@ public class InitialContextTest 
   public void testLookFromLdapICF() throws Exception
   {
     InitialContextFactoryBuilder icf = Skeleton.newMock(InitialContextFactoryBuilder.class);
-    bc.registerService(new String[] {InitialContextFactoryBuilder.class.getName(), icf.getClass().getName()}, icf, new Properties());
+    bc.registerService(new String[] {InitialContextFactoryBuilder.class.getName(), icf.getClass().getName()}, icf, (Dictionary) new Properties());
     
     LdapContext backCtx = Skeleton.newMock(LdapContext.class);
     InitialContextFactory fac = Skeleton.newMock(InitialContextFactory.class);
@@ -233,7 +234,7 @@ public class InitialContextTest 
   private void registerURLObjectFactory(ObjectFactory of, String scheme) {
       Properties props = new Properties();
       props.setProperty(JNDIConstants.JNDI_URLSCHEME, "test");
-      bc.registerService(ObjectFactory.class.getName(), of, props);      
+      bc.registerService(ObjectFactory.class.getName(), of, (Dictionary) props);
   }
   
   /**

Modified: aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java Mon Jun 30 16:54:57 2014
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Properties;
 
@@ -97,7 +98,7 @@ public class ObjectFactoryTest
     Properties props = new Properties();
     props.setProperty("osgi.jndi.urlScheme", "wibble");
 
-    bc.registerService(ObjectFactory.class.getName(), factory, props);
+    bc.registerService(ObjectFactory.class.getName(), factory, (Dictionary) props);
 
     Reference ref = new Reference(null);
     ref.add(new StringRefAddr("URL", "wibble"));
@@ -113,7 +114,7 @@ public class ObjectFactoryTest
     URLObjectFactoryFinder factory = Skeleton.newMock(URLObjectFactoryFinder.class);
     Skeleton.getSkeleton(factory).setReturnValue(new MethodCall(ObjectFactory.class, "getObjectInstance", Object.class, Name.class, Context.class, Hashtable.class), testObject);
 
-    bc.registerService(URLObjectFactoryFinder.class.getName(), factory, new Properties());
+    bc.registerService(URLObjectFactoryFinder.class.getName(), factory, (Dictionary) new Properties());
 
     Reference ref = new Reference(null);
     ref.add(new StringRefAddr("URL", "wibble"));

Modified: aries/branches/subsystemsR6/jndi/jndi-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-legacy-support/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-legacy-support/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-legacy-support/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.jndi</groupId>
@@ -48,6 +51,7 @@
         <aries.osgi.activator>
             org.apache.aries.jndi.legacy.support.Activator
         </aries.osgi.activator>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -62,7 +66,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>
@@ -70,9 +73,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.jndi:org.apache.aries.jndi.legacy.support:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-rmi/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-rmi/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-rmi/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.jndi</groupId>
@@ -34,11 +37,11 @@
       This bundle contains the JNDI RMI handler
     </description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
+    </scm>
 
     <properties>
         <aries.osgi.activator>
@@ -48,6 +51,7 @@
             ${project.artifactId}*
         </aries.osgi.private.pkg>
         <aries.osgi.export.pkg />
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
@@ -73,12 +77,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>
@@ -86,9 +90,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.jndi:org.apache.aries.jndi.rmi:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java Mon Jun 30 16:54:57 2014
@@ -18,6 +18,7 @@
  */
 package org.apache.aries.jndi.rmi;
 
+import java.util.Dictionary;
 import java.util.Hashtable;
 
 import javax.naming.spi.ObjectFactory;
@@ -47,7 +48,7 @@ public class Activator implements Bundle
             reg = context.registerService(
                         ObjectFactory.class.getName(),
                         ClassLoader.getSystemClassLoader().loadClass("com.sun.jndi.url.rmi.rmiURLContextFactory").newInstance(),
-                        props);
+                        (Dictionary) props);
         }
         catch (Exception e)
         {

Modified: aries/branches/subsystemsR6/jndi/jndi-url-itest-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url-itest-biz/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url-itest-biz/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url-itest-biz/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,21 +1,21 @@
 <?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
+ 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
+    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.
+ 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">
 
@@ -23,9 +23,9 @@
     
     <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.jndi</groupId>
@@ -34,18 +34,16 @@
     <version>1.0.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz</url>
+    </scm>
 
-     <properties> 
-      <aries.osgi.import.pkg>*
-      </aries.osgi.import.pkg>
-      <aries.osgi.private.pkg>*
-      </aries.osgi.private.pkg>
-      <aries.osgi.export />
-     </properties>
+    <properties>
+        <aries.osgi.import.pkg>*</aries.osgi.import.pkg>
+        <aries.osgi.private.pkg>*</aries.osgi.private.pkg>
+        <aries.osgi.export />
+    </properties>
     
 </project>

Modified: aries/branches/subsystemsR6/jndi/jndi-url-itest-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url-itest-web/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url-itest-web/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url-itest-web/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,21 +1,21 @@
 <?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">
 
@@ -23,9 +23,9 @@
     
     <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.jndi</groupId>
@@ -34,23 +34,23 @@
     <version>1.0.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web</url>
-     </scm>
-
-     <properties>
-     <aries.osgi.private.pkg>
-        org.apache.aries.jndiurl.itest,
-        org.apache.aries.jndiurl.itest.beans
-     </aries.osgi.private.pkg>
-     <aries.osgi.import.pkg>
-        javax.servlet*;version=2.5,
-        *
-     </aries.osgi.import.pkg>
-     <aries.osgi.export.pkg />
-     </properties>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web</url>
+    </scm>
+
+    <properties>
+        <aries.osgi.private.pkg>
+            org.apache.aries.jndiurl.itest,
+            org.apache.aries.jndiurl.itest.beans
+        </aries.osgi.private.pkg>
+        <aries.osgi.import.pkg>
+            javax.servlet*;version=2.5,
+            *
+        </aries.osgi.import.pkg>
+        <aries.osgi.export.pkg />
+    </properties>
 
     <dependencies>
         <dependency>
@@ -73,4 +73,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: aries/branches/subsystemsR6/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url-itest/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url-itest/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url-itest/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.jndi</groupId>
@@ -38,6 +41,11 @@
          <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</developerConnection>
          <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest</url>
      </scm>
+     
+     <properties>
+        <exam.version>3.4.0</exam.version>
+        <url.version>1.6.0</url.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -45,17 +53,16 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
+          <groupId>org.apache.aries.testsupport</groupId>
+          <artifactId>org.apache.aries.testsupport.unit</artifactId>
+          <version>2.0.0-SNAPSHOT</version>
+          <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -82,7 +89,7 @@
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         
         <dependency>
@@ -99,62 +106,74 @@
             <version>1.0.0</version>
         </dependency>
         
+		<!-- pax exam -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
+            <artifactId>pax-exam-container-forked</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit-extender-impl</artifactId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.ops4j.pax.runner</groupId>
-            <artifactId>pax-runner-no-jcl</artifactId>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-tinybundles</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.29</version>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.29</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <scope>test</scope>
+            <groupId>org.ops4j.pax.tinybundles</groupId>
+            <artifactId>tinybundles</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>org.osgi.core</artifactId>
+            		<groupId>org.osgi</groupId>
+            	</exclusion>
+            </exclusions>
         </dependency>
-
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
-            <scope>test</scope>
+            <groupId>org.eclipse</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.8.0.v20120529-1548</version>
         </dependency>
 
         <dependency>
@@ -166,20 +185,22 @@
 
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-all</artifactId>
+            <artifactId>asm-debug-all</artifactId>
             <scope>test</scope>
-            <version>4.0</version>
+            <version>5.0.3</version>
         </dependency>
 
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>cm</artifactId>
+            <version>3.2.0-v20070116</version>
             <scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>services</artifactId>
+            <version>3.1.200-v20070605</version>
             <scope>test</scope>
 		</dependency>
 
@@ -193,44 +214,46 @@
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-extender-war</artifactId>
-            <scope>test</scope>
-            <version>0.8.1</version>
+            <version>1.1.17</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-jetty-bundle</artifactId>
             <scope>test</scope>
-            <version>0.8.1</version>
+            <version>1.1.17</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.fileinstall</artifactId>
             <scope>test</scope>
-            <version>2.0.8</version>
+            <version>3.4.0</version>
 		</dependency>
         
 		<dependency>
 			<groupId>org.apache.aries.jndi</groupId>
 			<artifactId>org.apache.aries.jndi</artifactId>
             <scope>test</scope>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
 		</dependency>
 
         <dependency>
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.url</artifactId>
             <scope>test</scope>
-            <version>1.0.0</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
-          <groupId>org.apache.aries.testsupport</groupId>
-          <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>1.0.0</version>
-          <scope>test</scope>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+            <scope>test</scope>
         </dependency>
-
     </dependencies>
 
      <build>
@@ -240,28 +263,19 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>pertest</forkMode>
-                    <excludes>
-                        <exclude>**/*$*</exclude>
-                        <exclude>**/Abstract*.java</exclude>
-                    </excludes>
-                    <includes>
-                        <include>**/Test*.java</include>
-                        <include>**/*Test.java</include>
-                    </includes>
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>maven-paxexam-plugin</artifactId>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
-                        <id>generate-config</id>
+                    	<phase>generate-resources</phase>
+                        <id>generate-depends-file</id>
                         <goals>
                             <goal>generate-depends-file</goal>
                         </goals>
-                        <configuration>
-                            <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>