You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2014/03/25 15:15:55 UTC
svn commit: r1581337 [4/4] - in /ace/branches/1.0.0-semanticversion: build/
cnf/ cnf/buildrepo/biz.aQute.junit/ cnf/buildrepo/biz.aQute.launcher/
cnf/buildrepo/ee.minimum/ cnf/buildrepo/org.easymock/
cnf/buildrepo/org.osgi.ee.foundation/ cnf/buildrepo/...
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.http/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.http/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.http/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.http/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.http.listener.constants;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface HttpConstants
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.identification/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.identification/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.identification/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.identification/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java Tue Mar 25 14:15:50 2014
@@ -18,10 +18,13 @@
*/
package org.apache.ace.identification;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The Identification service can be used to identify the system it is running on. This
* identification must be unique and must not change.
*/
+@ProviderType
public interface Identification
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.launcher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.launcher/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.launcher/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.launcher/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
-sources: false
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
org.apache.felix.dependencymanager,\
org.apache.felix.framework,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,9 @@ package org.apache.ace.location;
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface LocationService
{
public URL getLocation();
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/UPnPConstants.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/UPnPConstants.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/UPnPConstants.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/UPnPConstants.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.location.upnp;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface UPnPConstants
{
public final static String PROVISIONING_DEVICE_TYPE = "urn:schemas-upnp-org:device:ProvisioningDevice:1";
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/HostUtil.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/HostUtil.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/HostUtil.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.location.upnp/src/org/apache/ace/location/upnp/util/HostUtil.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,9 @@ package org.apache.ace.location.upnp.uti
import java.net.InetAddress;
import java.net.UnknownHostException;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class HostUtil
{
private HostUtil() {}
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath}, junit.osgi,\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.store.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.store.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.store.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.store.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -19,7 +19,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
Private-Package: org.apache.ace.log.server.store.tests
-runvm: -ea
-runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
junit.osgi,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.ui/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.ui/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log.server.ui/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.log.api;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
javax.servlet,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/AuditEvent.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/AuditEvent.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/AuditEvent.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/AuditEvent.java Tue Mar 25 14:15:50 2014
@@ -18,10 +18,13 @@
*/
package org.apache.ace.log;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Audit log event. These events are recorded in the audit log, which keeps track of
* all life cycle events that occur on a target.
*/
+@ProviderType
public interface AuditEvent
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/Log.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/Log.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/Log.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/Log.java Tue Mar 25 14:15:50 2014
@@ -20,10 +20,13 @@ package org.apache.ace.log;
import java.util.Dictionary;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Log interface for a fairly generic logging mechanism, where each log entry has a type
* and a dictionary of properties.
*/
+@ProviderType
public interface Log
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogDescriptor.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogDescriptor.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogDescriptor.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogDescriptor.java Tue Mar 25 14:15:50 2014
@@ -24,6 +24,8 @@ import java.util.StringTokenizer;
import org.apache.ace.range.SortedRangeSet;
import org.apache.ace.log.util.Codec;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Instances of this class represent a range of log events. Such a range is defined by:
* <ul>
@@ -32,6 +34,7 @@ import org.apache.ace.log.util.Codec;
* <li>A set of event IDs</li>
* </ul>
*/
+@ProviderType
public class LogDescriptor {
private final SortedRangeSet m_rangeSet;
private final long m_logID;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogEvent.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogEvent.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogEvent.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogEvent.java Tue Mar 25 14:15:50 2014
@@ -24,9 +24,12 @@ import java.util.Properties;
import java.util.StringTokenizer;
import org.apache.ace.log.util.Codec;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Log event from a specific target and log.
*/
+@ProviderType
public class LogEvent implements Comparable {
private final String m_targetID;
private final long m_logID;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogSync.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogSync.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/LogSync.java Tue Mar 25 14:15:50 2014
@@ -20,10 +20,13 @@ package org.apache.ace.log;
import java.io.IOException;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Log synchronizing interface. It is intended to give direct access to the synchronizing
* possibilities of the server side log.
*/
+@ProviderType
public interface LogSync
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java Tue Mar 25 14:15:50 2014
@@ -24,9 +24,12 @@ import java.util.List;
import org.apache.ace.log.LogDescriptor;
import org.apache.ace.log.LogEvent;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Log store interface. Implementation of this service interface provide a persisted storage for LogEvent logs.
*/
+@ProviderType
public interface LogStore
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java Tue Mar 25 14:15:50 2014
@@ -24,10 +24,13 @@ import java.util.List;
import org.apache.ace.log.LogEvent;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Server log store interface for the targets. Implementations of this service interface provide a persisted storage for
* log data.
*/
+@ProviderType
public interface LogStore
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.managementagent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.managementagent/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.managementagent/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.managementagent/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
org.apache.felix.configadmin,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,8 @@ package org.apache.ace.nodelauncher;
import java.util.Properties;
+import aQute.bnd.annotation.ProviderType;
+
/**
* A TargetLauncher starts, stops and interrogates named nodes. These nodes
* represent running JVMs in some sense; they can be provided by some
@@ -29,6 +31,7 @@ import java.util.Properties;
* either a single Management Agent, which can be identified by the <code>id</code>,
* or a Node Manager.
*/
+@ProviderType
public interface NodeLauncher {
/**
* Starts a new node with the given ID. Does not check whether this ID is already in use.
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,8 @@
*/
package org.apache.ace.nodelauncher;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Empty interface that should be implemented by NodeLauncherConfig implmentation. The interface is empty
* because configuration is very different for each kind of node (e.g. an embedded node vs a jclouds node) it's
@@ -26,6 +28,7 @@ package org.apache.ace.nodelauncher;
* Clients of this interface (e.g. UI) should cast this interface to the concrete implementation it's built for.
*
*/
+@ProviderType
public interface NodeLauncherConfig {
}
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,8 @@
*/
package org.apache.ace.nodelauncher.amazon;
+import aQute.bnd.annotation.ProviderType;
+
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
import org.apache.ace.nodelauncher.NodeLauncherConfig;
@@ -35,6 +37,7 @@ import java.net.URL;
import java.util.Properties;
import java.util.Set;
+@ProviderType
public class JcloudsNodeLauncherConfig implements NodeLauncherConfig {
private ComputeServiceContext m_computeServiceContext;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
-sub: *.bnd
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,9 @@ package org.apache.ace.obr.metadata;
import java.io.File;
import java.io.IOException;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface MetadataGenerator
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java Tue Mar 25 14:15:50 2014
@@ -5,6 +5,8 @@ import java.io.InputStream;
import org.osgi.service.cm.ManagedService;
+import aQute.bnd.annotation.ProviderType;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,6 +26,7 @@ import org.osgi.service.cm.ManagedServic
* under the License.
*/
+@ProviderType
public interface BundleStore extends ManagedService {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java Tue Mar 25 14:15:50 2014
@@ -24,12 +24,15 @@ import java.util.zip.*;
import org.osgi.service.obr.Resource;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Convert a bundle to a generic resource description and store its local
* dependencies (like for example a license file in the JAR) in a zip file.
*
* @version $Revision: 44 $
*/
+@ProviderType
public class BundleInfo {
Manifest manifest;
File bundleJar;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java Tue Mar 25 14:15:50 2014
@@ -22,8 +22,11 @@ import java.util.*;
import org.osgi.service.obr.Capability;
import org.xmlpull.v1.XmlPullParser;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class CapabilityImpl implements Capability {
String name;
Map properties = new TreeMap();
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java Tue Mar 25 14:15:50 2014
@@ -25,6 +25,9 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class FilterImpl {
final char WILDCARD = 65535;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java Tue Mar 25 14:15:50 2014
@@ -20,7 +20,10 @@ package org.osgi.impl.bundle.obr.resourc
import java.io.*;
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class Manifest extends Hashtable {
static final long serialVersionUID = 1L;
List imports;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java Tue Mar 25 14:15:50 2014
@@ -19,7 +19,10 @@ package org.osgi.impl.bundle.obr.resourc
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class ManifestEntry implements Comparable {
String name;
VersionRange version;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java Tue Mar 25 14:15:50 2014
@@ -17,6 +17,9 @@
*/
package org.osgi.impl.bundle.obr.resource;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
class Parameter {
final static int ATTRIBUTE = 1;
final static int DIRECTIVE = 2;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java Tue Mar 25 14:15:50 2014
@@ -27,12 +27,15 @@ import org.kxml2.io.KXmlParser;
import org.osgi.service.obr.*;
import org.xmlpull.v1.*;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Implements the basic repository. A repository holds a set of resources.
*
*
* @version $Revision: 44 $
*/
+@ProviderType
public class RepositoryImpl implements Repository {
transient Set resources = new HashSet();
URL url;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,8 @@ package org.osgi.impl.bundle.obr.resourc
import org.osgi.service.obr.*;
import org.xmlpull.v1.XmlPullParser;
+import aQute.bnd.annotation.ProviderType;
+
/**
@@ -28,6 +30,7 @@ import org.xmlpull.v1.XmlPullParser;
*
* @version $Revision: 44 $
*/
+@ProviderType
public class RequirementImpl implements Requirement {
int id;
String name;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java Tue Mar 25 14:15:50 2014
@@ -25,6 +25,9 @@ import org.osgi.framework.Version;
import org.osgi.service.obr.*;
import org.xmlpull.v1.XmlPullParser;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class ResourceImpl implements Resource {
List capabilities = new ArrayList();
List requirements = new ArrayList();
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,9 @@ package org.osgi.impl.bundle.obr.resourc
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class StringSet extends HashSet {
static final long serialVersionUID = 1L;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java Tue Mar 25 14:15:50 2014
@@ -21,12 +21,15 @@ import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The Tag class represents a minimal XML tree. It consist of a named element
* with a hashtable of named attributes. Methods are provided to walk the tree
* and get its constituents. The content of a Tag is a list that contains String
* objects or other Tag objects.
*/
+@ProviderType
public class Tag {
Tag parent;
String name;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java Tue Mar 25 14:15:50 2014
@@ -22,6 +22,9 @@ import java.util.regex.*;
import org.osgi.framework.*;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class VersionRange implements Comparable {
Version high;
Version low;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: org.apache.felix.dependencymanager,\
+-buildpath: ${^-buildpath}, org.apache.felix.dependencymanager,\
org.mockito.mockito-all,\
osgi.core,\
osgi.cmpn,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,8 @@ package org.apache.ace.processlauncher;
import java.io.File;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Denotes a particular launch configuration for a process, describing what and how to launch.
* <p>
@@ -66,6 +68,7 @@ import java.io.File;
* #executable.normalExitValue = 0
* </pre>
*/
+@ProviderType
public interface LaunchConfiguration {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java Tue Mar 25 14:15:50 2014
@@ -20,10 +20,13 @@ package org.apache.ace.processlauncher;
import java.io.IOException;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Provides a managed service factory for launching processes based on a certain launch
* configuration.
*/
+@ProviderType
public interface ProcessLauncherService {
/** The service PID that is used for registration of this service factory. */
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,8 @@ package org.apache.ace.processlauncher;
import java.util.Properties;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Allows code to be run <em>before</em> a process is actually launched, and <em>after</em> a
* process is terminated.
@@ -28,6 +30,7 @@ import java.util.Properties;
* directories and/or configuration files for each individually launched process.
* </p>
*/
+@ConsumerType
public interface ProcessLifecycleListener {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java Tue Mar 25 14:15:50 2014
@@ -21,9 +21,12 @@ package org.apache.ace.processlauncher;
import java.io.InputStream;
import java.io.OutputStream;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Provides a listener interface for interacting with a process' input/output stream.
*/
+@ConsumerType
public interface ProcessStreamListener {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: org.apache.ace.test;version=latest
+-buildpath: ${^-buildpath}, org.apache.ace.test;version=latest
Export-Package: org.apache.ace.range
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Range API
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/Range.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/Range.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/Range.java Tue Mar 25 14:15:50 2014
@@ -18,9 +18,12 @@
*/
package org.apache.ace.range;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Class that captures a simple, modifiable range.
*/
+@ProviderType
public class Range
{
private long m_low;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,8 @@ package org.apache.ace.range;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Iterates over a <code>SortedRangeSet</code>. Does not exactly implement
* the <code>Iterator</code> interface because we have <code>long</code>
@@ -28,6 +30,7 @@ import java.util.NoSuchElementException;
* is not thread-safe and results are unpredictable if the underlying set is
* modified.
*/
+@ProviderType
public class RangeIterator
{
private final Iterator m_iterator;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java Tue Mar 25 14:15:50 2014
@@ -24,10 +24,13 @@ import java.util.List;
import java.util.ListIterator;
import java.util.StringTokenizer;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Collection that stores a sorted set of ranges and is able to represent them
* as a string.
*/
+@ProviderType
public class SortedRangeSet
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,6 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath},\
+ junit.osgi,\
osgi.core;version='[4.1,5)',\
osgi.cmpn,\
org.mockito.mockito-all,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java Tue Mar 25 14:15:50 2014
@@ -23,9 +23,12 @@ import java.io.InputStream;
import org.apache.ace.range.SortedRangeSet;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Providing full access to a repository, which includes read and write access.
*/
+@ProviderType
public interface Repository
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java Tue Mar 25 14:15:50 2014
@@ -23,9 +23,12 @@ import java.io.InputStream;
import org.apache.ace.range.SortedRangeSet;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The interface for replication of the data in a repository.
*/
+@ProviderType
public interface RepositoryReplication
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java Tue Mar 25 14:15:50 2014
@@ -21,12 +21,15 @@ package org.apache.ace.repository.ext;
import java.io.IOException;
import java.io.InputStream;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Provides an interface for backing up objects. <code>write</code> and <code>read</code>
* allow writing and reading of the current version of the object. <code>backup</code>
* backs up the object, and <code>restore</code> restores it from a previously backed up
* version, if any. There is no way to directly use the backup.
*/
+@ProviderType
public interface BackupRepository
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java Tue Mar 25 14:15:50 2014
@@ -22,10 +22,13 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.ace.repository.Repository;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Provides a cached repository representation, allowing the storing of local changes, without
* committing them to the actual repository immediately.
*/
+@ProviderType
public interface CachedRepository extends Repository {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java Tue Mar 25 14:15:50 2014
@@ -28,12 +28,15 @@ import org.apache.ace.repository.Reposit
import org.apache.ace.repository.ext.BackupRepository;
import org.apache.ace.repository.ext.CachedRepository;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Provides a CachedRepository, which uses either a <code>Repository</code> and a <code>BackupRepository</code>
* as remote and local storage, or a URL location and two files, from which it will create a <code>Repository</code>
* and a <code>FileBasedBackupRepository</code>. Note that this class is not thread-safe, and should be synchronized
* by the caller.
*/
+@ConsumerType
public class CachedRepositoryImpl implements CachedRepository {
public static final long UNCOMMITTED_VERSION = -1;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java Tue Mar 25 14:15:50 2014
@@ -29,10 +29,13 @@ import java.io.OutputStream;
import org.apache.ace.repository.ext.BackupRepository;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* A file-based implementation of the Backup Repository, using two files to store the current
* and backup version.
*/
+@ConsumerType
public class FilebasedBackupRepository implements BackupRepository {
private static final int COPY_BUFFER_SIZE = 4096;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java Tue Mar 25 14:15:50 2014
@@ -33,10 +33,13 @@ import org.apache.ace.connectionfactory.
import org.apache.ace.range.SortedRangeSet;
import org.apache.ace.repository.Repository;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* This class works as a local interface for a remote repository by handling the network
* communication.
*/
+@ConsumerType
public class RemoteRepository implements Repository {
private static final String COMMAND_QUERY = "/query";
private static final String COMMAND_CHECKOUT = "/checkout";
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java Tue Mar 25 14:15:50 2014
@@ -23,6 +23,8 @@ import java.io.InputStream;
import org.w3c.dom.Document;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The UserAdminConfigurator can be used to install, remove or explicitly set the users that
* should be present in the system's UserAdmin.<br>
@@ -52,6 +54,7 @@ import org.w3c.dom.Document;
* data around until one is, and update it with all data it has received up to then.
* Note that UserAdminStore is intended to work with one UserAdmin at a time.
*/
+@ProviderType
public interface UserAdminConfigurator
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java Tue Mar 25 14:15:50 2014
@@ -18,9 +18,12 @@
*/
package org.apache.ace.scheduler.constants;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Compile time constants for the scheduler.
*/
+@ProviderType
public interface SchedulerConstants {
/** Persistent ID for the scheduler, provided for configuration purposes. */
public static final String SCHEDULER_PID = "org.apache.ace.scheduler";
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.tageditor/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.tageditor/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.tageditor/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.tageditor/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.target.mgmt.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.target.mgmt.ui/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.target.mgmt.ui/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.target.mgmt.ui/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.client.repository.api;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
-buildpath: \
+ ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
junit.osgi,\
@@ -8,4 +9,4 @@ Export-Package: org.apache.ace.it,\
org.apache.ace.test.utils
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Test
-Bundle-Description: Provides base classes and utils for integration tests
\ No newline at end of file
+Bundle-Description: Provides base classes and utils for integration tests
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java Tue Mar 25 14:15:50 2014
@@ -25,10 +25,13 @@ import junit.framework.Assert;
import org.apache.felix.dm.Component;
import org.osgi.service.packageadmin.PackageAdmin;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* This class serves as a minimal example of our integration tests. Also, if this test fails, something is likely
* wrong with the environment
*/
+@ConsumerType
public class ExampleTest extends IntegrationTestBase {
// @Configuration
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java Tue Mar 25 14:15:50 2014
@@ -46,6 +46,8 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.util.tracker.ServiceTracker;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Base class for integration tests. There is no technical reason to use this, but it might make
* your life easier.<br>
@@ -53,6 +55,7 @@ import org.osgi.util.tracker.ServiceTrac
* {@link org.apache.ace.it.ExampleTest} shows a minimal example of an integration test.
*
*/
+@ConsumerType
public class IntegrationTestBase extends TestCase {
private static class ComponentCounter implements ComponentStateListener {
private final List<Component> m_components = new ArrayList<Component>();
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java Tue Mar 25 14:15:50 2014
@@ -18,11 +18,14 @@
*/
package org.apache.ace.test.constants;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Constants for global test parameters. Use these throughout the test
* codebase. Make sure to only use public static finals here, which
* can be inlined by the compiler.
*/
+@ProviderType
public interface TestConstants {
/** The port the webserver is running on for testing. */
public static final int PORT = 8080;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/FileUtils.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/FileUtils.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/FileUtils.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/FileUtils.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,9 @@ package org.apache.ace.test.utils;
import java.io.File;
import java.io.IOException;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class FileUtils {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/NetUtils.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/NetUtils.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/NetUtils.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/NetUtils.java Tue Mar 25 14:15:50 2014
@@ -22,9 +22,12 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Class containing utility methods concerning network related stuff.
*/
+@ProviderType
public class NetUtils {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java Tue Mar 25 14:15:50 2014
@@ -25,9 +25,12 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Utility class that injects dependencies. Can be used to unit test service implementations.
*/
+@ProviderType
public class TestUtils {
public static final String UNIT = "unit";
public static final String INTEGRATION = "integration";
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/Util.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/Util.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/Util.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.test/src/org/apache/ace/test/utils/Util.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,9 @@ package org.apache.ace.test.utils;
import java.util.Properties;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class Util {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -35,7 +35,7 @@ Private-Package: org.apache.ace.useradmi
org.apache.ace.configurator.useradmin.task;version=latest,\
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.log.server.store.api;version=latest
--buildpath: osgi.core;version='[4.1,5)',\
+-buildpath: ${^-buildpath}, osgi.core;version='[4.1,5)',\
osgi.cmpn,\
junit.osgi,\
org.mockito.mockito-all,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
--buildpath: org.apache.felix.dependencymanager,\
+-buildpath: ${^-buildpath},\
+ org.apache.felix.dependencymanager,\
osgi.core,\
osgi.cmpn,\
com.vaadin,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/GroupNotFoundException.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/GroupNotFoundException.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/GroupNotFoundException.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/GroupNotFoundException.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.useradmin.ui.editor;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class GroupNotFoundException extends Exception {
public GroupNotFoundException(String groupName) {
super("Group: " + groupName + " not found");
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserAlreadyExistsException.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserAlreadyExistsException.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserAlreadyExistsException.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.useradmin.ui.editor;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class UserAlreadyExistsException extends Exception {
public UserAlreadyExistsException(String username) {
super("User: " + username + " already exists");
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserDTO.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserDTO.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserDTO.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserDTO.java Tue Mar 25 14:15:50 2014
@@ -21,9 +21,12 @@ package org.apache.ace.useradmin.ui.edit
import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.User;
+import aQute.bnd.annotation.ProviderType;
+
/**
* UserDTO contains the information of the user and the group.
*/
+@ProviderType
public class UserDTO implements Comparable<UserDTO> {
private User m_user;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserEditor.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserEditor.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserEditor.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserEditor.java Tue Mar 25 14:15:50 2014
@@ -23,9 +23,12 @@ import java.util.List;
import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.User;
+import aQute.bnd.annotation.ProviderType;
+
/**
* UserEditor is used to call operations to edit Users on the useradminService
*/
+@ProviderType
public interface UserEditor {
/**
* AddUser can be called to ask the useradmin to add an user to useradmin service If the user already exist the
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserNotFoundException.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserNotFoundException.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserNotFoundException.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/UserNotFoundException.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.useradmin.ui.editor;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class UserNotFoundException extends Exception {
public UserNotFoundException(String username) {
super("User: " + username + " not found");
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core;version=4.3.1,\
osgi.cmpn;version=4.3.1,\
javax.servlet,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java Tue Mar 25 14:15:50 2014
@@ -27,7 +27,9 @@ import org.osgi.framework.wiring.BundleR
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.service.log.LogEntry;
+import aQute.bnd.annotation.ProviderType;
+@ProviderType
public interface VerifierService {
public static final String EE_1_7 = "JavaSE-1.6,JavaSE-1.7,J2SE-1.5,J2SE-1.4,J2SE-1.3,OSGi/Minimum-1.2,OSGi/Minimum-1.1,OSGi/Minimum-1.0";
public static final String EE_1_6 = "JavaSE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3,OSGi/Minimum-1.2,OSGi/Minimum-1.1,OSGi/Minimum-1.0";
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.cmpn,\
+-buildpath: ${^-buildpath},\
+ osgi.cmpn,\
org.apache.felix.dependencymanager,\
com.vaadin;version=latest,\
org.apache.ace.client.repository.api;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java Tue Mar 25 14:15:50 2014
@@ -2,6 +2,9 @@ package org.apache.ace.webui;
import org.apache.ace.client.repository.RepositoryObject;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface NamedObject {
String getName();
String getDescription();
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java Tue Mar 25 14:15:50 2014
@@ -20,12 +20,15 @@ package org.apache.ace.webui;
import java.util.Map;
+import aQute.bnd.annotation.ConsumerType;
+
import com.vaadin.ui.Component;
/**
* Creates components for named extension points in the Vaadin UI. Extension factories
* are used throughout the UI to allow other bundles to contribute features.
*/
+@ConsumerType
public interface UIExtensionFactory {
public static final String EXTENSION_POINT_KEY = "extension_point";
public static final String EXTENSION_POINT_VALUE_ARTIFACT = "artifact";
Modified: ace/branches/1.0.0-semanticversion/run-target/target.bndrun
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/run-target/target.bndrun?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/run-target/target.bndrun (original)
+++ ace/branches/1.0.0-semanticversion/run-target/target.bndrun Tue Mar 25 14:15:50 2014
@@ -10,4 +10,4 @@
org.apache.felix.eventadmin.Timeout=0,\
org.apache.felix.log.maxSize=1000,\
launch.keep=true,\
- launch.storage.dir=bundle-cache
+ xlaunch.storage.dir=bundle-cache