Merge changes from trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@694854 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 18 insertions, 4 deletions

diff --git a/branches/sca-equinox/modules/extensibility-equinox/pom.xml b/branches/sca-equinox/modules/extensibility-equinox/pom.xml
index 84ad3633f6..9547e92f34 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/pom.xml
+++ b/branches/sca-equinox/modules/extensibility-equinox/pom.xml
@@ -101,7 +101,8 @@
                         <Bundle-Description>${pom.name}</Bundle-Description>
                         <Bundle-Activator>org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator</Bundle-Activator>
                         <Export-Package>org.apache.tuscany.sca.extensibility.equinox*</Export-Package>
-                        <Eclipse-AutoStart>true</Eclipse-AutoStart> 
+                        <Eclipse-LazyStart>true</Eclipse-LazyStart>
+                        <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                         <DynamicImport-Package>*</DynamicImport-Package> 
                     </instructions>
                 </configuration>
diff --git a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index fcc7f21483..5ab5a66077 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
@@ -116,6 +116,10 @@ public class EquinoxServiceDiscoverer implements ServiceDiscoverer {
         }
 
     }
+    
+    public static void init() {
+        // Empty static method to trigger the activation of this bundle
+    }
 
     private static String toString(Bundle b) {
         StringBuffer sb = new StringBuffer();
diff --git a/branches/sca-equinox/modules/extensibility/pom.xml b/branches/sca-equinox/modules/extensibility/pom.xml
index b4e3b9ead7..01cd2d0ca9 100644
--- a/branches/sca-equinox/modules/extensibility/pom.xml
+++ b/branches/sca-equinox/modules/extensibility/pom.xml
@@ -41,7 +41,6 @@
                         <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
                         <Export-Package>org.apache.tuscany.sca.*</Export-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package> 
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/node-launcher-osgi/pom.xml b/branches/sca-equinox/modules/node-launcher-osgi/pom.xml
index 18e38323f6..d5754530c9 100644
--- a/branches/sca-equinox/modules/node-launcher-osgi/pom.xml
+++ b/branches/sca-equinox/modules/node-launcher-osgi/pom.xml
@@ -132,7 +132,6 @@
                 </configuration>
             </plugin>
 
-<!-- 
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -146,7 +145,6 @@
                     </instructions>
                 </configuration>
             </plugin>
- -->            
         </plugins>
     </build>
 
diff --git a/branches/sca-equinox/modules/tracing-aspectj/pom.xml b/branches/sca-equinox/modules/tracing-aspectj/pom.xml
index 6172b2a445..00790ed621 100644
--- a/branches/sca-equinox/modules/tracing-aspectj/pom.xml
+++ b/branches/sca-equinox/modules/tracing-aspectj/pom.xml
@@ -93,6 +93,18 @@
                     <argLine>-ea -Xmx128m -javaagent:target/dependency/aspectjweaver-1.6.1.jar</argLine>

                 </configuration>

             </plugin>

+            <plugin>

+                <groupId>org.apache.felix</groupId>

+                <artifactId>maven-bundle-plugin</artifactId>

+                <configuration>

+                    <instructions>

+                        <Bundle-Version>1.4</Bundle-Version>

+                        <Bundle-SymbolicName>org.apache.tuscany.sca.tracing.aspect</Bundle-SymbolicName>

+                        <Bundle-Description>${pom.description}</Bundle-Description>

+                        <Export-Package></Export-Package>

+                    </instructions>

+                </configuration>

+            </plugin>

         </plugins>

     </build>

 </project>
\ No newline at end of file