svn commit: r1748688 [1/2] - in /ace/trunk: ./ cnf/buildrepo/osgi.annotation/ cnf/ext/ cnf/gradle/ cnf/localrepo/ org.apache.ace.agent/src/org/apache/ace/agent/ org.apache.ace.agent/src/org/apache/ace/agent/impl/ org.apache.ace.agent/test/org/apache/ac...

Thu, 16 Jun 2016 04:27:46 -0700 

Author: jawi
Date: Thu Jun 16 11:26:52 2016
New Revision: 1748688

URL: http://svn.apache.org/viewvc?rev=1748688&view=rev
Log:
ACE-594 - upgrade to standard OSGi annotations:

- use osgi.annotations library instead of Bnd's annotation library;
- upgraded to Bndtools 3.2 libraries;
- fixed a couple of warnings wrt JREs and code use.


Added:
    ace/trunk/cnf/buildrepo/osgi.annotation/
    ace/trunk/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar   (with 
props)
    ace/trunk/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar   (with props)
Removed:
    ace/trunk/cnf/gradle/biz.aQute.bnd.gradle-3.1.0.jar
    ace/trunk/org.apache.ace.webui.vaadin/.settings/org.eclipse.jdt.core.prefs
Modified:
    ace/trunk/build.gradle
    ace/trunk/cnf/ext/defaults.bnd
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/cnf/localrepo/index.xml.sha
    ace/trunk/gradle.properties
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java
    
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo
    
ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
    
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
    
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
    
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
    
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java
    
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
    ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Associatable.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/Association.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/AssociationRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/ObjectRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/PreCommitMember.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdmin.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryAdminLoginContext.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/RepositoryUtil.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/SessionFactory.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactHelper.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactPreprocessor.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactRecognizer.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/ArtifactResource.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/PropertyResolver.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/ArtifactPreprocessorBase.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/BundleHelper.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/ConfigurationHelper.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/UserAdminHelper.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Artifact2FeatureAssociation.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/ArtifactObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentArtifact.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DeploymentVersionObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Distribution2TargetAssociation.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/DistributionObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/Feature2DistributionAssociation.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/FeatureObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/TargetObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/object/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Artifact2FeatureAssociationRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/ArtifactRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DeploymentVersionRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Distribution2TargetAssociationRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/DistributionRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/Feature2DistributionAssociationRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/FeatureRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConfiguration.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/RepositoryConstants.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/TargetRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/repository/packageinfo
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetObject.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/StatefulTargetRepository.java
    
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/packageinfo
    
ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/ConnectionFactory.java
    
ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/packageinfo
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/DeploymentProcessor.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/processor/packageinfo
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/ArtifactData.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/DeploymentProvider.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/OverloadedException.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/ArtifactDataImpl.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/impl/packageinfo
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/packageinfo
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/StreamGenerator.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/packageinfo
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/BundleStreamGenerator.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestData.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
    
ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/packageinfo
    
ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/Discovery.java
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/packageinfo
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/package-info.java
    
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/Identification.java
    
ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/packageinfo
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/Log.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/LogSync.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/packageinfo
    
ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/LogStore.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/packageinfo
    
ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/LogStore.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/packageinfo
    
ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/MetadataGenerator.java
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/metadata/packageinfo
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/BundleStore.java
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/packageinfo
    ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/Range.java
    
ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/RangeIterator.java
    
ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
    ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/packageinfo
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/Repository.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/RepositoryReplication.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/BackupRepository.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/CachedRepository.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/CachedRepositoryImpl.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/FilebasedBackupRepository.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/RemoteRepository.java
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/impl/packageinfo
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/ext/packageinfo
    
ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/packageinfo
    
ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/UserAdminConfigurator.java
    
ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/packageinfo
    
ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java
    ace/trunk/org.apache.ace.verifier/.settings/org.eclipse.jdt.core.prefs
    
ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java
    
ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/packageinfo
    
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java
    
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/packageinfo
    ace/trunk/run-develop/.classpath
    ace/trunk/run-develop/bnd.bnd

Modified: ace/trunk/build.gradle
URL: 
http://svn.apache.org/viewvc/ace/trunk/build.gradle?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/build.gradle (original)
+++ ace/trunk/build.gradle Thu Jun 16 11:26:52 2016
@@ -25,6 +25,15 @@ if (bndWorkspace == null) {
   throw new GradleException("Unable to load workspace ${rootDir}/${bnd_cnf}")
 }
 
+/* Disable JavaDoc linting. */
+if (JavaVersion.current().isJava8Compatible()) {
+  allprojects {
+    tasks.withType(Javadoc) {
+      options.addStringOption('Xdoclint:none', '-quiet')
+    }
+  }
+}
+
 ext.cnf = rootProject.project(bnd_cnf)
 
 /* Configure the subprojects */
@@ -36,15 +45,5 @@ subprojects {
     test {
       useTestNG()
     }
-
-    tasks.withType(Javadoc) {
-        def runningJVM = JavaVersion.current().toString()
-        if (runningJVM.matches("1\\.8.*")) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
   }
-
-
 }
-

Added: ace/trunk/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar
URL: 
http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar?rev=1748688&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/osgi.annotation/osgi.annotation-6.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/cnf/ext/defaults.bnd
URL: 
http://svn.apache.org/viewvc/ace/trunk/cnf/ext/defaults.bnd?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/cnf/ext/defaults.bnd (original)
+++ ace/trunk/cnf/ext/defaults.bnd Thu Jun 16 11:26:52 2016
@@ -27,7 +27,7 @@ javac.debug:  on
 # Bnd Options
 -sources:       true
 -sourcepath:    ${project}/src
--buildpath:            biz.aQute.bnd.annotation
+-buildpath:     osgi.annotation;version='[6.0, 6.1)'
 
 # Default Bundle headers
 Bundle-DocURL: http://ace.apache.org/
@@ -45,7 +45,7 @@ itestrunprops: \
        org.osgi.service.http.port=28080,\
        org.apache.felix.eventadmin.Timeout=0,\
        org.apache.felix.log.storeDebug=true,\
-       org.apache.felix.log.maxSize=1000  
+       org.apache.felix.log.maxSize=1000
 
 # Enable semantic versioning for all bundles
 -baseline: *

Added: ace/trunk/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar
URL: 
http://svn.apache.org/viewvc/ace/trunk/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar?rev=1748688&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/cnf/localrepo/index.xml
URL: 
http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Thu Jun 16 11:26:52 2016
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<repository increment="1456435126000" name="Local" 
xmlns="http://www.osgi.org/xmlns/repository/v1.0.0";>
+<repository increment="1456818699000" name="Local" 
xmlns="http://www.osgi.org/xmlns/repository/v1.0.0";>
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="bcpkix"/>

Modified: ace/trunk/cnf/localrepo/index.xml.sha
URL: 
http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml.sha?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml.sha (original)
+++ ace/trunk/cnf/localrepo/index.xml.sha Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-12e0829683c24b79a9343db8aa3a17d08b7d0b614587f0967a4c4a100ab3ed57
\ No newline at end of file
+a0912f1c0359120e9701bbd515e4e3c8e29a2e62b92a43d7627305b1914fcc8f
\ No newline at end of file

Modified: ace/trunk/gradle.properties
URL: 
http://svn.apache.org/viewvc/ace/trunk/gradle.properties?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/gradle.properties (original)
+++ ace/trunk/gradle.properties Thu Jun 16 11:26:52 2016
@@ -2,7 +2,8 @@
 bnd_cnf=cnf
 
 # bnd_plugin is the dependency declaration for the bnd gradle plugin
-bnd_plugin=cnf/gradle/biz.aQute.bnd.gradle-3.1.0.jar
+#bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.2.0
+bnd_plugin=cnf/gradle/biz.aQute.bnd.gradle-3.2.0.jar
 
 # bnd_build can be set to the name of a "master" project whose dependencies 
will seed the set of projects to build.
 bnd_build=

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentConstants.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import org.apache.ace.feedback.AuditEvent;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Compile time constants for this package. Includes configuration keys and 
event topics.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContext.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import java.io.File;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Internal interface that provides access to handlers, supporting services 
and static configuration.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentContextAware.java 
Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Providers interface for (extension) components.
@@ -32,7 +32,7 @@ public interface AgentContextAware {
      * Use this method to register event listeners and/or perform other forms 
of initialization related tasks that need
      * to be done prior to {@link #start(AgentContext)} being called.
      * </p>
-     * 
+     *
      * @param agentContext
      *            the agent context that is initializing, never 
<code>null</code>.
      * @throws Exception
@@ -42,7 +42,7 @@ public interface AgentContextAware {
 
     /**
      * Called when the agent context is started.
-     * 
+     *
      * @param agentContext
      *            the agent context that is started, never <code>null</code>.
      * @throws Exception
@@ -52,7 +52,7 @@ public interface AgentContextAware {
 
     /**
      * Called when the agent context is stopped.
-     * 
+     *
      * @throws Exception
      *             if the component fails to stop, which is logged and ignored 
by the agent.
      */

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentControl.java 
Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The agent's control (service) interface. Provides control functions and 
access to configuration for consumers that

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/AgentUpdateHandler.java 
Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for managing agent 
updates.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
 (original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConfigurationHandler.java
 Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.agent;
 import java.util.Map;
 import java.util.Set;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for managing persisted 
configuration. External launchers may

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/ConnectionHandler.java 
Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for opening connection.
@@ -51,7 +51,7 @@ public interface ConnectionHandler {
 
     /**
      * Return a connection for the specified url.
-     * 
+     *
      * @param url The URL
      * @return The connection
      * @throws IOException If opening the connection fails

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DeploymentHandler.java 
Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that provides the deployment functions.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DiscoveryHandler.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for discovering 
servers. If the handler supports dynamic

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandle.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import java.util.concurrent.Future;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * A {@link DownloadHandle} provides control over an asynchronous download and 
access to the resulting file when the it

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadHandler.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Service interface for downloading content from a particular {@link URL}.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadResult.java 
Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.agent;
 import java.io.IOException;
 import java.io.InputStream;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Represents the result of a download task.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/DownloadState.java 
Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The state of a download handle that completed.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventListener.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import java.util.Map;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Listener interface for consumers that wish to be notified of agent events. 
This includes events deployment events as

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/EventsHandler.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.agent;
 
 import java.util.Map;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for handling events.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackChannel.java 
Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.agent;
 import java.io.IOException;
 import java.util.Map;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Represents a channel on which feedback information can be reported back to 
the server. An agent can configure

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java 
(original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/FeedbackHandler.java 
Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.agent;
 import java.io.IOException;
 import java.util.Set;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for handling feedback 
channels.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
 (original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/IdentificationHandler.java
 Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for target 
identification.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
 (original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/InstallationFailedException.java
 Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.agent;
 import org.apache.ace.agent.impl.DeploymentHandlerImpl;
 import org.osgi.service.deploymentadmin.DeploymentException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Generic exception that is thrown when an installation of an update failed.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/LoggingHandler.java 
Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.Formatter;
 
 import org.osgi.service.log.LogService;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Agent context delegate interface that is responsible for logging.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
 (original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/RetryAfterException.java
 Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.agent;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 
 /**

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/UpdateHandler.java 
Thu Jun 16 11:26:52 2016
@@ -24,7 +24,7 @@ import java.util.SortedSet;
 
 import org.osgi.framework.Version;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Generic interface for installing updates.

Modified: 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
 (original)
+++ 
ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
 Thu Jun 16 11:26:52 2016
@@ -47,7 +47,7 @@ import org.osgi.service.event.EventAdmin
 import org.osgi.service.log.LogService;
 import org.osgi.service.packageadmin.PackageAdmin;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"restriction","deprecation"})
 public class DeploymentHandlerImpl extends UpdateHandlerBase implements 
DeploymentHandler {
 
     /**

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo 
(original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/packageinfo Thu Jun 
16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file

Modified: 
ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
 (original)
+++ 
ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
 Thu Jun 16 11:26:52 2016
@@ -45,6 +45,7 @@ import org.eclipse.jetty.servlet.Servlet
  * Test utility that manages a Jetty webserver with a {@link DefaultServlet} 
that support HTTP range downloads and a
  * simple HTTP protocol dump filter. It can be extended with custom test 
servlets.
  */
+@SuppressWarnings("restriction")
 public class TestWebServer {
 
     static class HttpDumpFilter implements Filter {

Modified: 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
 (original)
+++ 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationProcessor.java
 Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.authentication.ap
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Provides a pluggable authentication processor, responsible for the actual 
authentication of a
@@ -45,7 +45,7 @@ public interface AuthenticationProcessor
      * and password might check whether the given context information consists 
of two
      * strings.
      * </p>
-     * 
+     *
      * @param context the context information to check, should never be 
<code>null</code> or an
      *        empty array.
      * @return <code>true</code> if this authentication processor can handle 
the given context
@@ -57,7 +57,7 @@ public interface AuthenticationProcessor
 
     /**
      * Authenticates a user based on the given context information.
-     * 
+     *
      * @param userAdmin the user admin service, to use for 
verifying/retrieving user information,
      *        cannot be <code>null</code>;
      * @param context the context information to authenticate the user with, 
should never be

Modified: 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
 (original)
+++ 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/AuthenticationService.java
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.authentication.ap
 
 import org.osgi.service.useradmin.User;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Provides a generic and pluggable authentication service.

Modified: 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
 (original)
+++ 
ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/api/packageinfo
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

Modified: 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java 
(original)
+++ 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/ArtifactData.java 
Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.builder;
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 @ConsumerType
 public class ArtifactData {
@@ -59,7 +59,7 @@ public class ArtifactData {
     /**
      * Some headers in OSGi allow for optional parameters, that are appended 
after the main value and always start with
      * a semicolon.
-     * 
+     *
      * @param name
      *            the name to remove the (optional) parameters from, cannot be 
<code>null</code>.
      * @return the cleaned name, never <code>null</code>.

Modified: 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
 (original)
+++ 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
 Thu Jun 16 11:26:52 2016
@@ -30,11 +30,11 @@ import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Builder for deployment packages. Can handle bundles, resource processors 
and artifacts. Uses the builder pattern:
- * 
+ *
  * <pre>
  * OutputStream out = new FileOutputStream(&quot;first.dp&quot;);
  * DeploymentPackageBuilder.createDeploymentPackage(&quot;mydp&quot;, 
&quot;1.0&quot;)
@@ -45,7 +45,7 @@ import aQute.bnd.annotation.ConsumerType
  *     .addArtifact(new URL(&quot;http://artifacts/data/v3.jar&quot;), 
&quot;rp.pid&quot;)
  *     .generate(out);
  * </pre>
- * 
+ *
  * For bundles and resource processors, you can simply point to a valid URL 
and it will be queried for all required
  * metadata. For artifacts, you need to specify both the URL and the PID of 
the resource processor. The builder will use
  * the order you specify for bundles, resource processors and artifacts, but 
you don't have to specify all bundles and
@@ -72,7 +72,7 @@ public class DeploymentPackageBuilder {
 
     /**
      * Creates a new deployment package.
-     * 
+     *
      * @param name
      *            the name of the deployment package
      * @param version
@@ -85,7 +85,7 @@ public class DeploymentPackageBuilder {
 
     /**
      * Adds an artifact to the deployment package.
-     * 
+     *
      * @param url
      *            a url that refers to the artifact
      * @param processorPID
@@ -107,7 +107,7 @@ public class DeploymentPackageBuilder {
 
     /**
      * Adds a bundle to the deployment package.
-     * 
+     *
      * @param url
      *            a url that refers to the bundle
      * @return a builder to further add data to the deployment package
@@ -120,7 +120,7 @@ public class DeploymentPackageBuilder {
 
     /**
      * Adds a resource processor to the deployment package. A resource 
processor is a special type of bundle.
-     * 
+     *
      * @param url
      *            a url that refers to the resource processor
      * @return a builder to further add data to the deployment package
@@ -134,7 +134,7 @@ public class DeploymentPackageBuilder {
     /**
      * Generates a deployment package and streams it to the output stream you 
provide. Before it starts generating, it
      * will first validate that you have actually specified a resource 
processor for each type of artifact you provided.
-     * 
+     *
      * @param output
      *            the output stream to write to
      * @throws Exception

Modified: 
ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo 
(original)
+++ ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/packageinfo Thu 
Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ 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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.List;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The Associatable interface is to be implemented by any object that wants to 
be used in an Association.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.List;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Represents a basic association between two Associatable objects, whose types

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import java.util.List;
 import java.util.Map;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Represents a basic repository of associations. The associations are to be 
of type

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import org.osgi.framework.Filter;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * A basic object repository, storing implementers of RepositoryObject.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.io.IOException;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * An interface that can be implemented by anybody that wants to be invoked as 
part of the

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.io.IOException;
 import org.apache.ace.client.repository.RepositoryObject.WorkingState;
 import org.osgi.service.useradmin.User;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.net.URL;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * RepositoryAdminLoginContext represents a context for logins to the 
repository admin. It is used to specify

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Map;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * A basic repository object, intended to be stored in a ObjectRepository of 
its given type.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.client.repository;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.Map;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Factory service for creating and destroying sessions. Sessions are 
identified by some kind

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.Comparator;
 import java.util.Map;
 import org.apache.ace.client.repository.object.ArtifactObject;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Interface to an artifact helper. For each type of artifact, there should be 
a helper

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -21,7 +21,7 @@ package org.apache.ace.client.repository
 import java.io.IOException;
 import java.net.URL;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * An ArtifactPreprocessor processes an artifact before it is deployed.
@@ -44,7 +44,7 @@ public interface ArtifactPreprocessor {
     /**
      * Indicates whether the template should be processed again, given the 
properties, and the version to which it
      * should be compared.
-     * 
+     *
      * @param url A string representing a URL to the original artifact.
      * @param props A PropertyResolver which can be used to fill in 'holes' in 
the template.
      * @param targetID The targetID of the target for which this artifact is 
being processed.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import java.util.Map;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Service interface for services that can recognize the type of an artifact, 
given a URL
@@ -32,7 +32,7 @@ public interface ArtifactRecognizer
     /**
      * Tries to determine the type of the artifact. If this recognizer cannot 
determine the type, it
      * should return <code>null</code>.
-     * 
+     *
      * @param artifact the artifact to recognize, cannot be <code>null</code>.
      * @return The mimetype of the artifact, or <code>null</code> if the 
artifact is not recognized.
      */
@@ -40,7 +40,7 @@ public interface ArtifactRecognizer
 
     /**
      * Gets the relevant metadata for this artifact.
-     * 
+     *
      * @param artifact the artifact to extract the metadata for, cannot be 
<code>null</code>.
      * @return A map of strings, representing the relevant metadata specific 
for this artifact. The
      *         keys are best defined in the corresponding 
<code>ArtifactHelper</code> interface for this type of artifact.
@@ -54,7 +54,7 @@ public interface ArtifactRecognizer
     /**
      * Indicates whether this recognizer can handle (i.e., extract metadata) 
from an artifact of
      * a given mime type.
-     * 
+     *
      * @param mimetype The mimetype of an artifact.
      * @return <code>true</code> when this type should be able to be handled 
by this recognizer;
      *         <code>false</code> otherwise.
@@ -63,9 +63,9 @@ public interface ArtifactRecognizer
 
     /**
      * Returns a preferred extension for the file name if a new one is created.
-     * 
+     *
      * @param artifact the artifact to get the extension for, cannot be 
<code>null</code>.
-     * 
+     *
      * @return The extension that is preferred or an empty string if there is 
none.
      */
     public String getExtension(ArtifactResource artifact);

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Denotes a 'physical' artifact that is located by an URL, and provide means 
to access the contents of this artifact.
@@ -43,14 +43,14 @@ public interface ArtifactResource {
      * this may fail due to, for example, missing authentication credentials. 
Use {@link #openStream()} instead to
      * access the contents of the resource.
      * </p>
-     * 
+     *
      * @return the URL to the 'physical' location of the artifact, never 
<code>null</code>.
      */
     URL getURL();
 
     /**
      * Returns the size, in bytes, of this artifact.
-     * 
+     *
      * @return a size, in bytes, >= 0L. If the size of this artifact is 
unknown, <tt>-1L</tt> should be returned.
      * @throws IOException
      *             in case of I/O errors determining the size of the artifact.
@@ -59,7 +59,7 @@ public interface ArtifactResource {
 
     /**
      * Provides access to the contents of the artifact.
-     * 
+     *
      * @return an input stream, never <code>null</code>.
      * @throws IOException
      *             in case of I/O errors opening the artifact.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.client.repository.helper;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * Interface for resolving properties about the template's

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -30,7 +30,7 @@ import java.net.URLConnection;
 import org.apache.ace.client.repository.helper.ArtifactPreprocessor;
 import org.apache.ace.connectionfactory.ConnectionFactory;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * This class can be used as a base class for artifact preprocessors. It comes 
with its own upload() method, which will

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -43,7 +43,7 @@ import org.apache.ace.connectionfactory.
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * This class can be used as a 'default' artifact preprocessor, using the 
Velocity template engine to preprocess

Modified: 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
 (original)
+++ 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/packageinfo
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.2
\ No newline at end of file

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.object.ArtifactObject;
 import org.osgi.framework.Constants;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Definitions for a BundleHelper, which are used to treat an artifact as a 
bundle.

Modified: 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
 (original)
+++ 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/packageinfo
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import org.apache.ace.client.repository.helper.ArtifactHelper;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Definitions for ConfigurationHelper,used to treat an artifact as an 
AutoConf file.

Modified: 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
 (original)
+++ 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/packageinfo
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.2
\ No newline at end of file

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ 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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import org.apache.ace.client.repository.helper.ArtifactHelper;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Definitions for the UserAdminHelper artifact helper.

Modified: 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo?rev=1748688&r1=1748687&r2=1748688&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
 (original)
+++ 
ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/packageinfo
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.2
\ No newline at end of file

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import org.apache.ace.client.repository.Association;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a Artifact2FeatureAssociation. Most functionality is defined 
by the generic Association.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to an ArtifactObject. The basic functionality is defined by 
RepositoryObject, but extended for
@@ -63,7 +63,7 @@ public interface ArtifactObject extends
      * Holds a human-readable description for this artifact.
      */
     public static final String KEY_ARTIFACT_DESCRIPTION = 
"artifactDescription";
-    /** 
+    /**
      * Key to be used in the <code>ArtifactObject</code>'s attributes.
      * Holds the (estimated) size, in bytes, for this artifact.
      */
@@ -108,7 +108,7 @@ public interface ArtifactObject extends
      */
     public String getURL();
     /**
-     * Returns a ResourceId, if that has been customized. 
+     * Returns a ResourceId, if that has been customized.
      */
     public String getResourceId();
     /**

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -18,7 +18,7 @@
  */
 package org.apache.ace.client.repository.object;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a deployment artifact, which is used to gather information 
about
@@ -57,7 +57,7 @@ public interface DeploymentArtifact {
      * @return the URL for this deployment artifact.
      */
     public String getUrl();
-    
+
     /**
      * @return the (estimated) size of this deployment artifact, in bytes.
      */

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * The interface to a DeploymentVersion. The basic functionality is defined

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import org.apache.ace.client.repository.Association;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a Distribution2TargetAssociation. Most functionality is 
defined by the generic Association.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a DistributionObject. The basic functionality is defined by 
RepositoryObject, but extended for

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -20,7 +20,7 @@ package org.apache.ace.client.repository
 
 import org.apache.ace.client.repository.Association;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a Feature2DistributionAssociation. Most functionality is 
defined by the generic Association.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a FeatureObject. The basic functionality is defined by 
RepositoryObject, but extended for

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.ace.client.repository.RepositoryObject;
 
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
 
 @ProviderType
 public interface TargetObject extends RepositoryObject {

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 1.1.0
\ No newline at end of file
+version 1.1.1
\ 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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ 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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -23,7 +23,7 @@ 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;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a Artifact2FeatureAssociationRepository. The functionality is 
defined by the generic AssociationRepository.

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=1748688&r1=1748687&r2=1748688&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
 Thu Jun 16 11:26:52 2016
@@ -26,7 +26,7 @@ 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;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Interface to a ArtifactRepository. The functionality is defined by the 
generic AssociationRepository.
@@ -67,7 +67,7 @@ public interface ArtifactRepository exte
 
     /**
      * Tries to import an artifact into storage, while extracting necessary 
metadata.
-     * 
+     *
      * @param artifact
      *            a URL pointing to the 'physical' artifact.
      * @param upload
@@ -85,7 +85,7 @@ public interface ArtifactRepository exte
 
     /**
      * Checks whether an artifact is 'usable', that is, there is a resource 
processor available for it, if necessary.
-     * 
+     *
      * @param artifact
      *            A URL pointing to an artifact.
      * @return <code>true</code> if the artifact is recognized, and a 
processor for it is available. <code>false</code>
@@ -95,7 +95,7 @@ public interface ArtifactRepository exte
 
     /**
      * Tries to import an artifact into storage, while extracting necessary 
metadata.
-     * 
+     *
      * @param artifact
      *            a URL pointing to the 'physical' artifact.
      * @param mimetype
@@ -114,7 +114,7 @@ public interface ArtifactRepository exte
     /**
      * Tries to locate a preprocessor for the passed artifact, an processes 
it. If no processing needs to be done, the
      * original artifact's URL will be returned.
-     * 
+     *
      * @param artifact
      *            An artifact
      * @param props
@@ -132,7 +132,7 @@ public interface ArtifactRepository exte
     /**
      * Indicates whether the template should be processed again, given the 
properties, and the version to which it
      * should be compared.
-     * 
+     *
      * @param url
      *            A string representing a URL to the original artifact.
      * @param props

Reply via email to