You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/02/09 21:54:40 UTC
svn commit: r505495 -
/maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
Author: carlos
Date: Fri Feb 9 12:54:39 2007
New Revision: 505495
URL: http://svn.apache.org/viewvc?view=rev&rev=505495
Log:
Move default properties to external method
Modified:
maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
Modified: maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java?view=diff&rev=505495&r1=505494&r2=505495
==============================================================================
--- maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java (original)
+++ maven/sandbox/plugins/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java Fri Feb 9 12:54:39 2007
@@ -115,48 +115,20 @@
try {
File jarFile = new File(getBuildDirectory(), getBundleName(project));
- // Setup defaults
+ properties.putAll(getDefaultProperties(project));
+
String bsn = project.getGroupId() + "." + project.getArtifactId();
- properties.put(Analyzer.BUNDLE_SYMBOLICNAME, bsn);
- properties.put(Analyzer.IMPORT_PACKAGE, "*");
if (!instructions.containsKey(Analyzer.PRIVATE_PACKAGE)) {
properties.put(Analyzer.EXPORT_PACKAGE, bsn + ".*");
}
- String version = convertVersionToOsgi(project.getVersion());
-
- 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());
-
- if (project.getOrganization() != null) {
- header(properties, Analyzer.BUNDLE_VENDOR, project
- .getOrganization().getName());
- if (project.getOrganization().getUrl() != null) {
- header(properties, Analyzer.BUNDLE_DOCURL, project
- .getOrganization().getUrl());
- }
- }
-
- properties.putAll(project.getProperties());
- properties.putAll(project.getModel().getProperties());
- properties.putAll( getProperies(project.getModel(), "project.build.", project.getBuild()));
- properties.putAll( getProperies(project.getModel(), "pom.", project.getModel()));
- properties.putAll( getProperies(project.getModel(), "project.", project));
- properties.put("project.baseDir", baseDir );
- properties.put("project.build.directory", getBuildDirectory() );
- properties.put("project.build.outputdirectory", outputDirectory );
-
properties.putAll(instructions);
PatchedBuilder builder = new PatchedBuilder();
builder.setBase(baseDir);
builder.setProperties(properties);
builder.setClasspath(classpath);
- builder.setClasspathForExpansion(classpathForExpansion);
+ //builder.setClasspathForExpansion(classpathForExpansion);
builder.build();
Jar jar = builder.getJar();
@@ -415,5 +387,42 @@
packages.add(pack);
}
return packages;
+ }
+
+ protected Properties getDefaultProperties(MavenProject project) {
+ Properties properties = new Properties();
+ // Setup defaults
+ String bsn = project.getGroupId() + "." + project.getArtifactId();
+ properties.put(Analyzer.BUNDLE_SYMBOLICNAME, bsn);
+ properties.put(Analyzer.IMPORT_PACKAGE, "*");
+
+ String version = convertVersionToOsgi(project.getVersion());
+
+ 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());
+
+ if (project.getOrganization() != null) {
+ header(properties, Analyzer.BUNDLE_VENDOR, project
+ .getOrganization().getName());
+ if (project.getOrganization().getUrl() != null) {
+ header(properties, Analyzer.BUNDLE_DOCURL, project
+ .getOrganization().getUrl());
+ }
+ }
+
+ properties.putAll(project.getProperties());
+ properties.putAll(project.getModel().getProperties());
+ properties.putAll( getProperies(project.getModel(), "project.build.", project.getBuild()));
+ properties.putAll( getProperies(project.getModel(), "pom.", project.getModel()));
+ properties.putAll( getProperies(project.getModel(), "project.", project));
+ properties.put("project.baseDir", baseDir );
+ properties.put("project.build.directory", getBuildDirectory() );
+ properties.put("project.build.outputdirectory", outputDirectory );
+
+ return properties;
}
}