You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2014/03/25 15:15:55 UTC
svn commit: r1581337 [3/4] - in /ace/branches/1.0.0-semanticversion: build/
cnf/ cnf/buildrepo/biz.aQute.junit/ cnf/buildrepo/biz.aQute.launcher/
cnf/buildrepo/ee.minimum/ cnf/buildrepo/org.easymock/
cnf/buildrepo/org.osgi.ee.foundation/ cnf/buildrepo/...
Added: ace/branches/1.0.0-semanticversion/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/cnf/localrepo/index.xml.sha?rev=1581337&view=auto
==============================================================================
--- ace/branches/1.0.0-semanticversion/cnf/localrepo/index.xml.sha (added)
+++ ace/branches/1.0.0-semanticversion/cnf/localrepo/index.xml.sha Tue Mar 25 14:15:50 2014
@@ -0,0 +1 @@
+8e981cc9c9e9c4b0af2d7d4d5978e8ed86d7b29bc3b28ae7fae64dda347e53d1
\ No newline at end of file
Added: ace/branches/1.0.0-semanticversion/cnf/plugins/biz.aQute.bnd/biz.aQute.bnd-2.2.0.jar
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/cnf/plugins/biz.aQute.bnd/biz.aQute.bnd-2.2.0.jar?rev=1581337&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/branches/1.0.0-semanticversion/cnf/plugins/biz.aQute.bnd/biz.aQute.bnd-2.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/branches/1.0.0-semanticversion/cnf/plugins/biz.aQute.repository/biz.aQute.repository-2.1.0.jar
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/cnf/plugins/biz.aQute.repository/biz.aQute.repository-2.1.0.jar?rev=1581337&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/branches/1.0.0-semanticversion/cnf/plugins/biz.aQute.repository/biz.aQute.repository-2.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml (original)
+++ ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml Tue Mar 25 14:15:50 2014
@@ -1,2 +1,3 @@
<?xml version='1.0' encoding='utf-8'?>
-<repository increment='1342528672992' name='Release' xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'/>
+<repository increment='1394469233074' name='Release' xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'>
+</repository>
\ No newline at end of file
Added: ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml.sha
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml.sha?rev=1581337&view=auto
==============================================================================
--- ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml.sha (added)
+++ ace/branches/1.0.0-semanticversion/cnf/releaserepo/index.xml.sha Tue Mar 25 14:15:50 2014
@@ -0,0 +1 @@
+66fa082a961287d86ce6b229ade2480ae28af76f27e5ddd36f77f8e4f4521e4e
\ No newline at end of file
Added: ace/branches/1.0.0-semanticversion/cnf/src/.gitignore
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/cnf/src/.gitignore?rev=1581337&view=auto
==============================================================================
(empty)
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -8,7 +8,7 @@ Private-Package: org.apache.ace.agent.it
-runee: JavaSE-1.6
-runvm: -ea
-runfw: org.apache.felix.framework
--buildpath: osgi.core;version='[4.2,5)',\
+-buildpath: ${^-buildpath}, osgi.core;version='[4.2,5)',\
osgi.cmpn,\
junit.osgi,\
org.mockito.mockito-all,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent.launcher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent.launcher/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent.launcher/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent.launcher/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
org.apache.felix.framework,\
org.apache.ace.agent;version=latest,\
commons-codec,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent/.classpath
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent/.classpath?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent/.classpath (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent/.classpath Tue Mar 25 14:15:50 2014
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,7 +1,8 @@
Bundle-Activator: org.apache.ace.agent.impl.Activator
Bundle-Version: 1.0.0
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.felix.deploymentadmin,\
@@ -88,4 +89,4 @@ Import-Package: \
*
Bundle-Name: Apache ACE Agent
-Bundle-Description: Implementation of the Apache ACE Agent
\ No newline at end of file
+Bundle-Description: Implementation of the Apache ACE Agent
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/Constants.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/Constants.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/Constants.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/Constants.java Tue Mar 25 14:15:50 2014
@@ -18,11 +18,14 @@
*/
package org.apache.ace.agent;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Compile time constants for the bundle. Only located in the API package for development time visibility.
*
*/
+@ProviderType
public interface Constants {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgent.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgent.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgent.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgent.java Tue Mar 25 14:15:50 2014
@@ -18,11 +18,14 @@
*/
package org.apache.ace.agent;
+import aQute.bnd.annotation.ProviderType;
+
/**
* TODO implement or remove? The question is whether we want to expose a single API to the rest of the environment to
* allow client bundles to do deploy/log stuff.
*
*/
+@ProviderType
public interface ManagementAgent {
}
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgentFactory.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgentFactory.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgentFactory.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.agent/src/org/apache/ace/agent/ManagementAgentFactory.java Tue Mar 25 14:15:50 2014
@@ -20,10 +20,13 @@ package org.apache.ace.agent;
import java.util.Map;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Service interface for configuring the management agent.
*
*/
+@ConsumerType
public interface ManagementAgentFactory {
void updated(Map<String, String> configuration) throws Exception;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.ant.tasks/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.ant.tasks/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.ant.tasks/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.ant.tasks/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: ant;version=latest,\
+-buildpath: ${^-buildpath}, ant;version=latest,\
org.apache.ace.builder;version=latest
Export-Package: org.apache.ace.ant.deploymentpackage
Bundle-Version: 1.0.0
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.authentication.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.authentication.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.authentication.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.authentication.AuthenticationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath}, junit.osgi,\
osgi.core,\
osgi.cmpn,\
org.apache.ace.test;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,5 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath},\
+ osgi.core,\
osgi.cmpn,\
org.mockito.mockito-all,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,8 @@ package org.apache.ace.authentication.ap
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Provides a pluggable authentication processor, responsible for the actual authentication of a
* user based on given context information.
@@ -29,6 +31,7 @@ import org.osgi.service.useradmin.UserAd
* an order in which they should be used is determined based on their <em>service ranking</em>.
* </p>
*/
+@ConsumerType
public interface AuthenticationProcessor {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,8 @@ package org.apache.ace.authentication.ap
import org.osgi.service.useradmin.User;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Provides a generic and pluggable authentication service.
* <p>
@@ -30,6 +32,7 @@ import org.osgi.service.useradmin.User;
*
* @see AuthenticationProcessor
*/
+@ProviderType
public interface AuthenticationService {
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.builder/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.builder/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.builder/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.builder/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: org.apache.ace.test;version=latest
+-buildpath: ${^-buildpath}, org.apache.ace.test;version=latest
Export-Package: org.apache.ace.builder
Bundle-Version: 1.0.0
Bundle-Name: Apache ACE Builder
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java Tue Mar 25 14:15:50 2014
@@ -20,6 +20,9 @@ package org.apache.ace.builder;
import java.net.URL;
+import aQute.bnd.annotation.ConsumerType;
+
+@ConsumerType
public class ArtifactData {
private final URL m_url;
private boolean m_isBundle;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java Tue Mar 25 14:15:50 2014
@@ -30,6 +30,8 @@ import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Builder for deployment packages. Can handle bundles, resource processors and artifacts. Uses
* the builder pattern:
@@ -49,6 +51,7 @@ import java.util.zip.ZipEntry;
* bundles, resource processors and artifacts, but you don't have to specify all bundles
* and resource processors first and then all artifacts.
*/
+@ConsumerType
public class DeploymentPackageBuilder {
private static final String PREFIX_BUNDLE = "bundle-";
private static final String PREFIX_ARTIFACT = "artifact-";
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.automation/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.automation/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.automation/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.automation/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.scheduler.api;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath}, junit.osgi,\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
org.mockito.mockito-all,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java Tue Mar 25 14:15:50 2014
@@ -20,10 +20,13 @@ 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java Tue Mar 25 14:15:50 2014
@@ -20,11 +20,15 @@ package org.apache.ace.client.repository
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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java Tue Mar 25 14:15:50 2014
@@ -19,9 +19,13 @@
package org.apache.ace.client.repository;
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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,9 @@
*/
package org.apache.ace.client.repository;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public class RepositoryUtil
{
/**
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java Tue Mar 25 14:15:50 2014
@@ -18,6 +18,8 @@
*/
package org.apache.ace.client.repository;
+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
@@ -25,6 +27,7 @@ package org.apache.ace.client.repository
* 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. */
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java Tue Mar 25 14:15:50 2014
@@ -20,14 +20,18 @@ package org.apache.ace.client.repository
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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java Tue Mar 25 14:15:50 2014
@@ -42,10 +42,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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java Tue Mar 25 14:15:50 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> {
/**
* Gets a list of all ArtifactObject's which are resource processing bundles.
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java Tue Mar 25 14:15:50 2014
@@ -28,11 +28,14 @@ import org.apache.ace.client.repository.
import org.apache.ace.client.repository.object.DistributionObject;
import org.apache.ace.log.LogEvent;
+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/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
junit.osgi,\
@@ -95,4 +95,4 @@ 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
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java Tue Mar 25 14:15:50 2014
@@ -21,8 +21,8 @@ import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
-import aQute.lib.osgi.Builder;
-import aQute.lib.osgi.Jar;
+import aQute.bnd.osgi.Builder;
+import aQute.bnd.osgi.Jar;
import com.google.gson.Gson;
import com.sun.jersey.api.client.Client;
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.client.rest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.log.api;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.configurator.useradmin.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.configurator.useradmin.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath}, junit.osgi,\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.configurator/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.configurator/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.configurator/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.configurator/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.ace.test;version=latest,\
commons-codec;version=1.4
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.consolelogger/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.consolelogger/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.consolelogger/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.consolelogger/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath}, junit.osgi,\
osgi.core,\
osgi.cmpn,\
javax.servlet,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -12,7 +12,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;j
-runee: JavaSE-1.6
-runvm: -ea
-runfw: org.apache.felix.framework
--buildpath: osgi.core;version='[4.2,5)',\
+-buildpath: ${^-buildpath}, osgi.core;version='[4.2,5)',\
osgi.cmpn,\
junit.osgi,\
org.mockito.mockito-all,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment.rp.autoconf/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: org.apache.felix.deployment.rp.autoconf;version=0.1.4
+-buildpath: ${^-buildpath}, org.apache.felix.deployment.rp.autoconf;version=0.1.4
Bundle-Activator: org.apache.felix.deployment.rp.autoconf.Activator
Bundle-Description: Apache ACE AutoConf Resource Processor that warps the Apache Felix AutoConf Resource Processor implementation to add import package qualifiers
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: \
+-buildpath: ${^-buildpath}, \
osgi.core,\
osgi.cmpn,\
javax.servlet,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/Deployment.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/service/DeploymentService.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java Tue Mar 25 14:15:50 2014
@@ -21,6 +21,9 @@ package org.apache.ace.deployment.stream
import java.io.IOException;
import java.io.InputStream;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface StreamGenerator
{
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.discovery/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,4 +1,4 @@
--buildpath: osgi.core,\
+-buildpath: ${^-buildpath}, osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\
org.apache.ace.test;version=latest,\
Modified: ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java Tue Mar 25 14:15:50 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/branches/1.0.0-semanticversion/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/branches/1.0.0-semanticversion/org.apache.ace.http.itest/bnd.bnd?rev=1581337&r1=1581336&r2=1581337&view=diff
==============================================================================
--- ace/branches/1.0.0-semanticversion/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/branches/1.0.0-semanticversion/org.apache.ace.http.itest/bnd.bnd Tue Mar 25 14:15:50 2014
@@ -1,5 +1,5 @@
Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
+-buildpath: ${^-buildpath}, junit.osgi,\
osgi.core,\
osgi.cmpn,\
org.apache.felix.dependencymanager,\