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 16:00:44 UTC
svn commit: r1581365 [6/7] - in /ace/trunk: cnf/ext/ cnf/localrepo/
cnf/localrepo/biz.aQute.bnd.annotation/ cnf/releaserepo/
cnf/releaserepo/org.apache.ace.agent.itest/
cnf/releaserepo/org.apache.ace.agent.launcher/
cnf/releaserepo/org.apache.ace.agent...
Modified: ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java (original)
+++ ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.location.upnp/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.location.upnp/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.location.upnp/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.location.upnp/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,12 +1,13 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet
-Export-Package: org.apache.ace.location,\
- org.apache.ace.location.upnp,\
+Export-Package: org.apache.ace.location
+Bundle-Version: 1.0.1
+Bundle-Name: Apache ACE Location UPnP
+Bundle-Description: Registers a UPnP based Location service
+Private-Package: org.apache.ace.location.upnp,\
org.apache.ace.location.upnp.actions,\
org.apache.ace.location.upnp.util
-Bundle-Version: 1.0.0
-Bundle-Name: Apache ACE Location UPnP
-Bundle-Description: Registers a UPnP based Location service
\ No newline at end of file
+Bundle-Activator: org.apache.ace.location.upnp.Activator
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java (original)
+++ ace/trunk/org.apache.ace.location.upnp/src/org/apache/ace/location/LocationService.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,6 @@
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,\
@@ -50,4 +51,5 @@ Private-Package: org.apache.ace.it.log
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Log itest
Bundle-Description: Integration test bundle for Apache ACE Log
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+-baseline:
Modified: ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -35,4 +35,5 @@ Private-Package: org.apache.ace.log.serv
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Log Server Store itest
Bundle-Description: Integration test bundle for Apache ACE Log
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+-baseline:
Modified: ace/trunk/org.apache.ace.log.server.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.server.ui/bnd.bnd Tue Mar 25 15:00:33 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,\
@@ -8,6 +9,6 @@
org.apache.ace.feedback.common;version=latest
Private-Package: org.apache.ace.log.server.ui
Bundle-Activator: org.apache.ace.log.server.ui.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Log Server UI
Bundle-Description: Registers an ACE webui extensions that shows logs for targets
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/api.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/api.bnd (original)
+++ ace/trunk/org.apache.ace.log/api.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.log
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE Log API
Bundle-Description: Provides the Apache ACE Log API packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
javax.servlet,\
org.apache.felix.dependencymanager,\
Modified: ace/trunk/org.apache.ace.log/listener.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/listener.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/listener.bnd (original)
+++ ace/trunk/org.apache.ace.log/listener.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.log.listener
Bundle-Activator: org.apache.ace.log.listener.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Log Listener
Bundle-Description: Registers log listeners for OSGi life-cycle and deployment events
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/server.servlet.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/server.servlet.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/server.servlet.bnd (original)
+++ ace/trunk/org.apache.ace.log/server.servlet.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.log.server.servlet
Bundle-Activator: org.apache.ace.log.server.servlet.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Log Server Servlet
Bundle-Description: Registers a service factory for Log Server servlets
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/server.store.api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/server.store.api.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/server.store.api.bnd (original)
+++ ace/trunk/org.apache.ace.log/server.store.api.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.log.server.store
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE Log Server Store API
Bundle-Description: Provides the Apache ACE Log Server Store API packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/server.store.file.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/server.store.file.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/server.store.file.bnd (original)
+++ ace/trunk/org.apache.ace.log/server.store.file.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Bundle-Activator: org.apache.ace.log.server.store.impl.Activator
Private-Package: org.apache.ace.log.server.store.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Server Store file
Bundle-Description: Registers a service factory for file base Server Log stores
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/server.store.mongo.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/server.store.mongo.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/server.store.mongo.bnd (original)
+++ ace/trunk/org.apache.ace.log/server.store.mongo.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.log.server.store.mongo
Bundle-Activator: org.apache.ace.log.server.store.mongo.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Log Server Store Mongo
Bundle-Description: Registers a service factory for MongoDB bases Server Log stores
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/server.task.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/server.task.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/server.task.bnd (original)
+++ ace/trunk/org.apache.ace.log/server.task.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Private-Package: org.apache.ace.log.server.task
Bundle-Activator: org.apache.ace.log.server.task.Activator
Bundle-Name: Apache ACE Log Server Task
Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java Tue Mar 25 15:00:33 2014
@@ -24,9 +24,12 @@ import java.util.List;
import org.apache.ace.feedback.Descriptor;
import org.apache.ace.feedback.Event;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Log store interface. Implementation of this service interface provide a persisted storage for Event logs.
*/
+@ProviderType
public interface LogStore
{
Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java Tue Mar 25 15:00:33 2014
@@ -24,10 +24,13 @@ import java.util.List;
import org.apache.ace.feedback.Event;
+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/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo (original)
+++ ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/target.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/target.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/target.bnd (original)
+++ ace/trunk/org.apache.ace.log/target.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.log.target,\
org.apache.ace.log.target.task
Bundle-Activator: org.apache.ace.log.target.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Log Target
Bundle-Description: Registers service factories for target log configuration and synchronization
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.log/target.store.impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/target.store.impl.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/target.store.impl.bnd (original)
+++ ace/trunk/org.apache.ace.log/target.store.impl.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.log.target.store.impl
Bundle-Activator: org.apache.ace.log.target.store.impl.Activator
Export-Package: org.apache.ace.log.target.store
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE Log Target Store
Bundle-Description: Registers a service factory for target log stores
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.nodelauncher/amazon.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/amazon.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/amazon.bnd (original)
+++ ace/trunk/org.apache.ace.nodelauncher/amazon.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
-Private-Package: \
+Private-Package: org.apache.ace.nodelauncher.amazon.impl,\
META-INF.services,\
META-INF.maven.*,\
functions,\
@@ -16,8 +16,7 @@ Private-Package: \
org.slf4j.*,\
org.bouncycastle.*,\
com.sun.jersey.*
-Bundle-Activator: \
- org.apache.ace.nodelauncher.amazon.Activator
+Bundle-Activator: org.apache.ace.nodelauncher.amazon.impl.Activator
Import-Package: \
!com.google.*,\
!junit.*,\
@@ -47,6 +46,6 @@ Export-Package: \
org.apache.ace.nodelauncher.amazon
Include-Resource:\
META-INF/services/org.jclouds.apis.ApiMetadata=resources/org.jclouds.apis.ApiMetadata
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE NodeLauncher Amazon
Bundle-Description: Registers a NodeLaucnher service for Amazon
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.nodelauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.nodelauncher/bnd.bnd Tue Mar 25 15:00:33 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/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncher.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/NodeLauncherConfig.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java Tue Mar 25 15:00:33 2014
@@ -31,9 +31,12 @@ import org.jclouds.compute.domain.Hardwa
import org.jclouds.compute.domain.Image;
import org.jclouds.sshj.config.SshjSshClientModule;
+import aQute.bnd.annotation.ProviderType;
+
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@ProviderType
public class JcloudsNodeLauncherConfig implements NodeLauncherConfig {
private ComputeServiceContext m_computeServiceContext;
Added: ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/Activator.java?rev=1581365&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/Activator.java (added)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/Activator.java Tue Mar 25 15:00:33 2014
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.nodelauncher.amazon.impl;
+
+import java.util.Properties;
+
+import org.apache.ace.nodelauncher.NodeLauncher;
+import org.apache.felix.dm.DependencyActivatorBase;
+import org.apache.felix.dm.DependencyManager;
+import org.osgi.framework.BundleContext;
+
+public class Activator extends DependencyActivatorBase {
+
+ @Override
+ public void init(BundleContext context, DependencyManager manager) throws Exception {
+ Properties props = new Properties();
+ props.put("osgi.command.scope", "node");
+ props.put("osgi.command.function", new String[] {"start", "stop", "properties"});
+ manager.add(createComponent()
+ .setInterface(NodeLauncher.class.getName(), props)
+ .setImplementation(AmazonNodeLauncher.class)
+ .add(createConfigurationDependency()
+ .setPid(AmazonNodeLauncher.PID)));
+ }
+
+ @Override
+ public void destroy(BundleContext context, DependencyManager manager) throws Exception {
+
+ }
+
+}
Added: ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/AmazonNodeLauncher.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/AmazonNodeLauncher.java?rev=1581365&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/AmazonNodeLauncher.java (added)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/impl/AmazonNodeLauncher.java Tue Mar 25 15:00:33 2014
@@ -0,0 +1,412 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.nodelauncher.amazon.impl;
+
+import static org.jclouds.compute.predicates.NodePredicates.runningInGroup;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Dictionary;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.ace.nodelauncher.NodeLauncher;
+import org.apache.ace.nodelauncher.NodeLauncherConfig;
+import org.apache.ace.nodelauncher.amazon.JcloudsNodeLauncherConfig;
+import org.jclouds.compute.ComputeService;
+import org.jclouds.compute.domain.ComputeMetadata;
+import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.compute.domain.TemplateBuilder;
+import org.jclouds.compute.options.RunScriptOptions;
+import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.domain.LoginCredentials;
+import org.jclouds.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.ec2.domain.InstanceType;
+import org.jclouds.scriptbuilder.domain.Statements;
+import org.osgi.service.cm.ConfigurationException;
+import org.osgi.service.cm.ManagedService;
+
+import com.google.common.io.Files;
+/**
+ * Simple NodeLauncher implementation that launches nodes based on a given AMI in Amazon EC2.
+ * We expect the AMI we launch to have a java on its path, at least after bootstrap.<br><br>
+ * <p/>
+ * This service is configured using Config Admin; see the constants in the class for more information
+ * about this.<br><br>
+ * <p/>
+ * After the node has been started up, this service will install a management agent on it. For this
+ * to work, there should be an ace-launcher in the OBR of the server the node should connect to.
+ */
+public class AmazonNodeLauncher implements NodeLauncher, ManagedService {
+ public static final String PID = "org.apache.ace.nodelauncher.amazon";
+
+ /**
+ * Configuration key: The ACE server the newly started nodes should connect to.
+ */
+ public static final String SERVER = "server";
+
+ /**
+ * Configuration key: The ID of the AMI to use. Note that this AMI should be available
+ * in the location ("availability zone") you configure.
+ */
+ public static final String AMI_ID = "amiId";
+
+ /**
+ * Configuration key: The ID of the AMI owner to use. You need this when you want to use your own AMIs.
+ */
+ public static final String AMI_OWNER_ID = "amiOwnerId";
+
+ /**
+ * Configuration key: The location where the node should be started; this is an Amazon "availability zone",
+ * something like "eu-west-1".
+ */
+ public static final String LOCATION = "location";
+
+ /**
+ * Configuration key: the Amazon access key ID.
+ */
+ public static final String ACCESS_KEY_ID = "accessKeyid";
+
+ /**
+ * Configuration key: The secret key that goes with your access key.
+ */
+ public static final String SECRET_ACCESS_KEY = "secretAccessKey";
+
+ /**
+ * Configuration key: The (optional) name of an existing keypair to use when creating a new node. If you
+ * do not specify it, a new keypair will be created. Specifying an existing keypair makes it easier to
+ * for example log into each node with SSH using your existing keypair.
+ */
+ public static final String KEYPAIR = "keypair";
+
+ /**
+ * Configuration key: A prefix to use for all nodes launched by this service. You can use this (a) allow
+ * multiple nodes with the same ID, but launcher from different NodeLauncher services, or (b) to more
+ * easily identify your nodes in the AWS management console.
+ */
+ public static final String TAG_PREFIX = "tagPrefix";
+
+ /**
+ * Configuration key: A piece of shell script that is run <em>before</em> the management agent is started.
+ */
+ public static final String NODE_BOOTSTRAP = "nodeBootstrap";
+
+ /**
+ * Configuration key: A set of VM options to pass to the JVM when starting the management agent, as a single string.
+ */
+ public static final String VM_OPTIONS = "vmOptions";
+
+ /**
+ * Configuration key: Any command line arguments you want to pass to the launcher; see the ace-launcher for
+ * the possible options.
+ */
+ public static final String LAUNCHER_ARGUMENTS = "launcherArguments";
+
+ /**
+ * Configuration key: Extra ports to open on the nodes, besides the default ones (see DEFAULT_PORTS).
+ */
+ public static final String EXTRA_PORTS = "extraPorts";
+
+ /**
+ * Configuration key: Should we run the process as root?
+ */
+ public static final String RUN_AS_ROOT = "runAsRoot";
+
+ /**
+ * Configuration key: The hardware ID to use for the node.
+ */
+ public static final String HARDWARE_ID = "hardwareId";
+
+ /**
+ * Default set of ports to open on a node.
+ */
+ public static final int[] DEFAULT_PORTS = new int[]{22, 80, 8080};
+
+ /**
+ * Configuration key: The (optional) name of the JAR to launch to
+ * bootstrap the OSGi framework (or whatever you want to run on the
+ * node).
+ */
+ public static final String ACE_LAUNCHER = "aceLauncher";
+
+ /**
+ * Configuration key: An additional list of artifacts that must be
+ * downloaded from the OBR when bootstrapping.
+ */
+ public static final String ADDITIONAL_OBR_DOWNLOADS = "additionalObrDownloads";
+
+ /**
+ * Configuration key: An additional list of URLs that must be downloaded when
+ * bootstrapping.
+ */
+ public static final String EXTERNAL_DOWNLOAD_URLS = "externalDownloadUrls";
+
+ /**
+ * Configuration key: The (optional) ssh user to use when connecting to the node. Uses jclouds defaults by default,
+ * which is root and ec2-user.
+ */
+ public static final String SSH_USER = "sshUser";
+
+ /**
+ * Configuration key: The (optional) private key file, which you must install on
+ * the ACE server locally if you want it to be used when creating new nodes.
+ */
+ private static final String PRIVATE_KEY_FILE = "privateKeyFile";
+
+ /**
+ * Default configuration object. Properties are read from the nodelauncher configuration file.
+ */
+ private JcloudsNodeLauncherConfig m_defaultNodeConfig;
+
+ /**
+ * Current configuration object. This reflects settings done from the UI for example.
+ * This instance is set when a node is started.
+ */
+ private JcloudsNodeLauncherConfig m_currentConfig;
+
+
+ public void start(String id) throws Exception {
+
+ start(id, m_defaultNodeConfig);
+ }
+
+ public void start(String id, NodeLauncherConfig cfg) throws Exception {
+ JcloudsNodeLauncherConfig config = (JcloudsNodeLauncherConfig) cfg;
+ m_currentConfig = config;
+
+ ComputeService computeService = config.getComputeService();
+ TemplateBuilder template = computeService.templateBuilder()
+ .imageId(config.getImageId())
+ .hardwareId(config.getHardwareId())
+ .locationId(config.getLocation());
+
+ int[] extraPorts = parseExtraPorts(config.getExtraPorts());
+ int[] inboundPorts = mergePorts(DEFAULT_PORTS, extraPorts);
+
+ TemplateOptions options = new EC2TemplateOptions()
+ .as(EC2TemplateOptions.class).inboundPorts(inboundPorts)
+ .blockOnComplete(false)
+ .runAsRoot(config.isRunAsRoot());
+
+ if (useConfiguredKeyPair(config)) {
+ options.as(EC2TemplateOptions.class).keyPair(config.getKeyPair());
+ }
+
+ template.options(options);
+
+ Set<? extends NodeMetadata> tag = computeService.createNodesInGroup(config.getTagPrefix() + id, 1, template.build());
+ if (!useConfiguredPrivateKey(config)) {
+ System.out.println("In case you need it, this is the key to ssh to " + id + ":\n" + tag.iterator().next().getCredentials().credential);
+ }
+
+ LoginCredentials.Builder loginBuilder = LoginCredentials.builder();
+
+ if (config.getSshUser() != null && config.getSshUser().length() > 0) {
+ loginBuilder.user(config.getSshUser());
+ } else {
+ loginBuilder.user("ec2-user");
+ }
+
+ if (useConfiguredPrivateKey(config)) {
+ loginBuilder.privateKey(Files.toString(new File(config.getPrivateKeyFile()), Charset.defaultCharset()));
+ }
+
+ computeService.runScriptOnNodesMatching(runningInGroup(config.getTagPrefix() + id),
+ Statements.exec(buildStartupScript(id, config)),
+ RunScriptOptions.Builder.blockOnComplete(false).overrideLoginCredentials(loginBuilder.build()));
+ }
+
+ private boolean useConfiguredPrivateKey(JcloudsNodeLauncherConfig config) {
+ return config.getPrivateKeyFile() != null && config.getPrivateKeyFile().length() > 0;
+ }
+
+ private boolean useConfiguredKeyPair(JcloudsNodeLauncherConfig config) {
+ return config.getKeyPair() != null && config.getKeyPair().length() > 0;
+ }
+
+ public int[] mergePorts(int[] first, int[] last) {
+ int[] result = new int[first.length + last.length];
+ for (int i = 0; i < result.length; i++) {
+ result[i] = (i < first.length) ? first[i] : last[i - first.length];
+ }
+ return result;
+ }
+
+ public int[] parseExtraPorts(String[] extraPorts) {
+ if(extraPorts == null || extraPorts.length == 0) {
+ return new int[0];
+ }
+
+ int[] result = new int[extraPorts.length];
+
+ for (int i = 0; i < extraPorts.length; i++) {
+ result[i] = Integer.parseInt(extraPorts[i].trim());
+ }
+
+ return result;
+ }
+
+ private String buildStartupScript(String id, JcloudsNodeLauncherConfig config) throws MalformedURLException {
+ StringBuilder script = new StringBuilder("cd ~; ");
+ if (config.getNodeBootstrap() != null && config.getNodeBootstrap().length() > 0) {
+ script.append(config.getNodeBootstrap()).append(" ; ");
+ }
+
+ script.append("wget ").append(new URL(config.getServer(), "/obr/" + config.getAceLauncher())).append(" ;");
+ if (config.getAdditionalObrDownloads().length() > 0) {
+ for (String additonalDownload : config.getAdditionalObrDownloads().split(",")) {
+ script.append("wget ").append(new URL(config.getServer(), "/obr/" + additonalDownload.trim())).append(" ;");
+ }
+ }
+
+ if (config.getExternalDownloadUrls().length() > 0) {
+ for (String additonalDownload : config.getExternalDownloadUrls().split(",")) {
+ script.append("wget ").append(additonalDownload.trim()).append(" ;");
+ }
+ }
+ script.append("nohup java -jar ").append(config.getAceLauncher()).append(" ");
+ script.append("discovery=").append(config.getServer().toExternalForm()).append(" ");
+ script.append("identification=").append(id).append(" ");
+ script.append(config.getVmOptions()).append(" ");
+ script.append(config.getLauncherArguments());
+ return script.toString();
+ }
+
+ public void stop(String id) {
+
+ getActiveConfig().getComputeService().destroyNodesMatching(runningInGroup(getActiveConfig().getTagPrefix() + id));
+ }
+
+ public Properties getProperties(String id) throws Exception {
+ Properties result = new Properties();
+
+ JcloudsNodeLauncherConfig config = getActiveConfig();
+ NodeMetadata nodeMetadata = getNodeMetadataForRunningNodeWithTag(config.getTagPrefix() + id, config);
+ if (nodeMetadata == null) {
+ return null;
+ }
+ result.put("id", id);
+ result.put("node-id", nodeMetadata.getId());
+ result.put("ip", nodeMetadata.getPublicAddresses().iterator().next());
+
+ return result;
+ }
+
+ private JcloudsNodeLauncherConfig getActiveConfig() {
+ return m_currentConfig != null ? m_currentConfig : m_defaultNodeConfig;
+ }
+
+ private NodeMetadata getNodeMetadataForRunningNodeWithTag(String tag, JcloudsNodeLauncherConfig config) {
+
+ for (ComputeMetadata node : config.getComputeService().listNodes()) {
+ NodeMetadata candidate = config.getComputeService().getNodeMetadata(node.getId());
+ if (tag.equals(candidate.getGroup()) && candidate.getStatus().equals(NodeMetadata.Status.RUNNING)) {
+ return candidate;
+ }
+ }
+ return null;
+ }
+
+ public void updated(@SuppressWarnings("rawtypes") Dictionary properties) throws ConfigurationException {
+ if (properties != null) {
+ URL server;
+ try {
+ server = new URL(getConfigProperty(properties, SERVER));
+ } catch (MalformedURLException e) {
+ throw new ConfigurationException(SERVER, getConfigProperty(properties, SERVER) + " is not a valid URL.", e);
+ }
+ String amiId = getConfigProperty(properties, AMI_ID);
+ String amiOwnerId = getConfigProperty(properties, AMI_OWNER_ID, "");
+ String location = getConfigProperty(properties, LOCATION);
+ String hardwareId = getConfigProperty(properties, HARDWARE_ID, InstanceType.C1_MEDIUM);
+ String accessKeyId = getConfigProperty(properties, ACCESS_KEY_ID);
+ String secretAccessKey = getConfigProperty(properties, SECRET_ACCESS_KEY);
+ String keyPair = getConfigProperty(properties, KEYPAIR, "");
+ String privateKeyFile = getConfigProperty(properties, PRIVATE_KEY_FILE, "");
+ String vmOptions = getConfigProperty(properties, VM_OPTIONS, "");
+ String nodeBootstrap = getConfigProperty(properties, NODE_BOOTSTRAP, "");
+ String tagPrefix = getConfigProperty(properties, TAG_PREFIX, "");
+ String launcherArguments = getConfigProperty(properties, LAUNCHER_ARGUMENTS, "");
+ String extraPorts = getConfigProperty(properties, EXTRA_PORTS, "");
+ String runAsRoot = getConfigProperty(properties, RUN_AS_ROOT, "false");
+ String aceLauncher = getConfigProperty(properties, ACE_LAUNCHER, "ace-launcher.jar");
+ String additionalObrDownloads = getConfigProperty(properties, ADDITIONAL_OBR_DOWNLOADS, "");
+ String externalDownloadUrls = getConfigProperty(properties, EXTERNAL_DOWNLOAD_URLS, "");
+ String sshUser = getConfigProperty(properties, SSH_USER, "ec2-user");
+
+ m_defaultNodeConfig = new JcloudsNodeLauncherConfig()
+ .setAccessKeyId(accessKeyId)
+ .setSecretAccessKey(secretAccessKey)
+ .setServer(server)
+ .setImageId(amiId)
+ .setImageOwnerId(amiOwnerId)
+ .setLocation(location)
+ .setHardwareId(hardwareId)
+ .setKeyPair(keyPair)
+ .setPrivateKeyFile(privateKeyFile)
+ .setTagPrefix(tagPrefix)
+ .setVmOptions(vmOptions)
+ .setLauncherArguments(launcherArguments)
+ .setExtraPorts(extraPorts)
+ .setRunAsRoot(Boolean.parseBoolean(runAsRoot))
+ .setAccessKeyId(accessKeyId)
+ .setSecretAccessKey(secretAccessKey)
+ .setNodeBootstrap(nodeBootstrap)
+ .setAceLauncher(aceLauncher)
+ .setAdditionalObrDownloads(additionalObrDownloads)
+ .setExternalDownloadUrls(externalDownloadUrls)
+ .setSshUser(sshUser);
+
+ m_defaultNodeConfig.createComputeServiceContext();
+ }
+ }
+
+
+ private String getConfigProperty(@SuppressWarnings("rawtypes") Dictionary settings, String id) throws ConfigurationException {
+ return getConfigProperty(settings, id, null);
+ }
+
+ private String getConfigProperty(@SuppressWarnings("rawtypes") Dictionary settings, String id, String defaultValue) throws ConfigurationException {
+ String result = (String) settings.get(id);
+ if (result == null) {
+ if (defaultValue == null) {
+ throw new ConfigurationException(id, "key missing");
+ } else {
+ return defaultValue;
+ }
+ }
+ return result;
+ }
+
+ public void stop() {
+ if (m_currentConfig != null) {
+ m_currentConfig.close();
+ }
+ }
+
+ public NodeLauncherConfig getDefaultConfig() {
+ return m_defaultNodeConfig;
+ }
+
+ public JcloudsNodeLauncherConfig getCurrentConfig() {
+ return m_currentConfig;
+ }
+}
Modified: ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/packageinfo (original)
+++ ace/trunk/org.apache.ace.nodelauncher/src/org/apache/ace/nodelauncher/amazon/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.nodelauncher/test/org/apache/ace/nodelauncher/amazon/PortParseTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/test/org/apache/ace/nodelauncher/amazon/PortParseTest.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/test/org/apache/ace/nodelauncher/amazon/PortParseTest.java (original)
+++ ace/trunk/org.apache.ace.nodelauncher/test/org/apache/ace/nodelauncher/amazon/PortParseTest.java Tue Mar 25 15:00:33 2014
@@ -1,5 +1,6 @@
package org.apache.ace.nodelauncher.amazon;
+import org.apache.ace.nodelauncher.amazon.impl.AmazonNodeLauncher;
import org.testng.Assert;
import org.testng.annotations.Test;
import static org.apache.ace.test.utils.TestUtils.UNIT;
Modified: ace/trunk/org.apache.ace.nodelauncher/ui.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/ui.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/ui.bnd (original)
+++ ace/trunk/org.apache.ace.nodelauncher/ui.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Bundle-Activator: org.apache.ace.nodelauncher.ui.Activator
Private-Package: org.apache.ace.nodelauncher.ui
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE NodeLauncher UI
Bundle-Description: Registers an ACE webui extensions that add Nodelauncher controls
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.obr/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.obr/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,6 @@
-sub: *.bnd
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
Modified: ace/trunk/org.apache.ace.obr/metadata.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/metadata.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/metadata.bnd (original)
+++ ace/trunk/org.apache.ace.obr/metadata.bnd Tue Mar 25 15:00:33 2014
@@ -13,6 +13,6 @@ Bundle-Activator: org.apache.ace.obr.met
Export-Package: org.apache.ace.obr.metadata,\
org.osgi.impl.bundle.obr.resource,\
org.osgi.service.obr
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE OBR MetaData
Bundle-Description: Provides the ACE OBR MetaData packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.obr/servlet.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/servlet.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/servlet.bnd (original)
+++ ace/trunk/org.apache.ace.obr/servlet.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.obr.servlet
Bundle-Activator: org.apache.ace.obr.servlet.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE OBR Servlet
Bundle-Description: Registers the ACE OBR servlet
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java Tue Mar 25 15:00:33 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 {
/**
Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/CapabilityImpl.java Tue Mar 25 15:00:33 2014
@@ -22,9 +22,12 @@ import java.util.*;
import org.osgi.service.obr.Capability;
import org.xmlpull.v1.XmlPullParser;
+import aQute.bnd.annotation.ProviderType;
+
@SuppressWarnings({"unchecked"})
+@ProviderType
public class CapabilityImpl implements Capability {
String name;
Map properties = new TreeMap();
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/FilterImpl.java Tue Mar 25 15:00:33 2014
@@ -25,7 +25,10 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
@SuppressWarnings({"unchecked"})
+@ProviderType
public class FilterImpl {
final char WILDCARD = 65535;
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Manifest.java Tue Mar 25 15:00:33 2014
@@ -20,8 +20,11 @@ package org.osgi.impl.bundle.obr.resourc
import java.io.*;
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
@SuppressWarnings({"unchecked"})
+@ProviderType
public class Manifest extends Hashtable {
static final long serialVersionUID = 1L;
List imports;
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ManifestEntry.java Tue Mar 25 15:00:33 2014
@@ -19,8 +19,11 @@ package org.osgi.impl.bundle.obr.resourc
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
@SuppressWarnings({"unchecked"})
+@ProviderType
public class ManifestEntry implements Comparable {
String name;
VersionRange version;
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Parameter.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RepositoryImpl.java Tue Mar 25 15:00:33 2014
@@ -27,6 +27,8 @@ 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.
*
@@ -34,6 +36,7 @@ import org.xmlpull.v1.*;
* @version $Revision: 44 $
*/
@SuppressWarnings({"unchecked"})
+@ProviderType
public class RepositoryImpl implements Repository {
transient Set resources = new HashSet();
URL url;
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/RequirementImpl.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/ResourceImpl.java Tue Mar 25 15:00:33 2014
@@ -25,7 +25,10 @@ import org.osgi.framework.Version;
import org.osgi.service.obr.*;
import org.xmlpull.v1.XmlPullParser;
+import aQute.bnd.annotation.ProviderType;
+
@SuppressWarnings({"unchecked"})
+@ProviderType
public class ResourceImpl implements Resource {
List capabilities = new ArrayList();
List requirements = new ArrayList();
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/StringSet.java Tue Mar 25 15:00:33 2014
@@ -21,7 +21,10 @@ package org.osgi.impl.bundle.obr.resourc
import java.util.*;
+import aQute.bnd.annotation.ProviderType;
+
@SuppressWarnings({"unchecked"})
+@ProviderType
public class StringSet extends HashSet {
static final long serialVersionUID = 1L;
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/Tag.java Tue Mar 25 15:00:33 2014
@@ -21,6 +21,8 @@ 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
@@ -28,6 +30,7 @@ import java.util.*;
* objects or other Tag objects.
*/
@SuppressWarnings({"unchecked"})
+@ProviderType
public class Tag {
Tag parent;
String name;
Modified: ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/VersionRange.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.obr/storage.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/storage.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/storage.bnd (original)
+++ ace/trunk/org.apache.ace.obr/storage.bnd Tue Mar 25 15:00:33 2014
@@ -3,6 +3,6 @@ Private-Package: org.apache.ace.obr.stor
org.apache.ace.obr.metadata.util
Bundle-Activator: org.apache.ace.obr.storage.file.Activator
Export-Package: org.apache.ace.obr.storage
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE OBR Storage
Bundle-Description: Registers a file based BundleStore for the OBR
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.processlauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.processlauncher/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,5 @@
--buildpath: org.apache.felix.dependencymanager,\
+-buildpath: ${^-buildpath},\
+ org.apache.felix.dependencymanager,\
org.mockito.mockito-all,\
osgi.core,\
osgi.cmpn,\
@@ -20,6 +21,6 @@ Private-Package: org.apache.ace.processl
Bundle-Activator: org.apache.ace.processlauncher.osgi.Activator
Export-Package: org.apache.ace.processlauncher,\
org.apache.ace.processlauncher.util
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE ProcessLauncher
Bundle-Description: Registers a service factory and ProcessLauncher service
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java (original)
+++ ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/LaunchConfiguration.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java (original)
+++ ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLauncherService.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java (original)
+++ ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessLifecycleListener.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java (original)
+++ ace/trunk/org.apache.ace.processlauncher/src/org/apache/ace/processlauncher/ProcessStreamListener.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.range.api/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.range.api/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,6 @@
--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-Version: 1.1.0
Bundle-Name: Apache ACE Range API
Bundle-Description: Provides the Apache ACE Range API packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java Tue Mar 25 15:00:33 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;
private long m_high;
Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java Tue Mar 25 15:00:33 2014
@@ -21,6 +21,8 @@ package org.apache.ace.range;
import java.util.ListIterator;
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 ListIterator m_iterator;
private Range m_current;
Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java Tue Mar 25 15:00:33 2014
@@ -25,10 +25,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 {
/**
* A static set which contains all possible values.
Modified: ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo (original)
+++ ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.1.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -33,4 +33,5 @@ Private-Package: org.apache.ace.it.repos
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Repository itest
Bundle-Description: Integration test bundle for Apache ACE Repository
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+-baseline:
Modified: ace/trunk/org.apache.ace.repository/api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/api.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/api.bnd (original)
+++ ace/trunk/org.apache.ace.repository/api.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.repository
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
Bundle-Name: Apache ACE Repository API
Bundle-Description: Provides the Apache ACE Repository API packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
javax.servlet,\
Modified: ace/trunk/org.apache.ace.repository/ext.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/ext.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/ext.bnd (original)
+++ ace/trunk/org.apache.ace.repository/ext.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Export-Package: org.apache.ace.repository.ext,\
org.apache.ace.repository.ext.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Repository EXT
Bundle-Description: Provides the Apache ACE Repository EXT packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.repository/impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/impl.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/impl.bnd (original)
+++ ace/trunk/org.apache.ace.repository/impl.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.repository.impl,\
org.apache.ace.repository.impl.constants
Bundle-Activator: org.apache.ace.repository.impl.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Repository Service
Bundle-Description: Registers a service factory for Repository services
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.repository/servlet.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/servlet.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/servlet.bnd (original)
+++ ace/trunk/org.apache.ace.repository/servlet.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.repository.servlet
Bundle-Activator: org.apache.ace.repository.servlet.Activator
Export-Package: org.apache.ace.repository.servlet
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Repository Servlet
Bundle-Description: Registers a repository and replication servlet
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java Tue Mar 25 15:00:33 2014
@@ -27,12 +27,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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java Tue Mar 25 15:00:33 2014
@@ -28,9 +28,12 @@ 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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java Tue Mar 25 15:00:33 2014
@@ -34,9 +34,12 @@ 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/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo (original)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.1.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.repository/task.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/task.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/task.bnd (original)
+++ ace/trunk/org.apache.ace.repository/task.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Bundle-Activator: org.apache.ace.repository.task.Activator
Private-Package: org.apache.ace.repository.task
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Repository Task
Bundle-Description: Registers a runnable task for repository replication
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager
@@ -6,6 +6,6 @@ Private-Package: org.apache.ace.resource
Bundle-Activator: org.apache.ace.resourceprocessor.useradmin.impl.Activator
Export-Package: org.apache.ace.resourceprocessor.useradmin
Deployment-ProvidesResourceProcessor: org.apache.ace.resourceprocessor.useradmin
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE ResourceProcessor UserAdmin
Bundle-Description: Registers a ResourceProcessor service that handle useradmin resources
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java Tue Mar 25 15:00:33 2014
@@ -21,6 +21,8 @@ package org.apache.ace.resourceprocessor
import java.io.IOException;
import java.io.InputStream;
+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>
@@ -51,6 +53,7 @@ import java.io.InputStream;
* 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/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.scheduler/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.scheduler/bnd.bnd Tue Mar 25 15:00:33 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/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java (original)
+++ ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/constants/SchedulerConstants.java Tue Mar 25 15:00:33 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/trunk/org.apache.ace.tageditor/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.tageditor/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.tageditor/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.tageditor/bnd.bnd Tue Mar 25 15:00:33 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,\
@@ -6,6 +7,6 @@
org.apache.ace.webui.vaadin;version=latest
Private-Package: org.apache.ace.tageditor
Bundle-Activator: org.apache.ace.tageditor.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE TagEditorUI
Bundle-Description: Registers an ACE webui extension for editing tags
Modified: ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd Tue Mar 25 15:00:33 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,\
@@ -6,6 +7,6 @@
org.apache.ace.webui.vaadin;version=latest
Private-Package: org.apache.ace.target.management.ui
Bundle-Activator: org.apache.ace.target.management.ui.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE TargetMgmtUI
Bundle-Description: Registers an ACE webui extension for target mgmnt functions
\ No newline at end of file