New "patch" to maven osgi plugin to support Peter Kriens' BND library.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@469574 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven2/maven-bundle-plugin/pom.xml b/tools/maven2/maven-bundle-plugin/pom.xml
new file mode 100644
index 0000000..449470c
--- /dev/null
+++ b/tools/maven2/maven-bundle-plugin/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <repositories>
+ <repository>
+ <id>aQute</id>
+ <url>http://www.aQute.biz/repo</url>
+ </repository>
+ </repositories>
+
+ <packaging>maven-plugin</packaging>
+ <name>Maven Plugin OSGi Bundle</name>
+ <description> provides a maven plugin that allows that builds the jar by
+ embedding packages from the classpath (wildcarded). Plus a zillion
+ other features. See http://www.aqute.biz/php/tools/bnd.php
+ </description>
+ <version>0.9.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>0.0.95</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java b/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
new file mode 100644
index 0000000..5c1a379
--- /dev/null
+++ b/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
@@ -0,0 +1,247 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.felix.tools.maven2.bundleplugin;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.zip.ZipException;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.*;
+import org.apache.maven.plugin.*;
+import org.apache.maven.project.MavenProject;
+
+import aQute.lib.osgi.*;
+
+/**
+ *
+ * @goal bundle
+ * @phase package
+ * @requiresDependencyResolution runtime
+ * @description build an OSGi bundle jar
+ */
+public class BundlePlugin extends AbstractMojo {
+
+ /**
+ * @parameter expression="${project.build.outputDirectory}"
+ * @required
+ * @readonly
+ */
+ File outputDirectory;
+
+ /**
+ * The directory for the pom
+ *
+ * @parameter expression="${basedir}"
+ * @required
+ */
+ private File baseDir;
+
+ /**
+ * The directory for the generated JAR.
+ *
+ * @parameter expression="${project.build.directory}"
+ * @required
+ */
+ private String buildDirectory;
+
+ /**
+ * The Maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * The name of the generated JAR file.
+ *
+ * @parameter
+ */
+ private Map instructions = new HashMap();
+
+ public void execute() throws MojoExecutionException {
+ try {
+ File jarFile = new File(buildDirectory, project.getBuild()
+ .getFinalName()
+ + ".jar");
+
+ // Setup defaults
+ String bsn = project.getGroupId() + "." + project.getArtifactId();
+ Properties properties = new Properties();
+ properties.put(Analyzer.BUNDLE_SYMBOLICNAME, bsn);
+ properties.put(Analyzer.IMPORT_PACKAGE, "*");
+ properties.put(Analyzer.EXPORT_PACKAGE, bsn + ".*");
+ String version = project.getVersion().replace('-', '.');
+ properties.put(Analyzer.BUNDLE_VERSION, version);
+ header(properties, Analyzer.BUNDLE_DESCRIPTION, project
+ .getDescription());
+ header(properties, Analyzer.BUNDLE_LICENSE, printLicenses(project
+ .getLicenses()));
+ header(properties, Analyzer.BUNDLE_NAME, project.getName());
+ header(properties, Analyzer.BUNDLE_VENDOR, project
+ .getOrganization());
+ header(properties, Analyzer.INCLUDE_RESOURCE, "src/main/resources");
+
+ properties.putAll(project.getProperties());
+ properties.putAll(project.getModel().getProperties());
+ properties.putAll( getProperies("project.build.", project.getBuild()));
+ properties.putAll( getProperies("pom.", project.getModel()));
+ properties.putAll( getProperies("project.", project));
+ properties.put("project.baseDir", baseDir );
+ properties.put("project.build.directory", buildDirectory );
+ properties.put("project.build.outputdirectory", outputDirectory );
+
+ properties.putAll(instructions);
+
+
+ Builder builder = new Builder();
+ builder.setBase(baseDir);
+ Jar[] cp = getClasspath();
+ builder.setProperties(properties);
+ builder.setClasspath(cp);
+
+ builder.build();
+ Jar jar = builder.getJar();
+ doMavenMetadata(jar);
+ builder.setJar(jar);
+
+ List errors = builder.getErrors();
+ List warnings = builder.getWarnings();
+
+ if (errors.size() > 0) {
+ jarFile.delete();
+ for (Iterator e = errors.iterator(); e.hasNext();) {
+ String msg = (String) e.next();
+ getLog().error(msg);
+ }
+ throw new MojoFailureException("Found errors, see log");
+ }
+ else {
+ builder.getJar().write(jarFile);
+ project.getArtifact().setFile(jarFile);
+ }
+ for (Iterator w = warnings.iterator(); w.hasNext();) {
+ String msg = (String) w.next();
+ getLog().warn(msg);
+ }
+
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ throw new MojoExecutionException("Unknown error occurred", e);
+ }
+ }
+
+ private Map getProperies(String prefix, Object model) {
+ Map properties = new HashMap();
+ Method methods[] = Model.class.getDeclaredMethods();
+ for (int i = 0; i < methods.length; i++) {
+ String name = methods[i].getName();
+ if ( name.startsWith("get") ) {
+ try {
+ Object v = methods[i].invoke(project.getModel(), null );
+ if ( v != null ) {
+ name = prefix + Character.toLowerCase(name.charAt(3)) + name.substring(4);
+ if ( v.getClass().isArray() )
+ properties.put( name, Arrays.asList((Object[])v).toString() );
+ else
+ properties.put( name, v );
+
+ }
+ }
+ catch (Exception e) {
+ // too bad
+ }
+ }
+ }
+ return properties;
+ }
+
+ private StringBuffer printLicenses(List licenses) {
+ if (licenses == null || licenses.size() == 0)
+ return null;
+ StringBuffer sb = new StringBuffer();
+ String del = "";
+ for (Iterator i = licenses.iterator(); i.hasNext();) {
+ License l = (License) i.next();
+ String url = l.getUrl();
+ sb.append(del);
+ sb.append(url);
+ del = ", ";
+ }
+ return sb;
+ }
+
+ /**
+ * @param jar
+ * @throws IOException
+ */
+ private void doMavenMetadata(Jar jar) throws IOException {
+ String path = "META-INF/maven/" + project.getGroupId() + "/"
+ + project.getArtifactId();
+ File pomFile = new File(baseDir, "pom.xml");
+ jar.putResource(path + "/pom.xml", new FileResource(pomFile));
+
+ Properties p = new Properties();
+ p.put("version", project.getVersion());
+ p.put("groupId", project.getGroupId());
+ p.put("artifactId", project.getArtifactId());
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ p.store(out, "Generated by org.apache.felix.plugin.bundle");
+ jar.putResource(path + "/pom.properties", new EmbeddedResource(out
+ .toByteArray()));
+ }
+
+ /**
+ * @return
+ * @throws ZipException
+ * @throws IOException
+ */
+ private Jar[] getClasspath() throws ZipException, IOException {
+ List list = new ArrayList();
+ list.add(new Jar(".", outputDirectory));
+
+ Set artifacts = project.getArtifacts();
+ for (Iterator it = artifacts.iterator(); it.hasNext();) {
+ Artifact artifact = (Artifact) it.next();
+ if (artifact.getScope() == Artifact.SCOPE_COMPILE
+ || artifact.getScope() == Artifact.SCOPE_SYSTEM
+ || artifact.getScope() == Artifact.SCOPE_PROVIDED) {
+ Jar jar = new Jar(artifact.getArtifactId(), artifact.getFile());
+ list.add(jar);
+ }
+ }
+ Jar[] cp = new Jar[list.size()];
+ list.toArray(cp);
+ return cp;
+ }
+
+ private void header(Properties properties, String key, Object value) {
+ if (value == null)
+ return;
+
+ if (value instanceof Collection && ((Collection) value).isEmpty())
+ return;
+
+ properties.put(key, value.toString());
+ }
+}
diff --git a/tools/maven2/maven-bundle-plugin/src/main/resources/LICENSE b/tools/maven2/maven-bundle-plugin/src/main/resources/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/tools/maven2/maven-bundle-plugin/src/main/resources/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml b/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml
new file mode 100644
index 0000000..7e58dde
--- /dev/null
+++ b/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -0,0 +1,40 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>bundle</role-hint>
+ <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <!-- START SNIPPET: bundle-lifecycle -->
+ <phases>
+ <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+ <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+ <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+ <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+ <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+ <package>org.apache.felix:maven-bundle-plugin:bundle</package>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ </phases>
+ <!-- END SNIPPET: bundle-lifecycle -->
+ </lifecycle>
+ </lifecycles>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>bundle</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>bundle</type>
+ <includesDependencies>true</includesDependencies>
+ <language>java</language>
+ <extension>jar</extension>
+ <addedToClasspath>true</addedToClasspath>
+ </configuration>
+ </component>
+ </components>
+</component-set>
diff --git a/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE b/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE
new file mode 100644
index 0000000..20f2390
--- /dev/null
+++ b/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE
@@ -0,0 +1,19 @@
+Apache Felix Framework
+Copyright 2006 The Apache Software Foundation
+
+Apache Felix is an effort undergoing incubation at
+The Apache Software Foundation (ASF). Incubation is
+required of all newly accepted projects until a further
+review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While
+incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate
+that the project has yet to be fully endorsed by the ASF.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed by Peter Kriens
+(http://www.aqute.biz/Code/Bnd)
+Copyright 2006 Peter Kriens