You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2009/10/30 15:19:19 UTC
svn commit: r831306 -
/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
Author: rickmcguire
Date: Fri Oct 30 14:19:19 2009
New Revision: 831306
URL: http://svn.apache.org/viewvc?rev=831306&view=rev
Log:
Use OSGi framework constants for generated manifest headers
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=831306&r1=831305&r2=831306&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Fri Oct 30 14:19:19 2009
@@ -34,6 +34,8 @@
import org.apache.geronimo.system.osgi.BootActivator;
import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.osgi.framework.Constants;
+
/**
* Jar up a packaged plugin
*
@@ -224,24 +226,25 @@
if (configFile.exists()) {
StringBuilder imports = new StringBuilder("org.apache.geronimo.kernel.osgi,");
if (boot) {
- archive.addManifestEntry("Bundle-Activator", BootActivator.class.getName());
+ archive.addManifestEntry(Constants.BUNDLE_ACTIVATOR, BootActivator.class.getName());
imports.append("org.apache.geronimo.system.osgi,");
} else {
- archive.addManifestEntry("Bundle-Activator", ConfigurationActivator.class.getName());
+ archive.addManifestEntry(Constants.BUNDLE_ACTIVATOR, ConfigurationActivator.class.getName());
}
- archive.addManifestEntry("Bundle-Name", project.getName());
- archive.addManifestEntry("Bundle-Vendor", project.getOrganization().getName());
+ archive.addManifestEntry(Constants.BUNDLE_NAME, project.getName());
+ archive.addManifestEntry(Constants.BUNDLE_VENDOR, project.getOrganization().getName());
ArtifactVersion version = project.getArtifact().getSelectedVersion();
String versionString = "" + version.getMajorVersion() + "." + version.getMinorVersion() + "." + version.getIncrementalVersion();
if (version.getQualifier() != null) {
versionString += "." + version.getQualifier();
}
- archive.addManifestEntry("Bundle-Version", versionString);
- archive.addManifestEntry("Bundle-ManifestVersion", "2");
- archive.addManifestEntry("Bundle-Description", project.getDescription());
+ archive.addManifestEntry(Constants.BUNDLE_VERSION, versionString);
+ archive.addManifestEntry(Constants.BUNDLE_MANIFESTVERSION, "2");
+ archive.addManifestEntry(Constants.BUNDLE_DESCRIPTION, project.getDescription());
+ // NB, no constant for this one
archive.addManifestEntry("Bundle-License", ((License)project.getLicenses().get(0)).getUrl());
- archive.addManifestEntry("Bundle-DocURL", project.getUrl());
- archive.addManifestEntry("Bundle-SymbolicName", project.getGroupId() + "." + project.getArtifactId());
+ archive.addManifestEntry(Constants.BUNDLE_DOCURL, project.getUrl());
+ archive.addManifestEntry(Constants.BUNDLE_SYMBOLICNAME, project.getGroupId() + "." + project.getArtifactId());
Reader in = new FileReader(configFile);
char[] buf = new char[1024];
try {
@@ -252,8 +255,8 @@
} finally {
in.close();
}
- archive.addManifestEntry("Import-Package", imports.toString());
- archive.addManifestEntry("DynamicImport-Package", "*");
+ archive.addManifestEntry(Constants.IMPORT_PACKAGE, imports.toString());
+ archive.addManifestEntry(Constants.DYNAMICIMPORT_PACKAGE, "*");
}
archiver.createArchive(project, archive);