From 7a5198278c76adc0d661a26309934ae7b68cbaa2 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 29 Jan 2010 17:24:12 +0000
Subject: Allow the plugin to generate config for the whole distro

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904564 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tuscany/maven/bundle/plugin/BundleAggregatorMojo.java    | 2 +-
 .../org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'maven-plugins')

diff --git a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleAggregatorMojo.java b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleAggregatorMojo.java
index e098799085..9c36ae34a2 100644
--- a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleAggregatorMojo.java
+++ b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/BundleAggregatorMojo.java
@@ -150,7 +150,7 @@ public class BundleAggregatorMojo extends AbstractMojo {
         attributes.putValue("Bundle-SymbolicName", bundleName);
         attributes.putValue("SCA-Version", "1.1");
         attributes.putValue("Bundle-Name", bundleName);
-        attributes.putValue("Bundle-ActivationPolicy", "lazy");
+        // attributes.putValue("Bundle-ActivationPolicy", "lazy");
         for (Manifest mf : manifests) {
             for (Map.Entry<Object, Object> e : mf.getMainAttributes().entrySet()) {
                 Attributes.Name key = (Attributes.Name)e.getKey();
diff --git a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
index a90fb35e83..4b9198b741 100644
--- a/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
+++ b/maven-plugins/trunk/maven-bundle-plugin/src/main/java/org/apache/tuscany/maven/bundle/plugin/ModuleBundlesBuildMojo.java
@@ -734,11 +734,13 @@ public class ModuleBundlesBuildMojo extends AbstractMojo {
                 generateGatewayBundle(serviceProviders);
             }
 
+            /*
             if (useDistributionName) {
                 bundleLocations.nameMap.remove(project.getArtifactId());
                 jarNames.nameMap.remove(project.getArtifactId());
                 bundleSymbolicNames.nameMap.remove(project.getArtifactId());
             }
+            */
             
             // Generate a PDE target
             if (generateTargetPlatform) {
-- 
cgit v1.2.3