X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2FOsgiBundle.java;h=420c7ad3d83cd071cc740c9e09cbd0be008498b9;hb=699640c58cc0578beebfc3edd00dac9eed65ee0b;hp=ede0986a2a0e9aa343e8cf0856f687e8a8e77309;hpb=649ed86fb73062b5773770fb1892eded24b74038;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 ede0986a2..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,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * 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.
@@ -13,15 +13,15 @@
  * 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.build.NameVersion;
 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;
@@ -30,13 +30,13 @@ import org.springframework.core.io.Resource;
 
 /** A deployed OSGi bundle. */
 public class OsgiBundle extends BasicNameVersion implements Module {
-	private static final long serialVersionUID = -1970854723780452072L;
+	private static final long serialVersionUID = 35073826504550477L;
 
 	private ResourceDistribution distribution;
 
 	private Long internalBundleId;
 
-	private String label;
+	private String title;
 	private String description;
 
 	public OsgiBundle() {
@@ -126,12 +126,12 @@ public class OsgiBundle extends BasicNameVersion implements Module {
 	}
 
 	/** Value of the <code>Bundle-Name</code> directive. */
-	public String getLabel() {
-		return label;
+	public String getTitle() {
+		return title;
 	}
 
-	public void setLabel(String label) {
-		this.label = label;
+	public void setTitle(String label) {
+		this.title = label;
 	}
 
 	/** Value of the <code>Bundle-Description</code> directive. */
@@ -143,4 +143,12 @@ public class OsgiBundle extends BasicNameVersion implements Module {
 		this.description = description;
 	}
 
+	public ModuleDescriptor getModuleDescriptor() {
+		ModuleDescriptor moduleDescriptor = new ModuleDescriptor();
+		moduleDescriptor.setName(getName());
+		moduleDescriptor.setVersion(getVersion());
+		moduleDescriptor.setDescription(description);
+		moduleDescriptor.setTitle(title);
+		return moduleDescriptor;
+	}
 }