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 [5/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.client.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.mockito.mockito-all,\
xpp3;version=1.1.4,\
Modified: ace/trunk/org.apache.ace.client.repository/helper.base.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/helper.base.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/helper.base.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/helper.base.bnd Tue Mar 25 15:00:33 2014
@@ -80,6 +80,6 @@ Import-Package: !javax.servlet,\
!org.apache.commons.logging,\
!org.apache.oro.text.perl,\
*
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Client Repository Helper Base
Bundle-Description: Provides the base implementation for Apache ACE repository helpers
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/helper.bundle.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/helper.bundle.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/helper.bundle.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/helper.bundle.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.client.repository.helper.bundle.impl
Bundle-Activator: org.apache.ace.client.repository.helper.bundle.impl.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Client Repository Bundle Helper
Bundle-Description: Registers the Apache ACE Client helper services for bundles
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/helper.configuration.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/helper.configuration.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/helper.configuration.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/helper.configuration.bnd Tue Mar 25 15:00:33 2014
@@ -2,6 +2,6 @@ Private-Package: org.apache.ace.client.r
Bundle-Activator: org.apache.ace.client.repository.helper.configuration.impl.Activator
Export-Package: org.apache.ace.client.repository.helper.configuration
Deployment-ProvidesResourceProcessor: org.osgi.deployment.rp.autoconf
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Client Repository Configuration Helper
Bundle-Description: Registers the Apache ACE Client Helper services for metatype configuration
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/helper.user.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/helper.user.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/helper.user.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/helper.user.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.client.repository.helper.user.impl
Bundle-Activator: org.apache.ace.client.repository.helper.user.impl.Activator
Export-Package: org.apache.ace.client.repository.helper.user
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Client Repository User Helper
Bundle-Description: Registers the Apache ACE Client Helper services for user configuration
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/impl.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/impl.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/impl.bnd Tue Mar 25 15:00:33 2014
@@ -58,6 +58,6 @@ Import-Package: !javax.security.auth,\
!sun.reflect,\
*
Bundle-Activator: org.apache.ace.client.repository.impl.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache Ace Client Repository factory
Bundle-Description: Registers the Apache ACE Client Repository SessionFactory
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.client.repository
import java.util.List;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The Associatable interface is to be implemented by any object that wants to be used in an Association.
*/
+@ProviderType
public interface Associatable
{
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java Tue Mar 25 15:00:33 2014
@@ -20,10 +20,13 @@ package org.apache.ace.client.repository
import java.util.List;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Represents a basic association between two Associatable objects, whose types
* are given by the generic parameters.
*/
+@ProviderType
public interface Association<L extends Associatable, R extends Associatable> extends RepositoryObject {
/**
* A filter string indicating the left endpoint.
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java Tue Mar 25 15:00:33 2014
@@ -21,10 +21,13 @@ package org.apache.ace.client.repository
import java.util.List;
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Represents a basic repository of associations. The associations are to be of type
* <code>T</code>, associating types <code>L</code> and <code>R</code>.
*/
+@ProviderType
public interface AssociationRepository<L extends Associatable, R extends Associatable, T extends Association<L, R>> extends ObjectRepository<T>{
/**
* Creates a static association between two filters for objects, stores it,
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java Tue Mar 25 15:00:33 2014
@@ -22,9 +22,12 @@ import java.util.List;
import java.util.Map;
import org.osgi.framework.Filter;
+import aQute.bnd.annotation.ProviderType;
+
/**
* A basic object repository, storing implementers of RepositoryObject.
*/
+@ProviderType
public interface ObjectRepository<T extends RepositoryObject> {
/**
* Removes the given entity from this repository. Will silently fail
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java Tue Mar 25 15:00:33 2014
@@ -20,10 +20,13 @@ package org.apache.ace.client.repository
import java.io.IOException;
+import aQute.bnd.annotation.ProviderType;
+
/**
* An interface that can be implemented by anybody that wants to be invoked as part of the
* pre-commit cycle of a RepositoryAdmin.
*/
+@ProviderType
public interface PreCommitMember {
/**
* Resets any volatile changes that might have been made as part of earlier operations.
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java Tue Mar 25 15:00:33 2014
@@ -22,6 +22,9 @@ import java.io.IOException;
import org.apache.ace.client.repository.RepositoryObject.WorkingState;
import org.osgi.service.useradmin.User;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface RepositoryAdmin
{
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java Tue Mar 25 15:00:33 2014
@@ -20,10 +20,13 @@ package org.apache.ace.client.repository
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
/**
* RepositoryAdminLoginContext represents a context for logins to the repository admin. It is used to specify
* which repositories are to be used in a given session with the RepositoryAdmin.
*/
+@ProviderType
public interface RepositoryAdminLoginContext
{
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java Tue Mar 25 15:00:33 2014
@@ -23,10 +23,13 @@ import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
/**
* A basic repository object, intended to be stored in a ObjectRepository of its given type.
* A RepositoryObject is associatable.
*/
+@ProviderType
public interface RepositoryObject extends Associatable {
/**
* This key is used to store the RepositoryObject an event comes from, in the Event object.
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java Tue Mar 25 15:00:33 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.client.repository;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class RepositoryUtil
{
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java Tue Mar 25 15:00:33 2014
@@ -20,6 +20,8 @@ package org.apache.ace.client.repository
import java.util.Map;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Factory service for creating and destroying sessions. Sessions are identified by some kind
* of identification. This identification is also used as a service property in case there is
@@ -27,6 +29,7 @@ import java.util.Map;
* service session ID. It is also used to listen to session specific events, in which case this
* same property is part of the actual event so it can be used in event filters.
*/
+@ProviderType
public interface SessionFactory {
/** Session ID for session specific service or event. */
public static final String SERVICE_SID = "service.sid";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java Tue Mar 25 15:00:33 2014
@@ -22,12 +22,15 @@ import java.util.Comparator;
import java.util.Map;
import org.apache.ace.client.repository.object.ArtifactObject;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Interface to an artifact helper. For each type of artifact, there should be a helper
* service implementing this interface. The service should be registered with the mimetype
* in the service's properties, so it can be identified. The <code>KEY_MIMETYPE</code> in
* this class can be used for this purpose.
*/
+@ConsumerType
public interface ArtifactHelper
{
public static final String KEY_MIMETYPE = "mimetype";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java Tue Mar 25 15:00:33 2014
@@ -21,9 +21,12 @@ package org.apache.ace.client.repository
import java.io.IOException;
import java.net.URL;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* An ArtifactPreprocessor processes an artifact before it is deployed.
*/
+@ConsumerType
public interface ArtifactPreprocessor {
/**
* Preprocesses a single artifact, uploads it to the obr, and returns the new URL as a string.
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java Tue Mar 25 15:00:33 2014
@@ -20,10 +20,13 @@ package org.apache.ace.client.repository
import java.util.Map;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Service interface for services that can recognize the type of an artifact, given a URL
* to that artifact.
*/
+@ConsumerType
public interface ArtifactRecognizer
{
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java Tue Mar 25 15:00:33 2014
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Denotes a 'physical' artifact that is located by an URL, and provide means to access the contents of this artifact.
* <p>
@@ -31,6 +33,7 @@ import java.net.URL;
* implementor of this class has to worry about this instead.
* </p>
*/
+@ProviderType
public interface ArtifactResource {
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java Tue Mar 25 15:00:33 2014
@@ -18,10 +18,13 @@
*/
package org.apache.ace.client.repository.helper;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Interface for resolving properties about the template's
* environment which are to be used by an ArtifactPreprocessor.
*/
+@ConsumerType
public interface PropertyResolver
{
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java Tue Mar 25 15:00:33 2014
@@ -30,10 +30,13 @@ import java.net.URLConnection;
import org.apache.ace.client.repository.helper.ArtifactPreprocessor;
import org.apache.ace.connectionfactory.ConnectionFactory;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* This class can be used as a base class for artifact preprocessors. It comes with its own upload() method, which will
* be used by all artifact preprocessors anyway.
*/
+@ConsumerType
public abstract class ArtifactPreprocessorBase implements ArtifactPreprocessor {
/** 64k buffers should be enough for everybody... */
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java Tue Mar 25 15:00:33 2014
@@ -43,10 +43,13 @@ import org.apache.ace.connectionfactory.
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* This class can be used as a 'default' artifact preprocessor, using the Velocity template engine to preprocess
* the artifact.
*/
+@ConsumerType
public class VelocityArtifactPreprocessor extends ArtifactPreprocessorBase {
// matches a valid OSGi version
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java Tue Mar 25 15:00:33 2014
@@ -22,9 +22,12 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.ArtifactObject;
import org.osgi.framework.Constants;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Definitions for a BundleHelper, which are used to treat an artifact as a bundle.
*/
+@ProviderType
public interface BundleHelper extends ArtifactHelper {
public static final String KEY_SYMBOLICNAME = Constants.BUNDLE_SYMBOLICNAME;
public static final String KEY_NAME = Constants.BUNDLE_NAME;
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.helper.ArtifactHelper;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Definitions for ConfigurationHelper,used to treat an artifact as an AutoConf file.
*/
+@ProviderType
public interface ConfigurationHelper extends ArtifactHelper {
public static final String KEY_FILENAME = "filename";
public static final String MIMETYPE = "application/xml:osgi-autoconf";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/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.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.helper.ArtifactHelper;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Definitions for the UserAdminHelper artifact helper.
*/
+@ProviderType
public interface UserAdminHelper extends ArtifactHelper {
public static final String MIMETYPE = "application/vnd.apache.ace.useradmin";
public static final String PROCESSOR = "org.apache.ace.resourceprocessor.useradmin";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.Association;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a Artifact2FeatureAssociation. Most functionality is defined by the generic Association.
*/
+@ProviderType
public interface Artifact2FeatureAssociation extends Association<ArtifactObject, FeatureObject> {
public static final String TOPIC_ENTITY_ROOT = Artifact2FeatureAssociation.class.getSimpleName() + "/";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java Tue Mar 25 15:00:33 2014
@@ -22,10 +22,13 @@ import java.util.List;
import org.apache.ace.client.repository.RepositoryObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to an ArtifactObject. The basic functionality is defined by RepositoryObject, but extended for
* artifact-specific information.
*/
+@ProviderType
public interface ArtifactObject extends RepositoryObject {
/**
* Key to be used in the <code>ArtifactObject</code>'s attributes.
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java Tue Mar 25 15:00:33 2014
@@ -18,10 +18,13 @@
*/
package org.apache.ace.client.repository.object;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a deployment artifact, which is used to gather information about
* the deployment of a single artifact.
*/
+@ProviderType
public interface DeploymentArtifact {
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java Tue Mar 25 15:00:33 2014
@@ -20,6 +20,8 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.RepositoryObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The interface to a DeploymentVersion. The basic functionality is defined
* by RepositoryObject, but extended for deployment version-specific information.
@@ -27,6 +29,7 @@ import org.apache.ace.client.repository.
* DeploymentVersions need some additional information about the artifacts they
* are associated with; see DeploymentArtifact.
*/
+@ProviderType
public interface DeploymentVersionObject extends RepositoryObject {
public static final String KEY_TARGETID = "targetID";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.Association;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a Distribution2TargetAssociation. Most functionality is defined by the generic Association.
*/
+@ProviderType
public interface Distribution2TargetAssociation extends Association<DistributionObject, TargetObject> {
public static final String TOPIC_ENTITY_ROOT = Distribution2TargetAssociation.class.getSimpleName() + "/";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java Tue Mar 25 15:00:33 2014
@@ -22,10 +22,13 @@ import java.util.List;
import org.apache.ace.client.repository.RepositoryObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a DistributionObject. The basic functionality is defined by RepositoryObject, but extended for
* distribution-specific information.
*/
+@ProviderType
public interface DistributionObject extends RepositoryObject {
public static final String TOPIC_ENTITY_ROOT = DistributionObject.class.getSimpleName() + "/";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.Association;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a Feature2DistributionAssociation. Most functionality is defined by the generic Association.
*/
+@ProviderType
public interface Feature2DistributionAssociation extends Association<FeatureObject, DistributionObject> {
public static final String TOPIC_ENTITY_ROOT = Feature2DistributionAssociation.class.getSimpleName() + "/";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java Tue Mar 25 15:00:33 2014
@@ -22,10 +22,13 @@ import java.util.List;
import org.apache.ace.client.repository.RepositoryObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a FeatureObject. The basic functionality is defined by RepositoryObject, but extended for
* feature-specific information.
*/
+@ProviderType
public interface FeatureObject extends RepositoryObject {
public static final String KEY_DESCRIPTION = "description";
public static final String KEY_NAME = "name";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java Tue Mar 25 15:00:33 2014
@@ -22,6 +22,9 @@ import java.util.List;
import org.apache.ace.client.repository.RepositoryObject;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface TargetObject extends RepositoryObject {
public static final String KEY_ID = "id";
public static final String KEY_AUTO_APPROVE = "autoapprove";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0.0
\ No newline at end of file
+version 1.1.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo Tue Mar 25 15:00:33 2014
@@ -1 +1 @@
-version 1.0.0
\ No newline at end of file
+version 2.0.0
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java Tue Mar 25 15:00:33 2014
@@ -23,8 +23,11 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.ArtifactObject;
import org.apache.ace.client.repository.object.FeatureObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a Artifact2FeatureAssociationRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface Artifact2FeatureAssociationRepository extends AssociationRepository<ArtifactObject, FeatureObject, Artifact2FeatureAssociation> {
}
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java Tue Mar 25 15:00:33 2014
@@ -26,9 +26,12 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.ArtifactObject;
import org.apache.ace.client.repository.object.TargetObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a ArtifactRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface ArtifactRepository extends ObjectRepository<ArtifactObject> {
static class ArtifactAlreadyExistsException extends IOException {
private final URL m_url;
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java Tue Mar 25 15:00:33 2014
@@ -7,10 +7,13 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.DeploymentArtifact;
import org.apache.ace.client.repository.object.DeploymentVersionObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a DeploymentVersionRepository. The functionality is defined by the generic ObjectRepository.
*/
+@ProviderType
public interface DeploymentVersionRepository extends ObjectRepository<DeploymentVersionObject> {
/**
* Creates a new inhabitant based on the given attributes and bundle URLs. The object
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java Tue Mar 25 15:00:33 2014
@@ -23,9 +23,12 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.Distribution2TargetAssociation;
import org.apache.ace.client.repository.object.DistributionObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a Distribution2TargetAssociationRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface Distribution2TargetAssociationRepository extends AssociationRepository<DistributionObject, TargetObject, Distribution2TargetAssociation> {
/**
* Creates an assocation from a given distribution to multiple targets, which correspond to the given
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java Tue Mar 25 15:00:33 2014
@@ -21,8 +21,11 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.ObjectRepository;
import org.apache.ace.client.repository.object.DistributionObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a DistributionRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface DistributionRepository extends ObjectRepository<DistributionObject> {
}
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java Tue Mar 25 15:00:33 2014
@@ -23,8 +23,11 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.FeatureObject;
import org.apache.ace.client.repository.object.DistributionObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a Feature2DistributionAssociationRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface Feature2DistributionAssociationRepository extends AssociationRepository<FeatureObject, DistributionObject, Feature2DistributionAssociation> {
}
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java Tue Mar 25 15:00:33 2014
@@ -21,8 +21,11 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.ObjectRepository;
import org.apache.ace.client.repository.object.FeatureObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a FeatureRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface FeatureRepository extends ObjectRepository<FeatureObject> {
}
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java Tue Mar 25 15:00:33 2014
@@ -21,9 +21,12 @@ package org.apache.ace.client.repository
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Provides the configuration options for several of the repositories.
*/
+@ProviderType
public interface RepositoryConfiguration {
/**
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java Tue Mar 25 15:00:33 2014
@@ -21,9 +21,12 @@ package org.apache.ace.client.repository
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Constants used for the repository.
*/
+@ProviderType
public interface RepositoryConstants {
/**
* Configuration key for hiding or showing unregistered targets. The value should either be a {@link Boolean} or a
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java Tue Mar 25 15:00:33 2014
@@ -21,8 +21,11 @@ package org.apache.ace.client.repository
import org.apache.ace.client.repository.ObjectRepository;
import org.apache.ace.client.repository.object.TargetObject;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Interface to a GatewayRepository. The functionality is defined by the generic AssociationRepository.
*/
+@ProviderType
public interface TargetRepository extends ObjectRepository<TargetObject>{
}
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/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.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java Tue Mar 25 15:00:33 2014
@@ -28,11 +28,14 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.DistributionObject;
import org.apache.ace.feedback.Event;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Represents the information that a <code>TargetObject</code>
* has, plus added functionality for gathering information from a deployment repository and,
* optionally, from an AuditLog.
*/
+@ProviderType
public interface StatefulTargetObject extends RepositoryObject {
public static final String TOPIC_ADDED = StatefulTargetObject.class.getName().replace('.', '/') + "/ADDED";
Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java (original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java Tue Mar 25 15:00:33 2014
@@ -22,9 +22,12 @@ import java.util.Map;
import org.apache.ace.client.repository.ObjectRepository;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Represents a repository of <ode>StatefulTargetObject</code>'s.
*/
+@ProviderType
public interface StatefulTargetRepository extends ObjectRepository<StatefulTargetObject> {
/**
Modified: ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -96,4 +96,6 @@ Import-Package: \
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Client REST itest
Bundle-Description: Integration test bundle for Apache ACE Client REST
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+
+-baseline:
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.client.rest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest/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,\
@@ -18,6 +19,6 @@ Private-Package: org.apache.ace.client.r
com.google.gson.reflect,\
com.google.gson.stream
Bundle-Activator: org.apache.ace.client.rest.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Client REST
Bundle-Description: Provides a REST binding for the Apache ACE Client
Modified: ace/trunk/org.apache.ace.client.workspace/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.workspace/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.workspace/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,\
Modified: ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -41,4 +41,5 @@ Private-Package: org.apache.ace.it.usera
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Configurator Useradmintask itest
Bundle-Description: Integration test bundle for Apache ACE Configurator Useradmintask
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+-baseline:
Modified: ace/trunk/org.apache.ace.configurator/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.configurator/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/trunk/org.apache.ace.configurator/impl.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/impl.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/impl.bnd (original)
+++ ace/trunk/org.apache.ace.configurator/impl.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Bundle-Activator: org.apache.ace.configurator.Activator
Private-Package: org.apache.ace.configurator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Configurator
Bundle-Description: Provides configuration component that feeds properties files to ConfigAdmin.
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.configurator/useradmin.task.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/useradmin.task.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/useradmin.task.bnd (original)
+++ ace/trunk/org.apache.ace.configurator/useradmin.task.bnd Tue Mar 25 15:00:33 2014
@@ -2,6 +2,6 @@ Private-Package: org.apache.ace.configur
org.apache.ace.repository.ext,\
org.apache.ace.repository.ext.impl
Bundle-Activator: org.apache.ace.configurator.useradmin.task.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Configurator Useradmintask
Bundle-Description: Registeres a runnable task that synchronizes user xml to useradmin
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.connectionfactory/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.connectionfactory/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.ace.test;version=latest,\
commons-codec;version=1.4
Modified: ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java (original)
+++ ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java Tue Mar 25 15:00:33 2014
@@ -24,10 +24,13 @@ import java.net.URLConnection;
import org.osgi.service.useradmin.User;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Provides a service to create {@link URLConnection}s. The connection factory will be responsible
* for supplying the necessary credentials to ensure the authentication of the connection succeeds.
*/
+@ProviderType
public interface ConnectionFactory {
/**
Modified: ace/trunk/org.apache.ace.consolelogger/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.consolelogger/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.consolelogger/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.consolelogger/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager
Modified: ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -65,4 +65,6 @@ Private-Package: org.apache.ace.it.deplo
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Deployment itest
Bundle-Description: Integration test bundle for Apache ACE Deployment
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+
+-baseline:
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/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.deployment/provider.api.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/provider.api.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/provider.api.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/provider.api.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.deployment.provider
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
Bundle-Name: Apache ACE Deployment Provider API
Bundle-Description: Provides the Deployment Provider API packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/provider.base.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/provider.base.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/provider.base.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/provider.base.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.deployment.provider.impl
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
Bundle-Name: Apache ACE Deployment Base
Bundle-Description: Provides the Deployemnt Base packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/provider.filebased.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/provider.filebased.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/provider.filebased.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/provider.filebased.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.deployment.provider.filebased,\
org.apache.ace.deployment.provider.impl
Bundle-Activator: org.apache.ace.deployment.provider.filebased.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Deployment Filebased
Bundle-Description: Registers a filebased Deployment Provider service
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/provider.repositorybased.bnd Tue Mar 25 15:00:33 2014
@@ -3,6 +3,6 @@ Private-Package: org.apache.ace.deployme
org.apache.ace.repository.ext,\
org.apache.ace.repository.ext.impl
Bundle-Activator: org.apache.ace.deployment.provider.repositorybased.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Deployment Provider Repository
Bundle-Description: Registers a repository based Deployemnt Provider service
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/servlet.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/servlet.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/servlet.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/servlet.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.deployment.servlet
Bundle-Activator: org.apache.ace.deployment.servlet.Activator
Export-Package: org.apache.ace.deployment.processor
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Deployment Servlet
Bundle-Description: Registers the Deployment Servlet
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java Tue Mar 25 15:00:33 2014
@@ -21,12 +21,15 @@ package org.apache.ace.deployment;
import java.io.InputStream;
import org.osgi.framework.Version;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Service that abstracts the actual implementation that manages components that are to be deployed.
* Implementations of this interface could for example make use of the <code>DeploymentAdmin</code>
* from the OSGi spec to actually deploy packages. The objects used as arguments and return values
* must all be of the same type, which type depends on the implementation.
*/
+@ProviderType
public interface Deployment {
/**
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java Tue Mar 25 15:00:33 2014
@@ -25,12 +25,15 @@ import java.io.InputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Deployment processors can post process the deployment package before it is sent to the original requester. This allows you to
* transform how the data is actually sent, allowing you to basically "repackage" the content on the fly. Deployment processors
* should be registered as services with a service property called "processor" which should match a request property of the same
* name and value.
*/
+@ProviderType
public interface DeploymentProcessor {
/**
* Post-process the stream and send it to the response. The input stream is the deployment package as it was generated. You
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java Tue Mar 25 15:00:33 2014
@@ -21,10 +21,13 @@ package org.apache.ace.deployment.provid
import java.net.URL;
import java.util.jar.Attributes;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The ArtifactData as returned by the <code>DeploymentProvider</code> class in this package. It contains several pieces
* of data which describe the artifact and the place where it can be found.
*/
+@ProviderType
public interface ArtifactData {
/**
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java Tue Mar 25 15:00:33 2014
@@ -21,10 +21,13 @@ package org.apache.ace.deployment.provid
import java.io.IOException;
import java.util.List;
+import aQute.bnd.annotation.ProviderType;
+
/**
* An interface that provides the meta information for the bundles
* in a certain version number.
*/
+@ProviderType
public interface DeploymentProvider {
/**
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java Tue Mar 25 15:00:33 2014
@@ -18,10 +18,13 @@
*/
package org.apache.ace.deployment.provider;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Exception that indicates that the deployment provider is overloaded.
* Callers that receive this exception should
*/
+@ProviderType
public class OverloadedException extends RuntimeException {
private static final long serialVersionUID = 915400242733422258L;
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Tue Mar 25 15:00:33 2014
@@ -24,9 +24,12 @@ import java.util.jar.Attributes;
import org.apache.ace.deployment.provider.ArtifactData;
import org.osgi.framework.Constants;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Implementation of <code>ArtifactData</code>. It overrides equals to make comparisons between versions easier.
*/
+@ConsumerType
public class ArtifactDataImpl implements ArtifactData {
public final static String HEADER_NAME = "Name";
public static final String CUSTOMIZER = "DeploymentPackage-Customizer";
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/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.deployment/src/org/apache/ace/deployment/provider/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/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.deployment/src/org/apache/ace/deployment/service/DeploymentService.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java Tue Mar 25 15:00:33 2014
@@ -23,12 +23,15 @@ import java.util.SortedSet;
import org.osgi.framework.Version;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Deployment service can be used to talk to the management agent about deployment packages,
* versions and updates, and to actually perform them. This interface coexists with the
* tasks that are also published by the management agent and that are probably more convenient
* if you just want to schedule (checks for) updates.
*/
+@ProviderType
public interface DeploymentService {
/**
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java Tue Mar 25 15:00:33 2014
@@ -23,6 +23,9 @@ import java.io.InputStream;
import org.apache.ace.deployment.provider.OverloadedException;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface StreamGenerator
{
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java Tue Mar 25 15:00:33 2014
@@ -31,6 +31,9 @@ import java.util.jar.Manifest;
import org.apache.ace.deployment.provider.ArtifactData;
import org.osgi.framework.Constants;
+import aQute.bnd.annotation.ConsumerType;
+
+@ConsumerType
public class BundleStreamGenerator {
public static Manifest getBundleManifest(String symbolicname, String version, Map<String, String> additionalHeaders) {
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java Tue Mar 25 15:00:33 2014
@@ -23,6 +23,9 @@ import java.util.jar.Attributes;
import org.apache.ace.deployment.provider.ArtifactData;
+import aQute.bnd.annotation.ConsumerType;
+
+@ConsumerType
public class TestData implements ArtifactData {
private final String m_fileName;
private final String m_symbolicName;
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java Tue Mar 25 15:00:33 2014
@@ -26,6 +26,9 @@ import java.util.List;
import org.apache.ace.deployment.provider.ArtifactData;
import org.apache.ace.deployment.provider.DeploymentProvider;
+import aQute.bnd.annotation.ConsumerType;
+
+@ConsumerType
public class TestProvider implements DeploymentProvider {
private List<ArtifactData> m_collection;
private List<String> m_versions;
Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/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.deployment/streamgenerator.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/streamgenerator.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/streamgenerator.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/streamgenerator.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.deployment.streamgenerator.impl
Bundle-Activator: org.apache.ace.deployment.streamgenerator.impl.Activator
Export-Package: org.apache.ace.deployment.streamgenerator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Deployment StreamGenerator
Bundle-Description: Registers a Deployment StreamGenerator service
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.deployment/util.test.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/util.test.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/util.test.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/util.test.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
Export-Package: org.apache.ace.deployment.util.test
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
Bundle-Name: Apache ACE Deployment Test util
Bundle-Description: Provide Deployment test utility packages
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.discovery/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/bnd.bnd Tue Mar 25 15:00:33 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/trunk/org.apache.ace.discovery/property.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/property.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/property.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/property.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.discovery.property,\
org.apache.ace.discovery.property.constants
Bundle-Activator: org.apache.ace.discovery.property.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Discovery Property
Bundle-Description: Registers a service factory for property based Discovery services
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java (original)
+++ ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java Tue Mar 25 15:00:33 2014
@@ -20,9 +20,12 @@ package org.apache.ace.discovery;
import java.net.URL;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Service interface that can be used to locate the server.
*/
+@ProviderType
public interface Discovery
{
Modified: ace/trunk/org.apache.ace.discovery/upnp.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/upnp.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/upnp.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/upnp.bnd Tue Mar 25 15:00:33 2014
@@ -1,5 +1,5 @@
Private-Package: org.apache.ace.discovery.upnp
Bundle-Activator: org.apache.ace.discovery.upnp.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Discovery UPnP
Bundle-Description: Registers a service factory for UPnP based Discovery services
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.feedback.common/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.feedback.common/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.feedback.common/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.feedback.common/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -4,5 +4,6 @@ Export-Package: org.apache.ace.feedback
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Feedback API
Bundle-Description: Provides the Apache ACE Feedback API packages
--buildpath: org.apache.ace.range.api;version=latest,\
+-buildpath: ${^-buildpath},\
+ org.apache.ace.range.api;version=latest,\
org.apache.ace.test;version=latest
\ No newline at end of file
Modified: ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.gogo.servlet/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.gogo/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.gogo/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.gogo/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.gogo/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
biz.aQute.repository;version=2.1.0,\
biz.aQute.bnd;version=2.1.0,\
org.osgi.impl.bundle.repoindex.lib,\
Modified: ace/trunk/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http.itest/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -27,4 +27,5 @@ Private-Package: org.apache.ace.it.http
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE HTTP itest
Bundle-Description: Integration test bundle for Apache ACE HTTP
-Bundle-Category: itest
\ No newline at end of file
+Bundle-Category: itest
+-baseline:
Modified: ace/trunk/org.apache.ace.http/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http/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.http/src/org/apache/ace/http/listener/constants/HttpConstants.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java (original)
+++ ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java Tue Mar 25 15:00:33 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.http.listener.constants;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface HttpConstants
{
/**
Modified: ace/trunk/org.apache.ace.identification/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.identification/bnd.bnd Tue Mar 25 15:00:33 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath},\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/trunk/org.apache.ace.identification/property.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/property.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/property.bnd (original)
+++ ace/trunk/org.apache.ace.identification/property.bnd Tue Mar 25 15:00:33 2014
@@ -1,6 +1,6 @@
Private-Package: org.apache.ace.identification.property,\
org.apache.ace.identification.property.constants
Bundle-Activator: org.apache.ace.identification.property.Activator
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Name: Apache ACE Identification Property
Bundle-Description: Registers a service factory for property based Identification services
\ No newline at end of file