You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2010/04/02 11:41:03 UTC
svn commit: r930207 - in /incubator/aries/trunk/subsystem/subsystem-api: ./
src/main/java/org/apache/aries/subsystem/
src/main/java/org/apache/aries/subsystem/spi/
Author: gnodet
Date: Fri Apr 2 09:41:02 2010
New Revision: 930207
URL: http://svn.apache.org/viewvc?rev=930207&view=rev
Log:
[subsystem] add a few constants, fix scope, export all packages
Modified:
incubator/aries/trunk/subsystem/subsystem-api/pom.xml
incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/Subsystem.java
incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/SubsystemConstants.java
incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/spi/Resource.java
Modified: incubator/aries/trunk/subsystem/subsystem-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-api/pom.xml?rev=930207&r1=930206&r2=930207&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-api/pom.xml (original)
+++ incubator/aries/trunk/subsystem/subsystem-api/pom.xml Fri Apr 2 09:41:02 2010
@@ -34,7 +34,7 @@
<properties>
<aries.osgi.export.pkg>
- org.apache.aries.subsystem;
+ org.apache.aries.subsystem*
</aries.osgi.export.pkg>
</properties>
Modified: incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/Subsystem.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/Subsystem.java?rev=930207&r1=930206&r2=930207&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/Subsystem.java (original)
+++ incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/Subsystem.java Fri Apr 2 09:41:02 2010
@@ -85,7 +85,7 @@ public interface Subsystem {
/**
* Retrieve the scope of the subsystem.
* The scope is computed as
- * <code>getSymbolicName() + getVersion().toString()</code>.
+ * <code>getSymbolicName() + "_" + getVersion().toString()</code>.
* It is guaranteed to be unique in the parent composite bundle
* or framework, but it not guaranteed to be unique in the whole
* OSGi framework, nor immutable as the value can change if
Modified: incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/SubsystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/SubsystemConstants.java?rev=930207&r1=930206&r2=930207&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/SubsystemConstants.java (original)
+++ incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/SubsystemConstants.java Fri Apr 2 09:41:02 2010
@@ -26,53 +26,75 @@ public class SubsystemConstants {
* The subsystem manifest version header must be present and equals to 1.0
* for this version of subsystems.
*/
- public static final String SUBSYSTEM_MANIFESTVERSION = "Subsystem-ManifestVersion";
+ public static final String SUBSYSTEM_MANIFESTVERSION = "Subsystem-ManifestVersion";
/**
* Symbolic name for the subsystem. Must be present.
*/
- public static final String SUBSYSTEM_SYMBOLICNAME = "Subsystem-SymbolicName";
+ public static final String SUBSYSTEM_SYMBOLICNAME = "Subsystem-SymbolicName";
/**
* Version of the subsystem
*/
- public static final String SUBSYSTEM_VERSION = "Subsystem-Version";
+ public static final String SUBSYSTEM_VERSION = "Subsystem-Version";
/**
* Human readable name
*/
- public static final String SUBSYSTEM_NAME = "Subsystem-Name";
+ public static final String SUBSYSTEM_NAME = "Subsystem-Name";
/**
* Human readable description
*/
- public static final String SUBSYSTEM_DESCRIPTION = "Subsystem-Description";
+ public static final String SUBSYSTEM_DESCRIPTION = "Subsystem-Description";
/**
* Name of the resource to use for localized headers
*/
- public static final String SUBSYSTEM_LOCALIZATION = "Subsystem-Localization";
+ public static final String SUBSYSTEM_LOCALIZATION = "Subsystem-Localization";
/**
* Location to use when updating the subsystem
*/
- public static final String SUBSYSTEM_UPDATELOCATION = "Subsystem-UpdateLocation";
+ public static final String SUBSYSTEM_UPDATELOCATION = "Subsystem-UpdateLocation";
- public static final String SUBSYSTEM_CONTENT = "Subsystem-Content";
- public static final String SUBSYSTEM_RESOURCES = "Subsystem-Resources";
+ public static final String SUBSYSTEM_CONTENT = "Subsystem-Content";
+ public static final String SUBSYSTEM_RESOURCES = "Subsystem-Resources";
- public static final String SUBSYSTEM_IMPORTPACKAGE = "Subsystem-ImportPackage";
- public static final String SUBSYSTEM_EXPORTPACKAGE = "Subsystem-ExportPackage";
- public static final String SUBSYSTEM_IMPORTSERVICE = "Subsystem-ImportService";
- public static final String SUBSYSTEM_EXPORTSERVICE = "Subsystem-ExportService";
- public static final String SUBSYSTEM_REQUIREBUNDLE = "Subsystem-RequireBundle";
+ public static final String SUBSYSTEM_IMPORTPACKAGE = "Subsystem-ImportPackage";
+ public static final String SUBSYSTEM_EXPORTPACKAGE = "Subsystem-ExportPackage";
+ public static final String SUBSYSTEM_IMPORTSERVICE = "Subsystem-ImportService";
+ public static final String SUBSYSTEM_EXPORTSERVICE = "Subsystem-ExportService";
+ public static final String SUBSYSTEM_REQUIREBUNDLE = "Subsystem-RequireBundle";
/**
* Directive on the manifest header of a composite indicating the
* composite is managed as a subsystem.
*/
- public static final String SUBSYSTEM_DIRECTIVE = "subsystem";
+ public static final String SUBSYSTEM_DIRECTIVE = "subsystem";
+
+ public static final String SERVICE_RESOURCE_TYPE = "resource-type";
+
+ /**
+ * Attribute to indicate the type on a resource
+ */
+ public static final String RESOURCE_TYPE_ATTRIBUTE = "type";
+
+ /**
+ * Identify resources that are bundles.
+ */
+ public static final String RESOURCE_TYPE_BUNDLE = "bundle";
+
+ /**
+ * Identify resources that are subsystems.
+ */
+ public static final String RESOURCE_TYPE_SUBSYSTEM = "subsystem";
+
+ /**
+ * Attribute to indicate the type on a resource
+ */
+ public static final String RESOURCE_LOCATION_ATTRIBUTE = "location";
/*
String APPLICATION_SYMBOLICNAME = "Application-SymbolicName";
Modified: incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/spi/Resource.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/spi/Resource.java?rev=930207&r1=930206&r2=930207&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/spi/Resource.java (original)
+++ incubator/aries/trunk/subsystem/subsystem-api/src/main/java/org/apache/aries/subsystem/spi/Resource.java Fri Apr 2 09:41:02 2010
@@ -20,21 +20,11 @@ import org.osgi.framework.Version;
/**
* A resource is the representation of a uniquely identified and typed data.
- * A bundle is represented as a resource with a type {@link #TYPE_BUNDLE}.
+ * A bundle is represented as a resource with a type {@link org.apache.aries.subsystem.SubsystemConstants#RESOURCE_TYPE_BUNDLE}.
*/
public interface Resource {
/**
- * Identify resources that are bundles.
- */
- public static final String TYPE_BUNDLE = "bundle";
-
- /**
- * Identify resources that are subsystems.
- */
- public static final String TYPE_SUBSYSTEM = "subsystem";
-
- /**
* Symbolic name of the resource
*
* @return