felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbenn...@apache.org
Subject svn commit: r279515 - in /incubator/felix/trunk/tools/maven2/maven-osgi-plugin: pom.xml src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
Date Thu, 08 Sep 2005 05:03:57 GMT
Author: tbennett
Date: Wed Sep  7 22:03:53 2005
New Revision: 279515

URL: http://svn.apache.org/viewcvs?rev=279515&view=rev
Log:
Bump plugin version to 0.1.2;
Fix for FELIXM2-3;
Re-added support for merging a specified manifest.mf file

Modified:
    incubator/felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml
    incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
    incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java

Modified: incubator/felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml?rev=279515&r1=279514&r2=279515&view=diff
==============================================================================
--- incubator/felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml (original)
+++ incubator/felix/trunk/tools/maven2/maven-osgi-plugin/pom.xml Wed Sep  7 22:03:53 2005
@@ -4,7 +4,7 @@
   <artifactId>maven-osgi-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven OSGi Plugin</name>
-  <version>0.1.1</version>
+  <version>0.1.2</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java?rev=279515&r1=279514&r2=279515&view=diff
==============================================================================
--- incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
(original)
+++ incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
Wed Sep  7 22:03:53 2005
@@ -100,16 +100,14 @@
             merging of manifest entries located in some file somewhere in the project
             directory?  If so, do we allow both file and configuration based entries
             to be specified simultaneously and how do we merge these?
-
-            For now... I'm going to disable support for file-based manifest entries.
         */
-        //if (manifestFile != null) {
-        //    File file = new File(project.getBasedir().getAbsolutePath(), manifestFile);
-        //    getLog().info("Manifest file: " + file.getAbsolutePath() + " will be used");
-        //    archive.setManifestFile(file);
-        //} else {
-        //    getLog().info("No manifest file specified. Default will be used.");
-        //}
+        if (manifestFile != null) {
+            File file = new File(project.getBasedir().getAbsolutePath(), manifestFile);
+            getLog().info("Manifest file: " + file.getAbsolutePath() + " will be used");
+            archive.setManifestFile(file);
+        } else {
+            getLog().info("No manifest file specified. Default will be used.");
+        }
 
         // Look for any OSGi specified manifest entries in the maven-felix-plugin configuration
         // section of the POM.  If we find some, then add them to the target artifact's manifest.

Modified: incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
URL: http://svn.apache.org/viewcvs/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java?rev=279515&r1=279514&r2=279515&view=diff
==============================================================================
--- incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
(original)
+++ incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java
Wed Sep  7 22:03:53 2005
@@ -36,6 +36,8 @@
     private String bundleDate;
     private String bundleUpdateLocation;
     private String bundleSymbolicName;
+	private String bundleDocUrl;
+	private String bundleCategory;
 	private String exportService;
     private String exportPackage;
     private String importPackage;
@@ -86,7 +88,29 @@
         if (getMetadataLocation() != null) {
             entries.put("Metadata-Location", getMetadataLocation());
         }
+		if (getBundleCategory() != null) {
+			entries.put("Bundle-Category", getBundleCategory());
+		}
+		if (getBundleDocUrl() != null) {
+			entries.put("Bundle-DocUrl", getBundleDocUrl());
+		}
         return (Map) entries;
+    }
+
+    public String getBundleDocUrl() {
+        return bundleDocUrl;
+    }
+
+    public void setBundleDocUrl(String bundleDocUrl) {
+        this.bundleDocUrl = bundleDocUrl;
+    }
+
+    public String getBundleCategory() {
+        return bundleCategory;
+    }
+
+    public void setBundleCategory(String bundleCategory) {
+        this.bundleCategory = bundleCategory;
     }
 
     public String getBundleActivator() {



Mime
View raw message