svn commit: r704765 - in /tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin: BundleUtil.java ThirdPartyBundleBuildMojo.java

[jsdelfino]

Author: jsdelfino
Date: Tue Oct 14 18:54:40 2008
New Revision: 704765

URL: http://svn.apache.org/viewvc?rev=704765&view=rev
Log:
Minor cleanup of the Maven bundle plugin. Derive the bundle name from the Maven 
project name.

Modified:
    
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
    
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java

Modified: 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java?rev=704765&r1=704764&r2=704765&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
 (original)
+++ 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/BundleUtil.java
 Tue Oct 14 18:54:40 2008
@@ -55,8 +55,6 @@
  */
 final class BundleUtil {
 
-    private static final String LAUNCHER_EQUINOX_LIBRARIES = 
"org.apache.tuscany.sca.node.launcher.equinox.libraries";
-
     static File file(URL url) {
         if (url == null || !url.getProtocol().equals("file")) {
             return null;
@@ -74,8 +72,8 @@
         }
     }
 
-    static Pattern pattern = Pattern.compile("-([0-9.]+)");
-    static Pattern pattern2 = Pattern.compile("_([0-9.]+)");
+    static private Pattern pattern = Pattern.compile("-([0-9.]+)");
+    static private Pattern pattern2 = Pattern.compile("_([0-9.]+)");
 
     private static String version(String jarFile) {
         String version = "1.0.0";
@@ -164,7 +162,7 @@
             Attributes attributes = manifest.getMainAttributes();
             attributes.putValue("Manifest-Version", "1.0");
             attributes.putValue(BUNDLE_MANIFESTVERSION, "2");
-            attributes.putValue(BUNDLE_SYMBOLICNAME, 
LAUNCHER_EQUINOX_LIBRARIES);
+            attributes.putValue(BUNDLE_SYMBOLICNAME, name);
             attributes.putValue(BUNDLE_NAME, name);
             attributes.putValue(BUNDLE_VERSION, version);
             attributes.putValue(DYNAMICIMPORT_PACKAGE, "*");
@@ -285,7 +283,6 @@
         if (exports == null) {
             return null;
         }
-        System.out.println("##### Exports: " + exports);
         Set<String> exportedPackages = new HashSet<String>();
         StringBuffer export = new StringBuffer();
         boolean q = false;
@@ -297,7 +294,6 @@
             if (!q) {
                 if (c == ',') {
                     exportedPackages.add(export.toString());
-                    System.out.println("##### Package: " + export);
                     export = new StringBuffer();
                     continue;
                 }
@@ -306,7 +302,6 @@
         }
         if (export.length() != 0) {
             exportedPackages.add(export.toString());
-            System.out.println("##### Package: " + export);
         }
         return exportedPackages;
     }

Modified: 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java?rev=704765&r1=704764&r2=704765&view=diff
==============================================================================
--- 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java
 (original)
+++ 
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ThirdPartyBundleBuildMojo.java
 Tue Oct 14 18:54:40 2008
@@ -169,7 +169,8 @@
         } catch (DependencyTreeBuilderException e) {
             throw new MojoExecutionException("Could not build dependency 
tree", e);
         }
-        
+
+        String projectGroupId = project.getGroupId();
         Set<File> jarFiles = new HashSet<File>();
         for (Object o : dependencyTree.getArtifacts()) {
             Artifact artifact = (Artifact)o;
@@ -183,7 +184,7 @@
             if (!"jar".equals(artifact.getType())) {
                 continue;
             }
-            if ("org.apache.tuscany.sca".equals(artifact.getGroupId())) {
+            if (projectGroupId.equals(artifact.getGroupId())) {
                 continue;
             }