X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2FOsgiBundle.java;h=420c7ad3d83cd071cc740c9e09cbd0be008498b9;hb=699640c58cc0578beebfc3edd00dac9eed65ee0b;hp=9fb09bebf588ea6fe071ac31d71b41760b87f4c6;hpb=5a7871454f57064cf5fb2be810dc1f26f744629e;p=gpl%2Fargeo-slc.git
diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
index 9fb09bebf..420c7ad3d 100644
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
@@ -1,20 +1,44 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.argeo.slc.osgi;
-import org.argeo.slc.build.BasicNameVersion;
+import org.argeo.slc.BasicNameVersion;
+import org.argeo.slc.NameVersion;
import org.argeo.slc.build.Distribution;
import org.argeo.slc.core.build.ResourceDistribution;
import org.argeo.slc.deploy.DeploymentData;
import org.argeo.slc.deploy.Module;
+import org.argeo.slc.deploy.ModuleDescriptor;
import org.argeo.slc.deploy.TargetData;
import org.argeo.slc.process.RealizedFlow;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
+import org.springframework.core.io.Resource;
+/** A deployed OSGi bundle. */
public class OsgiBundle extends BasicNameVersion implements Module {
+ private static final long serialVersionUID = 35073826504550477L;
+
private ResourceDistribution distribution;
private Long internalBundleId;
+ private String title;
+ private String description;
+
public OsgiBundle() {
}
@@ -23,11 +47,26 @@ public class OsgiBundle extends BasicNameVersion implements Module {
super(name, version);
}
+ public OsgiBundle(NameVersion nameVersion) {
+ super(nameVersion);
+ }
+
public OsgiBundle(Bundle bundle) {
super(bundle.getSymbolicName(), getVersionSafe(bundle));
internalBundleId = bundle.getBundleId();
}
+ /**
+ * Initialize from a {@link RealizedFlow}.
+ *
+ * @deprecated introduce an unnecessary dependency. TODO: create a separate
+ * helper.
+ */
+ public OsgiBundle(RealizedFlow realizedFlow) {
+ super(realizedFlow.getModuleName(), realizedFlow.getModuleVersion());
+ }
+
+ /** Utility to avoid NPE. */
private static String getVersionSafe(Bundle bundle) {
Object versionObj = bundle.getHeaders().get(Constants.BUNDLE_VERSION);
if (versionObj != null)
@@ -36,26 +75,35 @@ public class OsgiBundle extends BasicNameVersion implements Module {
return null;
}
- public OsgiBundle(RealizedFlow realizedFlow) {
- super(realizedFlow.getModuleName(), realizedFlow.getModuleVersion());
- }
-
+ /** Unique deployed system id. TODO: use internal bundle id when available? */
public String getDeployedSystemId() {
return getName() + ":" + getVersion();
}
+ /**
+ * OSGi bundle are self-contained and do not require additional deployment
+ * data.
+ *
+ * @return always null
+ */
public DeploymentData getDeploymentData() {
- throw new UnsupportedOperationException();
+ return null;
}
+ /** The related distribution. */
public Distribution getDistribution() {
return distribution;
}
+ /**
+ * The related distribution, a jar file with OSGi metadata referenced by a
+ * {@link Resource}.
+ */
public ResourceDistribution getResourceDistribution() {
return distribution;
}
+ /** TODO: reference the {@link OsgiRuntime} as target data? */
public TargetData getTargetData() {
throw new UnsupportedOperationException();
}
@@ -65,8 +113,8 @@ public class OsgiBundle extends BasicNameVersion implements Module {
}
/**
- * To be used for optimization when looking in the bundle context. Can
- * therefore be null.
+ * Bundle ID used by the OSGi runtime. To be used for optimization when
+ * looking in the bundle context. Can therefore be null.
*/
public Long getInternalBundleId() {
return internalBundleId;
@@ -77,4 +125,30 @@ public class OsgiBundle extends BasicNameVersion implements Module {
this.internalBundleId = internalBundleId;
}
+ /** Value of the Bundle-Name
directive. */
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String label) {
+ this.title = label;
+ }
+
+ /** Value of the Bundle-Description
directive. */
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public ModuleDescriptor getModuleDescriptor() {
+ ModuleDescriptor moduleDescriptor = new ModuleDescriptor();
+ moduleDescriptor.setName(getName());
+ moduleDescriptor.setVersion(getVersion());
+ moduleDescriptor.setDescription(description);
+ moduleDescriptor.setTitle(title);
+ return moduleDescriptor;
+ }
}