Modified: ace/trunk/org.apache.ace.test/bnd.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.test/bnd.bnd (original) +++ ace/trunk/org.apache.ace.test/bnd.bnd Tue Mar 25 15:00:33 2014 @@ -1,4 +1,4 @@ --buildpath: \ +-buildpath: ${^-buildpath},\ osgi.core,\ osgi.cmpn,\ junit.osgi,\ @@ -11,8 +11,9 @@ Import-Package: \ junit.framework;resolution:=optional,\ org.apache.felix.service.command;resolution:=optional,\ * -Bundle-Version: 1.0.0 + +Bundle-Version: 1.1.0 Bundle-Name: Apache ACE Test Bundle-Description: Provides base classes and utils for integration tests Private-Package: org.apache.ace.it.gogo -Bundle-Activator: org.apache.ace.it.gogo.Activator \ No newline at end of file +Bundle-Activator: org.apache.ace.it.gogo.Activator
Modified: ace/trunk/org.apache.ace.test/src/org/apache/ace/it/packageinfo URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/it/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.test/src/org/apache/ace/it/packageinfo (original) +++ ace/trunk/org.apache.ace.test/src/org/apache/ace/it/packageinfo Tue Mar 25 15:00:33 2014 @@ -1 +1 @@ -version 1.0 \ No newline at end of file +version 1.1.0 \ No newline at end of file Modified: ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java (original) +++ ace/trunk/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java Tue Mar 25 15:00:33 2014 @@ -18,11 +18,14 @@ */ package org.apache.ace.test.constants; +import aQute.bnd.annotation.ProviderType; + /** * Constants for global test parameters. Use these throughout the test * codebase. Make sure to only use public static finals here, which * can be inlined by the compiler. */ +@ProviderType public interface TestConstants { /** The port the webserver is running on for testing. */ public static final int PORT = 8080; Modified: ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/packageinfo URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/packageinfo?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/packageinfo (original) +++ ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/packageinfo Tue Mar 25 15:00:33 2014 @@ -1 +1 @@ -version 1.0 \ No newline at end of file +version 1.1.0 \ No newline at end of file Modified: ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd (original) +++ ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd Tue Mar 25 15:00:33 2014 @@ -55,4 +55,5 @@ Private-Package: org.apache.ace.useradmi Bundle-Version: 1.0.0 Bundle-Name: Apache ACE UserAdminUI itest Bundle-Description: Integration test bundle for Apache ACE UserAdminUI -Bundle-Category: itest \ No newline at end of file +Bundle-Category: itest +-baseline: Modified: ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd (original) +++ ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd Tue Mar 25 15:00:33 2014 @@ -1,4 +1,5 @@ --buildpath: org.apache.felix.dependencymanager,\ +-buildpath: ${^-buildpath},\ + org.apache.felix.dependencymanager,\ osgi.core,\ osgi.cmpn,\ com.vaadin,\ @@ -9,7 +10,7 @@ javax.servlet,\ org.apache.ace.webui.vaadin;version=latest Bundle-Activator: org.apache.ace.useradmin.ui.osgi.Activator -Bundle-Version: 1.0.0 +Bundle-Version: 2.0.0 Private-Package: org.apache.ace.useradmin.ui.osgi,\ org.apache.ace.useradmin.ui.vaadin,\ org.apache.ace.useradmin.ui.editor.impl Added: ace/trunk/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/packageinfo URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/packageinfo?rev=1581365&view=auto ============================================================================== --- ace/trunk/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/packageinfo (added) +++ ace/trunk/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/packageinfo Tue Mar 25 15:00:33 2014 @@ -0,0 +1 @@ +version 2.0.0 \ No newline at end of file Modified: ace/trunk/org.apache.ace.verifier/bnd.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.verifier/bnd.bnd (original) +++ ace/trunk/org.apache.ace.verifier/bnd.bnd Tue Mar 25 15:00:33 2014 @@ -1,4 +1,4 @@ --buildpath: \ +-buildpath: ${^-buildpath},\ osgi.core;version=4.3.1,\ osgi.cmpn;version=4.3.1,\ javax.servlet,\ Modified: ace/trunk/org.apache.ace.verifier/impl.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/impl.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.verifier/impl.bnd (original) +++ ace/trunk/org.apache.ace.verifier/impl.bnd Tue Mar 25 15:00:33 2014 @@ -10,7 +10,7 @@ Private-Package: org.apache.felix.framew org.apache.ace.deployment.verifier.impl Import-Package: org.osgi.framework;version='[1.5,2)',\ * -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.1 Bundle-Activator: org.apache.ace.deployment.verifier.impl.Activator Bundle-Name: Apache ACE Verifier Service Bundle-Description: Registers the Apache ACE verifier service \ No newline at end of file Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java (original) +++ ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/VerifierService.java Tue Mar 25 15:00:33 2014 @@ -27,7 +27,9 @@ import org.osgi.framework.wiring.BundleR import org.osgi.framework.wiring.BundleRevision; import org.osgi.service.log.LogEntry; +import aQute.bnd.annotation.ProviderType; +@ProviderType public interface VerifierService { public static final String EE_1_7 = "JavaSE-1.6,JavaSE-1.7,J2SE-1.5,J2SE-1.4,J2SE-1.3,OSGi/Minimum-1.2,OSGi/Minimum-1.1,OSGi/Minimum-1.0"; public static final String EE_1_6 = "JavaSE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3,OSGi/Minimum-1.2,OSGi/Minimum-1.1,OSGi/Minimum-1.0"; Modified: ace/trunk/org.apache.ace.verifier/ui.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/ui.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.verifier/ui.bnd (original) +++ ace/trunk/org.apache.ace.verifier/ui.bnd Tue Mar 25 15:00:33 2014 @@ -2,6 +2,6 @@ Private-Package: org.apache.ace.deployme Bundle-Activator: org.apache.ace.deployment.verifier.ui.Activator Import-Package: org.osgi.framework;version='[1.5,2)',\ * -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.1 Bundle-Name: Apache ACE Verifier UI Bundle-Description: Registers an ACE webui extension that adds verifier functions \ No newline at end of file Modified: ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd (original) +++ ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd Tue Mar 25 15:00:33 2014 @@ -1,4 +1,5 @@ --buildpath: osgi.cmpn,\ +-buildpath: ${^-buildpath},\ + osgi.cmpn,\ org.apache.felix.dependencymanager,\ com.vaadin;version=latest,\ org.apache.ace.client.repository.api;version=latest,\ @@ -13,6 +14,6 @@ Private-Package: org.apache.ace.webui.do Export-Package: org.apache.ace.webui Include-Resource: resources/ Bundle-Activator: org.apache.ace.webui.vaadin.Activator -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.1 Bundle-Name: Apache ACE WebUI Vaadin Bundle-Description: Provides the base ACE WebUI based on Vaadin \ No newline at end of file Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java (original) +++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/NamedObject.java Tue Mar 25 15:00:33 2014 @@ -20,6 +20,9 @@ package org.apache.ace.webui; import org.apache.ace.client.repository.RepositoryObject; +import aQute.bnd.annotation.ProviderType; + +@ProviderType public interface NamedObject { String getName(); Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java?rev=1581365&r1=1581364&r2=1581365&view=diff ============================================================================== --- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java (original) +++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/UIExtensionFactory.java Tue Mar 25 15:00:33 2014 @@ -20,12 +20,15 @@ package org.apache.ace.webui; import java.util.Map; +import aQute.bnd.annotation.ConsumerType; + import com.vaadin.ui.Component; /** * Creates components for named extension points in the Vaadin UI. Extension factories * are used throughout the UI to allow other bundles to contribute features. */ +@ConsumerType public interface UIExtensionFactory { public static final String EXTENSION_POINT_KEY = "extension_point"; public static final String EXTENSION_POINT_VALUE_ARTIFACT = "artifact";
