You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/12/20 21:53:55 UTC
svn commit: r489196 - in
/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin:
OsgiJarMojo.java OsgiManifest.java
Author: rickhall
Date: Wed Dec 20 12:53:54 2006
New Revision: 489196
URL: http://svn.apache.org/viewvc?view=rev&rev=489196
Log:
Applied patch (FELIX-185) to add support for explicitly specifying a
set of imports to be appended to the generated set of imports.
Modified:
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/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiJarMojo.java?view=diff&rev=489196&r1=489195&r2=489196
==============================================================================
--- 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 Dec 20 12:53:54 2006
@@ -233,6 +233,7 @@
Map exports = parseHeader(osgiManifest.getExportPackage());
Map imports = parseHeader(osgiManifest.getImportPackage());
+ Map explicitImports = parseHeader(osgiManifest.getExplicitImportPackage());
Map dynamicImports = parseHeader(osgiManifest.getDynamicImportPackage());
if (dynamicImports != null) {
@@ -250,6 +251,10 @@
Set ignorePackageSet = parseIgnorePackage();
referred.removeAll(ignorePackageSet);
+ if (explicitImports != null) {
+ referred.addAll(explicitImports.keySet());
+ }
+
// If the POM file contains an import declaration,
// we verify its validity. Otherwise, we generate the
// import package header from the referred. Exports
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/viewvc/incubator/felix/trunk/tools/maven2/maven-osgi-plugin/src/main/java/org/apache/felix/tools/maven/plugin/OsgiManifest.java?view=diff&rev=489196&r1=489195&r2=489196
==============================================================================
--- 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 Dec 20 12:53:54 2006
@@ -86,6 +86,7 @@
private String requireBundle;
private String fragmentHost;
private String bundleManifestVersion;
+ private String explicitImportPackage;
/**
* Instance variables supporting non-framework manifest headers
@@ -222,6 +223,16 @@
this.importPackage = trim(importPackage);
}
+ public String getExplicitImportPackage()
+ {
+ return explicitImportPackage;
+ }
+
+ public void setExplicitImportPackage(String explicitImportPackage)
+ {
+ this.explicitImportPackage = trim(explicitImportPackage);
+ }
+
public String getDynamicImportPackage()
{
return dynamicImportPackage;