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 [14/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/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java Mon Jun 30 16:54:57 2014
@@ -21,8 +21,12 @@ package org.apache.aries.jndi.itests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
import java.io.BufferedReader;
import java.io.IOException;
@@ -33,14 +37,21 @@ import java.net.URL;
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.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.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class JndiUrlIntegrationTest extends AbstractIntegrationTest {
private static final int CONNECTION_TIMEOUT = 10000;
+
+
/**
* This test exercises the blueprint:comp/ jndi namespace by driving
@@ -57,7 +68,7 @@ public class JndiUrlIntegrationTest exte
Bundle bweb = context().getBundleByName("org.apache.aries.jndi.url.itest.web");
assertNotNull(bweb);
-
+ context().getBundleByName("org.ops4j.pax.web.pax-web-extender-war").start();
printBundleStatus ("Before making web request");
try {
Thread.sleep(5000);
@@ -71,7 +82,7 @@ public class JndiUrlIntegrationTest exte
private void printBundleStatus (String msg) {
System.out.println("-----\nprintBundleStatus: " + msg + "\n-----");
- for (Bundle b : bundleContext.getBundles()) {
+ for (Bundle b : bundleContext.getBundles()) {
System.out.println (b.getSymbolicName() + " " + "state=" + formatState(b.getState()));
}
System.out.println();
@@ -125,34 +136,50 @@ public class JndiUrlIntegrationTest exte
return response.toString();
}
- @org.ops4j.pax.exam.junit.Configuration
- public static Option[] configuration()
+ public Option baseOptions() {
+ String localRepo = System.getProperty("maven.repo.local");
+ if (localRepo == null) {
+ localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+ }
+ return composite(
+ junitBundles(),
+ // this is how you set the default log level when using pax
+ // logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo))
+ );
+ }
+
+ @Configuration
+ public Option[] configuration()
{
- return testOptions(
- paxLogging("DEBUG"),
- transactionBootDelegation(),
+ return CoreOptions.options(
+ baseOptions(),
// Bundles
- mavenBundle("org.eclipse.equinox", "cm"),
- mavenBundle("org.eclipse.osgi", "services"),
- mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
+ mavenBundle("org.eclipse.equinox", "cm").versionAsInProject(),
+ mavenBundle("org.eclipse.osgi", "services").versionAsInProject(),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec").versionAsInProject(),
- mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
- mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
+ mavenBundle("org.ops4j.pax.web", "pax-web-extender-war").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle").versionAsInProject(),
+
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+ mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
+ mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(),
- mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api"),
- mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi"),
-
- mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web"),
- mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz"),
- mavenBundle("org.ow2.asm", "asm-all"),
+ mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web").versionAsInProject(),
+ mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-debug-all").versionAsInProject(),
+ mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject()
+ );
- /* For debugging, uncomment the next two lines */
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
// org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup(),
- equinox().version("3.5.0"));
}
}
Modified: aries/branches/subsystemsR6/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/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 URL handler for OSGi
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -55,6 +58,8 @@
org.osgi.service.blueprint.container;resolution:=optional,
*
</aries.osgi.import.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
+
</properties>
<dependencies>
@@ -107,12 +112,12 @@
<scope>test</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>
@@ -120,15 +125,10 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.jndi:org.apache.aries.jndi.url:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
-
-
</project>
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java Mon Jun 30 16:54:57 2014
@@ -433,7 +433,7 @@ public final class ServiceHelper
refs = ctx.getServiceReferences(interface1, filter);
if (refs == null || refs.length == 0) {
- refs = ctx.getServiceReferences(null, "(" + JNDIConstants.JNDI_SERVICENAME + "="
+ refs = ctx.getServiceReferences((String) null, "(" + JNDIConstants.JNDI_SERVICENAME + "="
+ serviceName + ')');
}
} catch (InvalidSyntaxException e) {
@@ -456,18 +456,14 @@ public final class ServiceHelper
public static Object getService(BundleContext ctx, ServiceReference ref)
{
Object service = ctx.getService(ref);
-
- Object result = null;
-
- if (service != null) {
- ServicePair pair = new ServicePair();
- pair.ref = ref;
- pair.service = service;
-
- result = proxy(null, null, false, ctx, pair, 0);
+ if (service == null) {
+ return null;
}
- return result;
+ ServicePair pair = new ServicePair();
+ pair.ref = ref;
+ pair.service = service;
+ return proxy(null, null, false, ctx, pair, 0);
}
static Collection<Class<?>> getAllInterfaces (Class<?>[] baseInterfaces)
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/AbstractName.java Mon Jun 30 16:54:57 2014
@@ -29,11 +29,11 @@ import javax.naming.CompositeName;
@SuppressWarnings("serial")
public abstract class AbstractName extends CompositeName
{
- public AbstractName (Enumeration<String> e) {
- super(e);
+ public AbstractName (String name) {
+ super(split(name));
}
- static Enumeration<String> split(String name)
+ protected static Enumeration<String> split(String name)
{
List<String> elements = new ArrayList<String>();
@@ -64,16 +64,11 @@ public abstract class AbstractName exten
{
String part0 = get(0);
int index = part0.indexOf(':');
-
- String result;
-
if (index > 0) {
- result = part0.substring(0, index);
+ return part0.substring(0, index);
} else {
- result = null;
+ return null;
}
-
- return result;
}
public String getSchemePath()
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java Mon Jun 30 16:54:57 2014
@@ -18,7 +18,10 @@
*/
package org.apache.aries.jndi.url;
+import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.naming.spi.ObjectFactory;
@@ -53,10 +56,12 @@ public class Activator implements Bundle
Hashtable<Object, Object> blueprintURlSchemeProps = new Hashtable<Object, Object>();
blueprintURlSchemeProps.put(JNDIConstants.JNDI_URLSCHEME, new String[] { "blueprint" });
blueprintUrlReg = ctx.registerService(ObjectFactory.class.getName(),
- new BlueprintURLContextServiceFactory(), blueprintURlSchemeProps);
+ new BlueprintURLContextServiceFactory(), (Dictionary) blueprintURlSchemeProps);
} catch (ClassNotFoundException cnfe) {
// The blueprint packages aren't available, so do nothing. That's fine.
- cnfe.printStackTrace();
+ Logger logger = Logger.getLogger("org.apache.aries.jndi");
+ logger.log(Level.INFO, "Blueprint support disabled: " + cnfe);
+ logger.log(Level.FINE, "Blueprint support disabled", cnfe);
}
}
@@ -74,7 +79,7 @@ public class Activator implements Bundle
Hashtable<Object, Object> osgiUrlprops = new Hashtable<Object, Object>();
osgiUrlprops.put(JNDIConstants.JNDI_URLSCHEME, new String[] { "osgi", "aries" });
osgiUrlReg = ctx.registerService(ObjectFactory.class.getName(),
- new OsgiURLContextServiceFactory(), osgiUrlprops);
+ new OsgiURLContextServiceFactory(), (Dictionary) osgiUrlprops);
}
@Override
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintName.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintName.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintName.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintName.java Mon Jun 30 16:54:57 2014
@@ -31,7 +31,7 @@ public class BlueprintName extends Abstr
public BlueprintName(String name) throws InvalidNameException
{
- super(split(name));
+ super(name);
}
public BlueprintName(Name name) throws InvalidNameException
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiName.java Mon Jun 30 16:54:57 2014
@@ -44,7 +44,7 @@ public final class OsgiName extends Abst
public OsgiName(String name) throws InvalidNameException
{
- super(split(name));
+ super(name);
}
public OsgiName(Name name) throws InvalidNameException
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/OsgiURLContextFactory.java Mon Jun 30 16:54:57 2014
@@ -46,38 +46,36 @@ public class OsgiURLContextFactory imple
if (obj == null) {
return new ServiceRegistryContext(callerContext, environment);
} else if (obj instanceof String) {
- Context ctx = null;
- try {
- ctx = new ServiceRegistryContext(callerContext, environment);
-
- return ctx.lookup((String) obj);
- } finally {
- if (ctx != null)
- ctx.close();
- }
+ return findAny(environment, (String)obj);
} else if (obj instanceof String[]) {
- // Try each URL until either lookup succeeds or they all fail
- String[] urls = (String[]) obj;
- if (urls.length == 0) {
- throw new ConfigurationException("0");
- }
- Context context = new ServiceRegistryContext(callerContext, environment);
- try {
- NamingException ne = null;
- for (int i = 0; i < urls.length; i++) {
- try {
- return context.lookup(urls[i]);
- } catch (NamingException e) {
- ne = e;
- }
- }
- throw ne;
- } finally {
- context.close();
- }
+ return findAny(environment, (String[]) obj);
+ } else {
+ return null;
}
-
- return null;
}
+ /**
+ * Try each URL until either lookup succeeds or they all fail
+ */
+ private Object findAny(Hashtable<?, ?> environment, String ... urls)
+ throws ConfigurationException, NamingException {
+ if (urls.length == 0) {
+ throw new ConfigurationException("0");
+ }
+ Context context = new ServiceRegistryContext(callerContext, environment);
+ try {
+ NamingException ne = null;
+ for (int i = 0; i < urls.length; i++) {
+ try {
+ return context.lookup(urls[i]);
+ } catch (NamingException e) {
+ ne = e;
+ }
+ }
+ throw ne;
+ } finally {
+ context.close();
+ }
+ }
+
}
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryContext.java Mon Jun 30 16:54:57 2014
@@ -117,19 +117,13 @@ public class ServiceRegistryContext exte
}
private OsgiName convert(Name name) throws NamingException {
- OsgiName result;
-
if (name instanceof OsgiName) {
- result = (OsgiName) name;
+ return (OsgiName) name;
+ } else if (parentName != null) {
+ return new OsgiName(parentName.toString() + "/" + name.toString());
} else {
- if (parentName != null) {
- result = new OsgiName(parentName.toString() + "/" + name.toString());
- } else {
- result = (OsgiName) parser.parse(name.toString());
- }
+ return (OsgiName) parser.parse(name.toString());
}
-
- return result;
}
private Name parse(String name) throws NamingException {
Modified: aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java (original)
+++ aries/branches/subsystemsR6/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/ServiceRegistryListContext.java Mon Jun 30 16:54:57 2014
@@ -108,22 +108,14 @@ public class ServiceRegistryListContext
public NamingEnumeration<NameClassPair> list(String name) throws NamingException
{
if (!!!"".equals(name)) throw new NameNotFoundException(name);
-
- final ServiceReference[] refs = ServiceHelper.getServiceReferences(callerContext, parentName.getInterface(), parentName.getFilter(), parentName.getServiceName(), env);
-
+ final ServiceReference[] refs = getServiceRefs();
return new ServiceNamingEnumeration<NameClassPair>(callerContext, refs, new ThingManager<NameClassPair>() {
public NameClassPair get(BundleContext ctx, ServiceReference ref)
{
- String serviceId = String.valueOf(ref.getProperty(Constants.SERVICE_ID));
- String className = null;
Object service = ctx.getService(ref);
- if (service != null) {
- className = service.getClass().getName();
- }
-
+ String className = (service != null) ? service.getClass().getName() : null;
ctx.ungetService(ref);
-
- return new NameClassPair(serviceId, className, true);
+ return new NameClassPair(serviceId(ref), className, true);
}
public void release(BundleContext ctx, ServiceReference ref)
@@ -140,17 +132,12 @@ public class ServiceRegistryListContext
public NamingEnumeration<Binding> listBindings(String name) throws NamingException
{
if (!!!"".equals(name)) throw new NameNotFoundException(name);
-
- final ServiceReference[] refs = ServiceHelper.getServiceReferences(callerContext, parentName.getInterface(), parentName.getFilter(), parentName.getServiceName(), env);
-
+ final ServiceReference[] refs = getServiceRefs();
return new ServiceNamingEnumeration<Binding>(callerContext, refs, new ThingManager<Binding>() {
public Binding get(BundleContext ctx, ServiceReference ref)
{
- String serviceId = String.valueOf(ref.getProperty(Constants.SERVICE_ID));
-
Object service = ServiceHelper.getService(ctx, ref);
-
- return new Binding(serviceId, service, true);
+ return new Binding(serviceId(ref), service, true);
}
public void release(BundleContext ctx, ServiceReference ref)
@@ -167,14 +154,19 @@ public class ServiceRegistryListContext
public Object lookup(String name) throws NamingException
{
- Object result = null;
-
- result = ServiceHelper.getService(callerContext, parentName, name, false, env, true);
-
+ Object result = ServiceHelper.getService(callerContext, parentName, name, false, env, true);
if (result == null) {
throw new NameNotFoundException(name.toString());
}
-
return result;
}
+
+ private String serviceId(ServiceReference ref) {
+ return String.valueOf(ref.getProperty(Constants.SERVICE_ID));
+ }
+
+ private ServiceReference[] getServiceRefs() throws NamingException {
+ return ServiceHelper.getServiceReferences(callerContext, parentName.getInterface(), parentName.getFilter(), parentName.getServiceName(), env);
+ }
+
}
\ No newline at end of file
Modified: aries/branches/subsystemsR6/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jndi/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jndi/pom.xml (original)
+++ aries/branches/subsystemsR6/jndi/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,20 +19,20 @@
-->
<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>java6-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.jndi</groupId>
<artifactId>jndi</artifactId>
<name>Apache Aries JNDI</name>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
-
<description>
JNDI support for OSGi - Reactor POM
</description>
Modified: aries/branches/subsystemsR6/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-api/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-api/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-api/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,45 +1,47 @@
<?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>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
<packaging>bundle</packaging>
<name>Aries JPA Container API</name>
<version>1.0.1-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.jpa.container.parsing,
org.apache.aries.jpa.container,
@@ -51,7 +53,9 @@
org.osgi.framework;version="[1.5.0,2.0.0)"
</aries.osgi.import>
<aries.osgi.private.pkg />
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -65,12 +69,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>
@@ -78,9 +82,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.api:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-blueprint-aries/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,50 +1,53 @@
<?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>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <name>Aries JPA Container blueprint integration for Aries blueprint</name>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
<version>1.0.2-SNAPSHOT</version>
+ <name>Aries JPA Container blueprint integration for Aries blueprint</name>
<packaging>bundle</packaging>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-aries</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-aries</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-aries</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-aries</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg />
<aries.osgi.import>
javax.persistence;version="[1.0.0,3.0.0)",
*
</aries.osgi.import>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -67,7 +70,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.2.0</version>
+ <version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -97,12 +100,12 @@
<scope>test</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>
@@ -110,12 +113,10 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.blueprint.aries:1.0.1</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/branches/subsystemsR6/jpa/jpa-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-blueprint-testbundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-blueprint-testbundle/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-blueprint-testbundle/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,45 +1,47 @@
<?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>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
<packaging>bundle</packaging>
<version>1.0.1-SNAPSHOT</version>
<name>Test Bundle for Aries JPA Blueprint iTests</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-testbundle</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-testbundle</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-testbundle</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-testbundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-testbundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-testbundle</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.jpa.blueprint.itest*,
</aries.osgi.export.pkg>
@@ -57,6 +59,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -70,4 +73,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,45 +1,47 @@
<?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>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.advanced.itest.bundle</artifactId>
<version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Test Bundle for Aries JPA Container advanced iTests</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-advancedtestbundle</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-advancedtestbundle</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-advancedtestbundle</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-advancedtestbundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-advancedtestbundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-advancedtestbundle</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.jpa.container.advanced.itest.bundle.entities
</aries.osgi.export.pkg>
@@ -51,6 +53,7 @@
<aries.osgi.private.pkg />
<aries.osgi.symbolic.name>${project.groupId}.${project.artifactId}</aries.osgi.symbolic.name>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -73,4 +76,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml Mon Jun 30 16:54:57 2014
@@ -27,7 +27,7 @@
<properties>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
<property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:TEST;create=true"/>
+ <property name="javax.persistence.jdbc.databaseName" value="memory:TEST;create=true"/>
<property name="eclipselink.target-database" value="Derby"/>
<property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="database" />
Modified: aries/branches/subsystemsR6/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-context/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-context/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-context/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,46 +1,47 @@
<?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>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
<version>1.0.2-SNAPSHOT</version>
<name>Aries JPA Container Managed Contexts</name>
<packaging>bundle</packaging>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-context</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-context</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-context</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-context</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context</url>
+ </scm>
<properties>
-
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg />
<aries.osgi.import>
javax.persistence;version="[1.0.0,2.1.0)",
@@ -51,10 +52,10 @@
org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
*
</aries.osgi.import>
- <aries.osgi.activator>
- org.apache.aries.jpa.container.context.impl.GlobalPersistenceManager
- </aries.osgi.activator>
-
+ <aries.osgi.activator>
+ org.apache.aries.jpa.container.context.impl.GlobalPersistenceManager
+ </aries.osgi.activator>
+ <lastReleaseVersion>1.0.1</lastReleaseVersion>
</properties>
<dependencies>
@@ -120,12 +121,12 @@
<scope>test</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>
@@ -133,9 +134,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.container.context:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-eclipselink-adapter/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,96 +1,104 @@
<?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. -->
-<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">
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
- <packaging>bundle</packaging>
- <version>0.3.1-SNAPSHOT</version>
- <name>Aries JPA Container adapter for use with EclipseLink</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-eclipselink-adapter
- </connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-eclipselink-adapter
- </developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter
- </url>
- </scm>
-
- <properties>
- <aries.osgi.private.pkg>org.apache.aries.jpa.eclipselink.adapter.*</aries.osgi.private.pkg>
- <aries.osgi.export.pkg></aries.osgi.export.pkg>
- <aries.osgi.import.pkg>
- javax.persistence*;version="[1.1,2.1)",
- !org.eclipse.persistence.*,
- *
- </aries.osgi.import.pkg>
- <aries.osgi.failok>true</aries.osgi.failok>
- <aries.osgi.activator>org.apache.aries.jpa.eclipselink.adapter.Activator</aries.osgi.activator>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <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.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>0.4</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
+<!--
+ 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>parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>Aries JPA Container adapter for use with EclipseLink</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-eclipselink-adapter</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-eclipselink-adapter</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.private.pkg>org.apache.aries.jpa.eclipselink.adapter.*</aries.osgi.private.pkg>
+ <aries.osgi.export.pkg></aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ javax.persistence*;version="[1.1,2.1)",
+ !org.eclipse.persistence.*,
+ *
+ </aries.osgi.import.pkg>
+ <aries.osgi.failok>true</aries.osgi.failok>
+ <aries.osgi.activator>org.apache.aries.jpa.eclipselink.adapter.Activator</aries.osgi.activator>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <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.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>0.4</version>
+ <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>
@@ -98,9 +106,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.eclipselink.adapter:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-itest/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-itest/pom.xml (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-itest/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,46 +1,54 @@
<?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>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest</artifactId>
<version>1.0.1-SNAPSHOT</version>
<name>Aries JPA iTests</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest</url>
+ </scm>
+
+ <properties>
+ <exam.version>3.4.0</exam.version>
+ <url.version>1.6.0</url.version>
+ </properties>
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.8.0.v20120529-1548</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -50,37 +58,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <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>
- <dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner-no-jcl</artifactId>
- <version>1.7.3</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <scope>test</scope>
+ <version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -97,19 +75,13 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.0</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.7.0.v20110613</version>
+ <version>5.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -121,28 +93,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -160,59 +111,40 @@
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2-SNAPSHOT</version>
<!--<scope>test</scope>-->
</dependency>
- <!--
<dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-dbcp</artifactId>
+ <version>1.4_3</version>
</dependency>
-
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.asm</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm4-shaded</artifactId>
+ <version>3.16</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.antlr</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
- </dependency> -->
-
- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.0.0</version>
+ <version>2.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -243,30 +175,27 @@
<artifactId>org.apache.servicemix.bundles.serp</artifactId>
<version>1.13.1_2</version>
</dependency>
+
+ <!-- Test bundles -->
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-<!-- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container.itest.bundle.eclipselink</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency> -->
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.advanced.itest.bundle</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
@@ -312,26 +241,96 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.5.3.0_1</version>
+ <version>10.10.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.jdbc</groupId>
+ <artifactId>pax-jdbc-derby</artifactId>
+ <version>0.3.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<version>2.1_3_4</version>
<scope>test</scope>
</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-container-native</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-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>0.9.29</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.29</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <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>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
<version>1.2</version>
@@ -344,6 +343,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -361,16 +367,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <forkMode>pertest</forkMode>
<!--
- when the local repo location has been specified, we need
- to pass on this information to PAX mvn url
+ when the local repo location has been specified, we need to pass
+ on this information to PAX mvn url
-->
- <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}
- </argLine>
+ <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
+
</project>
Modified: aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java Mon Jun 30 16:54:57 2014
@@ -15,35 +15,22 @@
*/
package org.apache.aries.jpa.advanced.features.itest;
-import static org.apache.aries.itest.ExtraOptions.mavenBundle;
-import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.options;
-import java.util.Arrays;
-
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.aries.jpa.container.PersistenceUnitConstants;
-import org.apache.aries.jpa.container.advanced.itest.bundle.entities.Car;
import org.junit.Ignore;
-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.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@Ignore
-@RunWith(JUnit4TestRunner.class)
public class EclipseLinkWeavingAndAnnotationScanningTest extends JPAWeavingAndAnnotationScanningTest {
@Configuration
- public static Option[] eclipseLinkConfig() {
+ public Option[] eclipseLinkConfig() {
return options(
- mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.jpa").noStart(),
- mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.core").noStart(),
- mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.asm").noStart(),
- mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.antlr").noStart(),
-
- mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.eclipselink.adapter")
+ baseOptions(),
+ eclipseLink(),
+ openJpa(),
+ testBundleAdvanced()
+
);
}
Modified: aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java Mon Jun 30 16:54:57 2014
@@ -16,71 +16,32 @@
package org.apache.aries.jpa.advanced.features.itest;
import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import org.apache.aries.itest.AbstractIntegrationTest;
-import org.apache.aries.jpa.container.PersistenceUnitConstants;
import org.apache.aries.jpa.container.advanced.itest.bundle.entities.Car;
+import org.apache.aries.jpa.itest.AbstractJPAItest;
import org.junit.Test;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-public abstract class JPAWeavingAndAnnotationScanningTest extends AbstractIntegrationTest {
+public abstract class JPAWeavingAndAnnotationScanningTest extends AbstractJPAItest {
+
+ @Test
+ public void testAnnotatedClassFound() throws Exception {
+ EntityManagerFactory emf = getEMF(TEST_UNIT);
+ EntityManager em = emf.createEntityManager();
+ em.getTransaction().begin();
+
+ Car c = new Car();
+ c.setColour("Blue");
+ c.setNumberPlate("AB11CDE");
+ c.setNumberOfSeats(7);
+ c.setEngineSize(1900);
+ em.persist(c);
+
+ em.getTransaction().commit();
+
+ assertEquals(7, em.find(Car.class, "AB11CDE").getNumberOfSeats());
+ }
- @Test
- public void testAnnotatedClassFound() throws Exception {
- EntityManagerFactory emf = context().getService(EntityManagerFactory.class, "(&(osgi.unit.name=test-unit)(" + PersistenceUnitConstants.CONTAINER_MANAGED_PERSISTENCE_UNIT + "=true))");
-
- EntityManager em = emf.createEntityManager();
-
- em.getTransaction().begin();
-
- Car c = new Car();
-
- c.setColour("Blue");
- c.setNumberPlate("AB11CDE");
- c.setNumberOfSeats(7);
- c.setEngineSize(1900);
-
- em.persist(c);
-
- em.getTransaction().commit();
-
- assertEquals(7, em.find(Car.class, "AB11CDE").getNumberOfSeats());
- }
-
- @org.ops4j.pax.exam.junit.Configuration
- public static Option[] configuration() {
- return testOptions(
- transactionBootDelegation(),
- paxLogging("INFO"),
-
- // Bundles
- mavenBundle("commons-lang", "commons-lang"),
- mavenBundle("commons-collections", "commons-collections"),
- mavenBundle("commons-pool", "commons-pool"),
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.ow2.asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
- mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api"),
- mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container"),
- mavenBundle("org.apache.derby", "derby"),
- mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
- mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
-
- mavenBundle("org.osgi", "org.osgi.compendium"),
-
-// vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"),
-
- mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.advanced.itest.bundle"),
-
- PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
- equinox().version("3.7.0.v20110613"));
- }
}
Modified: aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java (original)
+++ aries/branches/subsystemsR6/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java Mon Jun 30 16:54:57 2014
@@ -17,37 +17,37 @@ package org.apache.aries.jpa.advanced.fe
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.apache.aries.itest.ExtraOptions.*;
import java.util.Arrays;
-import javax.persistence.EntityManagerFactory;
-
-import org.apache.aries.jpa.container.PersistenceUnitConstants;
import org.apache.aries.jpa.container.advanced.itest.bundle.entities.Car;
import org.apache.openjpa.enhance.PersistenceCapable;
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.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-@RunWith(JUnit4TestRunner.class)
+// TODO The Test persistence unit does not seem to be created. Reenable when this works
public class OpenjpaWeavingAndAnnotationScanningTest extends JPAWeavingAndAnnotationScanningTest {
- @Configuration
- public static Option[] openjpaConfig() {
- return options(
- mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
- mavenBundle("org.apache.openjpa", "openjpa")
- );
- }
-
- @Test
- public void testClassIsWoven() throws Exception {
- context().getService(EntityManagerFactory.class, "(&(osgi.unit.name=test-unit)(" + PersistenceUnitConstants.CONTAINER_MANAGED_PERSISTENCE_UNIT + "=true))");
- assertTrue("Not PersistenceCapable", Arrays.asList(Car.class.getInterfaces())
- .contains(PersistenceCapable.class));
- }
-
+ @Configuration
+ public Option[] openjpaConfig() {
+ return options(
+ baseOptions(),
+ openJpa(),
+ derbyDataSourceFactory(),
+ ariesJpa(),
+ transactionWrapper(),
+
+ testBundleAdvanced()
+ );
+ }
+
+ @Test
+ public void testClassIsWoven() throws Exception {
+ showBundles();
+ getEMF(TEST_UNIT);
+ assertTrue("Not PersistenceCapable", Arrays.asList(Car.class.getInterfaces())
+ .contains(PersistenceCapable.class));
+ }
+
}