ACE-522 - upgrade to OSGi R6:
- use OSGi R6 as dependency for all but the agent bundles;
- the agent remains at OSGi R4 to allow it to be used for
older frameworks as well;
- all relevant tests now use a R6 compliant framework.
git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1726789 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/cnf/bnd.bnd b/cnf/bnd.bnd
index df177a6..9df6db8 100644
--- a/cnf/bnd.bnd
+++ b/cnf/bnd.bnd
@@ -1,3 +1,4 @@
-nobundles: true
--buildpath: biz.aQute.bnd;version=2.2.0,\
+-buildpath: \
+ biz.aQute.bnd;version=2.2.0,\
org.osgi.impl.bundle.bindex
\ No newline at end of file
diff --git a/cnf/build.bnd b/cnf/build.bnd
index afa31ba..861c089 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -9,6 +9,8 @@
## For example, to add one addtional plugin to the list defined in ext/repositories.bnd:
# -plugin: ${ext.repositories.-plugin}, org.example.MyPlugin
+javac.source: 1.7
+javac.target: 1.7
## If you use git, you might want to uncomment the following lines:
# Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
diff --git a/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar b/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar
new file mode 100644
index 0000000..5f229a4
--- /dev/null
+++ b/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar
Binary files differ
diff --git a/cnf/localrepo/index.xml b/cnf/localrepo/index.xml
index ba130a0..cf5c169 100644
--- a/cnf/localrepo/index.xml
+++ b/cnf/localrepo/index.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<repository increment="1453471155000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1453801257000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="aws-common"/>
@@ -7678,6 +7678,170 @@
</resource>
<resource>
<capability namespace="osgi.identity">
+ <attribute name="osgi.identity" value="org.apache.felix.framework"/>
+ <attribute name="type" value="osgi.bundle"/>
+ <attribute name="version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.content">
+ <attribute name="osgi.content" value="29d64139d8b1827b0ecbbb38982942238e2eeed1ee91dce8d3e2672b5a6960fb"/>
+ <attribute name="url" value="org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar"/>
+ <attribute name="size" type="Long" value="677905"/>
+ <attribute name="mime" value="application/vnd.osgi.bundle"/>
+ </capability>
+ <capability namespace="osgi.wiring.bundle">
+ <attribute name="osgi.wiring.bundle" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.wiring.host">
+ <attribute name="osgi.wiring.host" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework"/>
+ <attribute name="version" type="Version" value="1.8.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.dto"/>
+ <attribute name="version" type="Version" value="1.8.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.bundle"/>
+ <attribute name="version" type="Version" value="1.1.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.resolver"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework.wiring"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.service"/>
+ <attribute name="version" type="Version" value="1.1.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.weaving"/>
+ <attribute name="version" type="Version" value="1.1.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework.wiring"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.launch"/>
+ <attribute name="version" type="Version" value="1.2.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.namespace"/>
+ <attribute name="version" type="Version" value="1.1.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.resource"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel.dto"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring"/>
+ <attribute name="version" type="Version" value="1.2.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework,org.osgi.resource"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring.dto"/>
+ <attribute name="version" type="Version" value="1.2.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.dto,org.osgi.resource.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.resource"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.resource.dto"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.dto"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.service.packageadmin"/>
+ <attribute name="version" type="Version" value="1.2.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.service.startlevel"/>
+ <attribute name="version" type="Version" value="1.1.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.service.url"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.service.resolver"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.resource"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.util.tracker"/>
+ <attribute name="version" type="Version" value="1.5.1"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ <directive name="uses" value="org.osgi.framework"/>
+ </capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.osgi.dto"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+ <attribute name="bundle-version" type="Version" value="5.2.0"/>
+ </capability>
+ <capability namespace="osgi.contract">
+ <attribute name="osgi.contract" value="OSGiFramework"/>
+ <directive name="uses" value="org.osgi.framework,org.osgi.framework.dto,org.osgi.framework.hooks.bundle,org.osgi.framework.hooks.resolver,org.osgi.framework.hooks.service,org.osgi.framework.hooks.weaving,org.osgi.framework.launch,org.osgi.framework.namespace,org.osgi.framework.startlevel,org.osgi.framework.startlevel.dto,org.osgi.framework.wiring,org.osgi.framework.wiring.dto,org.osgi.resource,org.osgi.resource.dto,org.osgi.service.packageadmin,org.osgi.service.startlevel,org.osgi.service.url,org.osgi.service.resolver,org.osgi.util.tracker,org.osgi.dto"/>
+ </capability>
+ <requirement namespace="osgi.ee">
+ <directive name="filter" value="(&(osgi.ee=JavaSE)(version=1.6))"/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace="osgi.identity">
<attribute name="osgi.identity" value="org.apache.felix.gogo.command"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" type="Version" value="0.12.0"/>
diff --git a/cnf/localrepo/index.xml.sha b/cnf/localrepo/index.xml.sha
index b4ae48b..a2da6c5 100644
--- a/cnf/localrepo/index.xml.sha
+++ b/cnf/localrepo/index.xml.sha
@@ -1 +1 @@
-268ea703ab955c27bac260c994c9c12aaa72566cddf6b7ac053fbc8d34cf9d05
\ No newline at end of file
+9f55200dab88670ffa750a9152fe96ca89b17362c17d453a9f0d417afdd47442
\ No newline at end of file
diff --git a/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar b/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar
new file mode 100644
index 0000000..bcb53c2
--- /dev/null
+++ b/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar
Binary files differ
diff --git a/org.apache.ace.agent.controller.itest/bnd.bnd b/org.apache.ace.agent.controller.itest/bnd.bnd
index e45eca4..0582de5 100644
--- a/org.apache.ace.agent.controller.itest/bnd.bnd
+++ b/org.apache.ace.agent.controller.itest/bnd.bnd
@@ -26,7 +26,8 @@
-runee: JavaSE-1.6
-runvm: -ea
-runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: osgi.core;version='[4.2,5)',\
+-buildpath: \
+ osgi.core;version=4.2,\
org.apache.ace.agent;version=latest,\
org.apache.ace.builder;version=latest,\
org.apache.ace.test;version=latest,\
diff --git a/org.apache.ace.agent.itest/bnd.bnd b/org.apache.ace.agent.itest/bnd.bnd
index 88df3f5..2e846de 100644
--- a/org.apache.ace.agent.itest/bnd.bnd
+++ b/org.apache.ace.agent.itest/bnd.bnd
@@ -12,14 +12,14 @@
-runvm: -ea
-runfw: org.apache.felix.framework;version='[4,5)'
-buildpath: \
- osgi.core;version='[4.2,5)',\
+ osgi.core;version=4.2,\
org.apache.ace.agent;version=latest,\
org.apache.ace.builder;version=latest,\
org.apache.ace.test;version=latest,\
org.apache.felix.dependencymanager,\
org.apache.felix.http.jetty,\
junit.osgi,\
- org.mockito.mockito-all
+ org.mockito.mockito-all
-runsystempackages: sun.reflect
-runproperties: \
org.apache.felix.eventadmin.Timeout=0,\
diff --git a/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java b/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
index 7d12ff9..8a91427 100644
--- a/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
+++ b/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
@@ -21,6 +21,8 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.apache.ace.agent.AgentConstants;
@@ -82,6 +84,8 @@
}
private ServiceRegistration registerIdentification(final String id, final int rank) {
+ Dictionary<String, Object> props = new Hashtable<>();
+ props.put(Constants.SERVICE_RANKING, rank);
return m_bundleContext.registerService(IdentificationHandler.class.getName(), new IdentificationHandler() {
@Override
public String getAgentId() {
@@ -92,15 +96,12 @@
public String toString() {
return id;
}
- }, new Properties() {
- {
- put(Constants.SERVICE_RANKING, rank);
- }
- });
-
+ }, props);
}
private ServiceRegistration registerDiscovery(final URL url, final int rank) {
+ Dictionary<String, Object> props = new Hashtable<>();
+ props.put(Constants.SERVICE_RANKING, rank);
return m_bundleContext
.registerService(DiscoveryHandler.class.getName(), new DiscoveryHandler() {
@@ -108,12 +109,7 @@
public URL getServerUrl() {
return url;
}
- }, new Properties() {
- {
- put(Constants.SERVICE_RANKING, rank);
- }
- });
-
+ }, props);
}
private ServiceRegistration registerConnectionHandler() {
diff --git a/org.apache.ace.agent.launcher/bnd.bnd b/org.apache.ace.agent.launcher/bnd.bnd
index b68e74d..192a1d2 100644
--- a/org.apache.ace.agent.launcher/bnd.bnd
+++ b/org.apache.ace.agent.launcher/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core;version='[4.3,5)',\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
org.apache.commons.cli,\
org.apache.ace.agent;version=latest
-sources: false
diff --git a/org.apache.ace.agent.launcher/felix.bnd b/org.apache.ace.agent.launcher/felix.bnd
index ff9dd36..cf1f79e 100644
--- a/org.apache.ace.agent.launcher/felix.bnd
+++ b/org.apache.ace.agent.launcher/felix.bnd
@@ -6,7 +6,7 @@
Bundle-Description: Standalone launcher that start a Felix framework with an embedded ACE Agent
# Include the felix defaults
-felix.version=4.2.1
+felix.version=5.2.0
Include-Resource: @${repo;org.apache.felix.framework;${felix.version}}!/default.properties,\
@${repo;org.apache.felix.framework;${felix.version}}!/META-INF/services/*,\
diff --git a/org.apache.ace.agent.launcher/launch.bndrun b/org.apache.ace.agent.launcher/launch.bndrun
index e89b34a..fff49f7 100644
--- a/org.apache.ace.agent.launcher/launch.bndrun
+++ b/org.apache.ace.agent.launcher/launch.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles:\
diff --git a/org.apache.ace.agent.update.itest/bnd.bnd b/org.apache.ace.agent.update.itest/bnd.bnd
index 7d9e6fc..860ebe2 100644
--- a/org.apache.ace.agent.update.itest/bnd.bnd
+++ b/org.apache.ace.agent.update.itest/bnd.bnd
@@ -23,15 +23,16 @@
Private-Package: org.apache.ace.agent.itest
-runee: JavaSE-1.6
-runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: osgi.core;version='[4.2,5)',\
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
+-buildpath: \
+ osgi.core;version=6.0.0,\
org.apache.ace.agent;version=latest,\
org.apache.ace.test;version=latest,\
org.apache.felix.dependencymanager,\
org.apache.felix.http.jetty,\
biz.aQute.bnd,\
junit.osgi,\
- org.mockito.mockito-all
+ org.mockito.mockito-all
-runsystempackages: sun.reflect
-runproperties: \
org.apache.felix.eventadmin.Timeout=0,\
diff --git a/org.apache.ace.agent/bnd.bnd b/org.apache.ace.agent/bnd.bnd
index 448d6df..ed68695 100644
--- a/org.apache.ace.agent/bnd.bnd
+++ b/org.apache.ace.agent/bnd.bnd
@@ -29,7 +29,8 @@
# offline
#javac.debug: off
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
javax.servlet;version=2.5,\
@@ -41,10 +42,3 @@
org.apache.ace.feedback.common;version=latest
-sources false
--runfw: org.apache.felix.framework;version='[4,5)'
--runee: JavaSE-1.6
--runbundles: org.apache.felix.gogo.command,\
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell
--runproperties: agent.controller.syncdelay=1,\
- agent.identification.agentid=demo
diff --git a/org.apache.ace.authentication.itest/bnd.bnd b/org.apache.ace.authentication.itest/bnd.bnd
index 24a0008..d367ba4 100644
--- a/org.apache.ace.authentication.itest/bnd.bnd
+++ b/org.apache.ace.authentication.itest/bnd.bnd
@@ -1,6 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.authentication.AuthenticationTestBase}
--buildpath: junit.osgi,\
- osgi.core,\
+-buildpath: \
+ junit.osgi,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.ace.test;version=latest,\
org.apache.felix.dependencymanager,\
@@ -16,9 +17,9 @@
org.apache.ace.http.listener;version=latest,\
org.apache.ace.range.api;version=latest,\
org.apache.ace.obr.storage;version=latest,\
- org.apache.ace.log.api;version=latest,\
+ org.apache.ace.log.api;version=latest,\
org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: osgi.cmpn,\
org.apache.felix.log,\
diff --git a/org.apache.ace.authentication/bnd.bnd b/org.apache.ace.authentication/bnd.bnd
index b76fba0..4a4d541 100644
--- a/org.apache.ace.authentication/bnd.bnd
+++ b/org.apache.ace.authentication/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.mockito.mockito-all,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.bnd/bnd.bnd b/org.apache.ace.bnd/bnd.bnd
index 327203d..9470594 100644
--- a/org.apache.ace.bnd/bnd.bnd
+++ b/org.apache.ace.bnd/bnd.bnd
@@ -1,3 +1,4 @@
-sub: *.bnd
--buildpath: biz.aQute.bnd,\
+-buildpath: \
+ biz.aQute.bnd,\
biz.aQute.repository
diff --git a/org.apache.ace.builder/bnd.bnd b/org.apache.ace.builder/bnd.bnd
index fc491aa..df03072 100644
--- a/org.apache.ace.builder/bnd.bnd
+++ b/org.apache.ace.builder/bnd.bnd
@@ -1,4 +1,5 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
org.apache.ace.test;version=latest
Export-Package: org.apache.ace.builder
Bundle-Version: 2.0.0
diff --git a/org.apache.ace.client.automation/bnd.bnd b/org.apache.ace.client.automation/bnd.bnd
index 0bb6bc5..714115c 100644
--- a/org.apache.ace.client.automation/bnd.bnd
+++ b/org.apache.ace.client.automation/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.scheduler.api;version=latest,\
diff --git a/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java b/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
index b8f537e..5b39ae9 100644
--- a/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
+++ b/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
@@ -80,7 +81,7 @@
m_reposAdmin.login(loginContext);
// start refresh task
- Properties props = new Properties();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(SchedulerConstants.SCHEDULER_NAME_KEY, SCHEDULER_NAME);
m_serviceReg = m_bundleContext.registerService(Runnable.class.getName(), m_task, props);
}
diff --git a/org.apache.ace.client.repository.itest/bnd.bnd b/org.apache.ace.client.repository.itest/bnd.bnd
index 3dbecec..e1e7794 100644
--- a/org.apache.ace.client.repository.itest/bnd.bnd
+++ b/org.apache.ace.client.repository.itest/bnd.bnd
@@ -1,6 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
- osgi.core,\
+-buildpath: \
+ junit.osgi,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
@@ -21,7 +22,7 @@
org.apache.ace.client.repository.helper.bundle;version=latest,\
org.apache.ace.log.server.store.api;version=latest,\
org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: osgi.cmpn,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.client.repository/bnd.bnd b/org.apache.ace.client.repository/bnd.bnd
index 6abaf91..f9a8862 100644
--- a/org.apache.ace.client.repository/bnd.bnd
+++ b/org.apache.ace.client.repository/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.mockito.mockito-all,\
xpp3;version=1.1.4,\
diff --git a/org.apache.ace.client.rest.itest/bnd.bnd b/org.apache.ace.client.rest.itest/bnd.bnd
index a0519e6..733197c 100644
--- a/org.apache.ace.client.rest.itest/bnd.bnd
+++ b/org.apache.ace.client.rest.itest/bnd.bnd
@@ -1,5 +1,5 @@
-buildpath: \
- osgi.core,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
junit.osgi,\
javax.servlet,\
@@ -27,7 +27,7 @@
org.apache.ace.feedback.common;version=latest
-runee: JavaSE-1.7
-runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runbundles: \
osgi.cmpn,\
com.sun.jersey.client,\
diff --git a/org.apache.ace.client.rest/bnd.bnd b/org.apache.ace.client.rest/bnd.bnd
index be89a06..b9c207c 100644
--- a/org.apache.ace.client.rest/bnd.bnd
+++ b/org.apache.ace.client.rest/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
diff --git a/org.apache.ace.client.workspace/bnd.bnd b/org.apache.ace.client.workspace/bnd.bnd
index fec8297..8c5fdff 100644
--- a/org.apache.ace.client.workspace/bnd.bnd
+++ b/org.apache.ace.client.workspace/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
diff --git a/org.apache.ace.configurator.useradmin.itest/bnd.bnd b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
index 050030f..b0275ca 100644
--- a/org.apache.ace.configurator.useradmin.itest/bnd.bnd
+++ b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
@@ -1,6 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
- osgi.core,\
+-buildpath: \
+ junit.osgi,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
@@ -14,7 +15,7 @@
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: org.apache.felix.dependencymanager,\
org.apache.felix.configadmin,\
diff --git a/org.apache.ace.configurator/bnd.bnd b/org.apache.ace.configurator/bnd.bnd
index 59484dc..e5a3871 100644
--- a/org.apache.ace.configurator/bnd.bnd
+++ b/org.apache.ace.configurator/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.range.api;version=latest,\
diff --git a/org.apache.ace.connectionfactory/bnd.bnd b/org.apache.ace.connectionfactory/bnd.bnd
index 5c26aa7..9fad46b 100644
--- a/org.apache.ace.connectionfactory/bnd.bnd
+++ b/org.apache.ace.connectionfactory/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.ace.test;version=latest,\
org.apache.commons.codec;version=1.4
diff --git a/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java b/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java
index 6d37276..cc626d0 100644
--- a/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java
+++ b/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java
@@ -19,6 +19,8 @@
package org.apache.ace.connectionfactory.impl;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.apache.ace.connectionfactory.ConnectionFactory;
@@ -36,7 +38,7 @@
* {@inheritDoc}
*/
public void start(BundleContext context) throws Exception {
- Properties props = new Properties();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(Constants.SERVICE_PID, ConnectionFactoryImpl.FACTORY_PID);
props.put("impl.type", "jdk");
diff --git a/org.apache.ace.consolelogger/bnd.bnd b/org.apache.ace.consolelogger/bnd.bnd
index c76f893..bbf7978 100644
--- a/org.apache.ace.consolelogger/bnd.bnd
+++ b/org.apache.ace.consolelogger/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager
Private-Package: org.apache.ace.consolelogger
diff --git a/org.apache.ace.deployment.itest/bnd.bnd b/org.apache.ace.deployment.itest/bnd.bnd
index f348213..aa91fb2 100644
--- a/org.apache.ace.deployment.itest/bnd.bnd
+++ b/org.apache.ace.deployment.itest/bnd.bnd
@@ -1,6 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
- osgi.core,\
+-buildpath: \
+ junit.osgi,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
javax.servlet,\
org.apache.felix.dependencymanager,\
@@ -19,7 +20,7 @@
org.apache.ace.feedback.common;version=latest,\
org.apache.ace.deployment.provider.base;version=latest,\
org.apache.ace.deployment.task;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: osgi.cmpn,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java b/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
index 29880a8..a055ef6 100644
--- a/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
+++ b/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
@@ -22,6 +22,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -333,7 +335,7 @@
}
private void executeTest() throws IOException, InterruptedException {
- Properties props = new Properties();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(EventConstants.EVENT_TOPIC, "org/osgi/service/deployment/COMPLETE");
props.put(EventConstants.EVENT_FILTER, "(successful=true)");
@@ -387,7 +389,7 @@
}
private void registerDeploymentAdminProxy(DeploymentAdmin proxy) {
- Properties props = new Properties();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put(org.osgi.framework.Constants.SERVICE_RANKING, 1);
m_deploymentAdminProxyReg = m_bundleContext.registerService(DeploymentAdmin.class.getName(), proxy, props);
}
diff --git a/org.apache.ace.deployment/bnd.bnd b/org.apache.ace.deployment/bnd.bnd
index f5e7097..18ead71 100644
--- a/org.apache.ace.deployment/bnd.bnd
+++ b/org.apache.ace.deployment/bnd.bnd
@@ -1,6 +1,6 @@
-buildpath: \
${^-buildpath},\
- osgi.core,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
javax.servlet,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.discovery/bnd.bnd b/org.apache.ace.discovery/bnd.bnd
index d3e5a14..db4c3cb 100644
--- a/org.apache.ace.discovery/bnd.bnd
+++ b/org.apache.ace.discovery/bnd.bnd
@@ -1,4 +1,6 @@
--buildpath: ${^-buildpath}, osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
diff --git a/org.apache.ace.feedback.common/bnd.bnd b/org.apache.ace.feedback.common/bnd.bnd
index eaecd93..d17e631 100644
--- a/org.apache.ace.feedback.common/bnd.bnd
+++ b/org.apache.ace.feedback.common/bnd.bnd
@@ -4,6 +4,7 @@
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Feedback API
Bundle-Description: Provides the Apache ACE Feedback API packages
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
org.apache.ace.range.api;version=latest,\
org.apache.ace.test;version=latest
\ No newline at end of file
diff --git a/org.apache.ace.gogo.servlet/bnd.bnd b/org.apache.ace.gogo.servlet/bnd.bnd
index 4a397dd..56e7d0a 100644
--- a/org.apache.ace.gogo.servlet/bnd.bnd
+++ b/org.apache.ace.gogo.servlet/bnd.bnd
@@ -1,6 +1,7 @@
Bundle-Version: 1.0.0
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
diff --git a/org.apache.ace.gogo/bnd.bnd b/org.apache.ace.gogo/bnd.bnd
index e6609a9..9a98c5d 100644
--- a/org.apache.ace.gogo/bnd.bnd
+++ b/org.apache.ace.gogo/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
biz.aQute.repository;version=2.1.0,\
biz.aQute.bnd;version=2.1.0,\
org.osgi.impl.bundle.repoindex.lib,\
diff --git a/org.apache.ace.http.itest/bnd.bnd b/org.apache.ace.http.itest/bnd.bnd
index 7e0cdb3..bb7a89c 100644
--- a/org.apache.ace.http.itest/bnd.bnd
+++ b/org.apache.ace.http.itest/bnd.bnd
@@ -1,6 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
- osgi.core,\
+-buildpath: \
+ junit.osgi,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
@@ -12,7 +13,7 @@
org.apache.ace.log.server.store.api;version=latest,\
javax.servlet,\
org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: osgi.cmpn,\
org.apache.felix.eventadmin,\
diff --git a/org.apache.ace.http/bnd.bnd b/org.apache.ace.http/bnd.bnd
index f838735..cf412de 100644
--- a/org.apache.ace.http/bnd.bnd
+++ b/org.apache.ace.http/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet
diff --git a/org.apache.ace.identification/bnd.bnd b/org.apache.ace.identification/bnd.bnd
index b39964b..e621cb5 100644
--- a/org.apache.ace.identification/bnd.bnd
+++ b/org.apache.ace.identification/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.mockito.mockito-all,\
diff --git a/org.apache.ace.location.upnp/bnd.bnd b/org.apache.ace.location.upnp/bnd.bnd
index d28fa19..a3ebeea 100644
--- a/org.apache.ace.location.upnp/bnd.bnd
+++ b/org.apache.ace.location.upnp/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet
diff --git a/org.apache.ace.log.itest/bnd.bnd b/org.apache.ace.log.itest/bnd.bnd
index 51035fd..9a15707 100644
--- a/org.apache.ace.log.itest/bnd.bnd
+++ b/org.apache.ace.log.itest/bnd.bnd
@@ -1,7 +1,8 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
junit.osgi,\
- osgi.core,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
@@ -13,7 +14,7 @@
org.apache.ace.log.server.store.api;version=latest,\
org.apache.ace.feedback.common;version=latest,\
org.apache.ace.log.api;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runbundles: javax.servlet,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.log.server.store.itest/bnd.bnd b/org.apache.ace.log.server.store.itest/bnd.bnd
index 7bb434d..3d1ef3e 100644
--- a/org.apache.ace.log.server.store.itest/bnd.bnd
+++ b/org.apache.ace.log.server.store.itest/bnd.bnd
@@ -16,8 +16,9 @@
org.apache.ace.feedback.common;version=latest
Private-Package: org.apache.ace.log.server.store.tests
-runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: osgi.core,\
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
+-buildpath: \
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
junit.osgi,\
org.mongodb.mongo-java-driver,\
diff --git a/org.apache.ace.log.server.ui/bnd.bnd b/org.apache.ace.log.server.ui/bnd.bnd
index 324b860..28ec515 100644
--- a/org.apache.ace.log.server.ui/bnd.bnd
+++ b/org.apache.ace.log.server.ui/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
diff --git a/org.apache.ace.log/bnd.bnd b/org.apache.ace.log/bnd.bnd
index 98d3c91..994f0da 100644
--- a/org.apache.ace.log/bnd.bnd
+++ b/org.apache.ace.log/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
javax.servlet,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.nodelauncher/bnd.bnd b/org.apache.ace.nodelauncher/bnd.bnd
index 5a6067b..026cd75 100644
--- a/org.apache.ace.nodelauncher/bnd.bnd
+++ b/org.apache.ace.nodelauncher/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
diff --git a/org.apache.ace.obr/bnd.bnd b/org.apache.ace.obr/bnd.bnd
index 9fd7b9f..09c345c 100644
--- a/org.apache.ace.obr/bnd.bnd
+++ b/org.apache.ace.obr/bnd.bnd
@@ -1,6 +1,7 @@
-sub: *.bnd
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
diff --git a/org.apache.ace.processlauncher.itest/bnd.bnd b/org.apache.ace.processlauncher.itest/bnd.bnd
index 40536ee..c09b3ab 100644
--- a/org.apache.ace.processlauncher.itest/bnd.bnd
+++ b/org.apache.ace.processlauncher.itest/bnd.bnd
@@ -3,11 +3,11 @@
${^-buildpath},\
org.apache.felix.dependencymanager,\
junit.osgi,\
- osgi.core,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.ace.test;version=latest,\
org.apache.ace.processlauncher;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: \
osgi.cmpn,\
diff --git a/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java b/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java
index 34cde2c..6bce46e 100644
--- a/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java
+++ b/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.apache.ace.it.IntegrationTestBase;
@@ -286,13 +288,13 @@
String className = ProcessStreamListener.class.getName();
String extraFilter = "";
- Properties props = new Properties();
+ Dictionary<String, Object> props = new Hashtable<>();
for (int i = 0; i < properties.length; i += 2) {
String key = properties[i];
String value = properties[i + 1];
extraFilter = String.format("%s(%s=%s)", extraFilter, key, value);
- props.setProperty(key, value);
+ props.put(key, value);
}
m_context.registerService(className, processStreamListener, props);
diff --git a/org.apache.ace.processlauncher/bnd.bnd b/org.apache.ace.processlauncher/bnd.bnd
index 395bf7e..0eda6a3 100644
--- a/org.apache.ace.processlauncher/bnd.bnd
+++ b/org.apache.ace.processlauncher/bnd.bnd
@@ -2,7 +2,7 @@
${^-buildpath},\
org.apache.felix.dependencymanager,\
org.mockito.mockito-all,\
- osgi.core,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.ace.test;version=latest
Private-Package: \
diff --git a/org.apache.ace.range.api/bnd.bnd b/org.apache.ace.range.api/bnd.bnd
index 5eb29a5..d132c80 100644
--- a/org.apache.ace.range.api/bnd.bnd
+++ b/org.apache.ace.range.api/bnd.bnd
@@ -1,4 +1,5 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
org.apache.ace.test;version=latest
Export-Package: org.apache.ace.range
Bundle-Version: 1.1.0
diff --git a/org.apache.ace.repository.itest/bnd.bnd b/org.apache.ace.repository.itest/bnd.bnd
index 6c324f2..38bce3b 100644
--- a/org.apache.ace.repository.itest/bnd.bnd
+++ b/org.apache.ace.repository.itest/bnd.bnd
@@ -1,6 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
- osgi.core;version='[4.1,5)',\
+-buildpath: \
+ junit.osgi,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.mockito.mockito-all,\
org.apache.ace.test;version=latest,\
@@ -8,8 +9,8 @@
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
org.apache.ace.repository.servlet;version=latest,\
- org.apache.felix.dependencymanager
--runfw: org.apache.felix.framework;version='[4,5)'
+ org.apache.felix.dependencymanager
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runvm: -ea
-runbundles: osgi.cmpn,\
org.apache.felix.log,\
diff --git a/org.apache.ace.repository/bnd.bnd b/org.apache.ace.repository/bnd.bnd
index 3ee4ed8..72f9df4 100644
--- a/org.apache.ace.repository/bnd.bnd
+++ b/org.apache.ace.repository/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
diff --git a/org.apache.ace.resourceprocessor.useradmin/bnd.bnd b/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
index 63c62f5..9b323e0 100644
--- a/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
+++ b/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager
Private-Package: org.apache.ace.resourceprocessor.useradmin.impl
diff --git a/org.apache.ace.scheduler/bnd.bnd b/org.apache.ace.scheduler/bnd.bnd
index f2bdfdc..539cd96 100644
--- a/org.apache.ace.scheduler/bnd.bnd
+++ b/org.apache.ace.scheduler/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest
diff --git a/org.apache.ace.tageditor/bnd.bnd b/org.apache.ace.tageditor/bnd.bnd
index 2f99da3..3c48414 100644
--- a/org.apache.ace.tageditor/bnd.bnd
+++ b/org.apache.ace.tageditor/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
diff --git a/org.apache.ace.target.mgmt.ui/bnd.bnd b/org.apache.ace.target.mgmt.ui/bnd.bnd
index d686fc2..761e193 100644
--- a/org.apache.ace.target.mgmt.ui/bnd.bnd
+++ b/org.apache.ace.target.mgmt.ui/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
diff --git a/org.apache.ace.test/bnd.bnd b/org.apache.ace.test/bnd.bnd
index 9d37b2b..09e38a9 100644
--- a/org.apache.ace.test/bnd.bnd
+++ b/org.apache.ace.test/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=4.2,\
osgi.cmpn,\
junit.osgi,\
org.apache.felix.gogo.runtime,\
diff --git a/org.apache.ace.useradmin.ui.itest/bnd.bnd b/org.apache.ace.useradmin.ui.itest/bnd.bnd
index e7b56db..0ffa151 100644
--- a/org.apache.ace.useradmin.ui.itest/bnd.bnd
+++ b/org.apache.ace.useradmin.ui.itest/bnd.bnd
@@ -1,7 +1,7 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
Private-Package: org.apache.ace.useradmin.ui.test
-runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runbundles: osgi.cmpn,\
com.vaadin,\
org.apache.felix.configadmin,\
@@ -36,7 +36,8 @@
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.log.server.store.api;version=latest,\
org.apache.ace.feedback.common;version=latest
--buildpath: osgi.core;version='[4.1,5)',\
+-buildpath: \
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
junit.osgi,\
org.mockito.mockito-all,\
diff --git a/org.apache.ace.useradmin.ui/bnd.bnd b/org.apache.ace.useradmin.ui/bnd.bnd
index b8a8fea..bd48b64 100644
--- a/org.apache.ace.useradmin.ui/bnd.bnd
+++ b/org.apache.ace.useradmin.ui/bnd.bnd
@@ -1,6 +1,7 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
org.apache.felix.dependencymanager,\
- osgi.core,\
+ osgi.core;version=6.0.0,\
osgi.cmpn,\
com.vaadin,\
org.apache.ace.client.repository.api;version=latest,\
diff --git a/org.apache.ace.verifier/bnd.bnd b/org.apache.ace.verifier/bnd.bnd
index d0cc878..b78ff56 100644
--- a/org.apache.ace.verifier/bnd.bnd
+++ b/org.apache.ace.verifier/bnd.bnd
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
- osgi.core;version=4.3.1,\
+-buildpath: \
+ ${^-buildpath},\
+ osgi.core;version=6.0.0,\
osgi.cmpn;version=4.3.1,\
javax.servlet,\
org.apache.felix.dependencymanager,\
diff --git a/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java b/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java
index f3bfdaa..6918fb7 100644
--- a/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java
+++ b/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java
@@ -37,6 +37,8 @@
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
/**
*
@@ -141,6 +143,13 @@
public List<BundleCapability> getDeclaredCapabilities(String namespace) {
return m_declaredCaps;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Capability> getCapabilities(String namespace) {
+ return new ArrayList<Capability>(m_declaredCaps);
+ }
/**
* {@inheritDoc}
@@ -148,6 +157,13 @@
public List<BundleRequirement> getDeclaredRequirements(String namespace) {
return m_declaredReqs;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Requirement> getRequirements(String namespace) {
+ return new ArrayList<Requirement>(m_declaredReqs);
+ }
/**
* {@inheritDoc}
diff --git a/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java b/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
index 3f052bb..f441747 100644
--- a/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
+++ b/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
@@ -29,6 +29,8 @@
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
class HostBundleRevision implements BundleRevision
{
@@ -93,6 +95,10 @@
return m_cachedCapabilities;
}
+ public List<Capability> getCapabilities(String namespace) {
+ return new ArrayList<Capability>(getCapabilities(namespace));
+ }
+
public List<BundleRequirement> getDeclaredRequirements(String namespace)
{
if (m_cachedRequirements == null)
@@ -123,6 +129,10 @@
}
return m_cachedRequirements;
}
+
+ public List<Requirement> getRequirements(String namespace) {
+ return new ArrayList<Requirement>(getDeclaredRequirements(namespace));
+ }
public int getTypes()
{
diff --git a/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java b/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
index 308e270..10338c1 100644
--- a/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
+++ b/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
@@ -133,6 +133,10 @@
{
return m_revision;
}
+
+ public BundleRevision getResource() {
+ return getRevision();
+ }
public String getNamespace()
{
diff --git a/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java b/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java
index 6a69fc8..e079036 100644
--- a/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java
+++ b/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java
@@ -83,6 +83,10 @@
{
return m_revision;
}
+
+ public BundleRevision getResource() {
+ return getRevision();
+ }
public boolean matches(BundleCapability cap)
{
diff --git a/org.apache.ace.webui.vaadin/bnd.bnd b/org.apache.ace.webui.vaadin/bnd.bnd
index 3d9d482..9783cfc 100644
--- a/org.apache.ace.webui.vaadin/bnd.bnd
+++ b/org.apache.ace.webui.vaadin/bnd.bnd
@@ -1,4 +1,5 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+ ${^-buildpath},\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
com.vaadin;version=latest,\
@@ -7,7 +8,7 @@
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.authentication.impl;version=latest,\
javax.servlet,\
- osgi.core;version=4.1.0
+ osgi.core;version=6.0.0
Private-Package: org.apache.ace.webui.domain,\
org.apache.ace.webui.vaadin,\
org.apache.ace.webui.vaadin.component
diff --git a/run-client/client.bndrun b/run-client/client.bndrun
index 0e3aa0e..c46e83d 100644
--- a/run-client/client.bndrun
+++ b/run-client/client.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
diff --git a/run-develop/develop.bndrun b/run-develop/develop.bndrun
index ab25484..24b65f8 100644
--- a/run-develop/develop.bndrun
+++ b/run-develop/develop.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.gogo.command,\
org.apache.felix.gogo.runtime,\
diff --git a/run-obr/obr.bndrun b/run-obr/obr.bndrun
index d00da03..5bd5dc0 100644
--- a/run-obr/obr.bndrun
+++ b/run-obr/obr.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.dependencymanager,\
org.apache.felix.dependencymanager.shell,\
diff --git a/run-relay/relay.bndrun b/run-relay/relay.bndrun
index a1a427e..47e198c 100644
--- a/run-relay/relay.bndrun
+++ b/run-relay/relay.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
diff --git a/run-server-allinone/server-allinone.bndrun b/run-server-allinone/server-allinone.bndrun
index ec6edd0..03b7882 100644
--- a/run-server-allinone/server-allinone.bndrun
+++ b/run-server-allinone/server-allinone.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
diff --git a/run-server/server.bndrun b/run-server/server.bndrun
index c950965..8b1912f 100644
--- a/run-server/server.bndrun
+++ b/run-server/server.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
diff --git a/run-target/target.bndrun b/run-target/target.bndrun
index 591128b..bf93c9c 100644
--- a/run-target/target.bndrun
+++ b/run-target/target.bndrun
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.6
-runbundles: \
org.apache.ace.agent;version=latest
