Issue 842:cloudfiles-us does not properly work under OSGi
diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index b35b920..b8e1549 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -118,8 +118,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.atmos.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.atmos*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 922099d..88228e9 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -113,11 +113,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.byon.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.byon*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml
index 9392ada..f034650 100644
--- a/apis/cloudfiles/pom.xml
+++ b/apis/cloudfiles/pom.xml
@@ -133,8 +133,12 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudfiles.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.cloudfiles*;version="${project.version}"</Export-Package>
+            <Import-Package>
+                org.jclouds*;version="${project.version}",
+                org.jclouds.openstack.swift.options;version="${project.version}",
+                *
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/apis/cloudloadbalancers/pom.xml b/apis/cloudloadbalancers/pom.xml
index 2c32667..91e6eee 100644
--- a/apis/cloudloadbalancers/pom.xml
+++ b/apis/cloudloadbalancers/pom.xml
@@ -119,8 +119,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudloadbalancers.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.cloudloadbalancers*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml
index ba9d2f3..4a5013c 100644
--- a/apis/cloudservers/pom.xml
+++ b/apis/cloudservers/pom.xml
@@ -134,11 +134,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudservers.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.cloudservers*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml
index 18b8892..45cd11b 100644
--- a/apis/cloudsigma/pom.xml
+++ b/apis/cloudsigma/pom.xml
@@ -120,11 +120,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudsigma.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.cloudsigma*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml
index ca42d30..f0adbb6 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -144,11 +144,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudstack.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.cloudstack*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml
index b45191a..bcc797a 100644
--- a/apis/cloudwatch/pom.xml
+++ b/apis/cloudwatch/pom.xml
@@ -109,8 +109,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudwatch.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.cloudwatch*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index 8cbd3fb..dc72fe4 100644
--- a/apis/deltacloud/pom.xml
+++ b/apis/deltacloud/pom.xml
@@ -133,11 +133,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.deltacloud.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.deltacloud*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 5976822..8b2c098 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -128,11 +128,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.ec2.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.ec2*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index 2594f26..4d58989 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -133,11 +133,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.elasticstack.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.elasticstack*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml
index abd3083..de10e32 100644
--- a/apis/eucalyptus/pom.xml
+++ b/apis/eucalyptus/pom.xml
@@ -128,11 +128,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.eucalyptus.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.eucalyptus*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml
index 36fa741..54a1a45 100644
--- a/apis/filesystem/pom.xml
+++ b/apis/filesystem/pom.xml
@@ -106,8 +106,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.filesystem.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.filesystem*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index afd2b8b..deada7d 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -137,11 +137,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.openstack.nova.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.openstack.nova*;version="${project.version}"</Export-Package>
             <Import-Package>            
        			org.jclouds.compute.internal;version="${project.version}",
        			org.jclouds.rest.internal;version="${project.version}",
-       			org.jclouds.*;version="${project.version}",
+       			org.jclouds*;version="${project.version}",
  				*
 			</Import-Package>
           </instructions>
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index ea50676..6b578de 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -131,8 +131,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.s3.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.s3*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml
index 87852e2..10feaac 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -131,8 +131,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.openstack.swift.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.openstack.swift*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index 610fbf1..92e4230 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -131,11 +131,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.vcloud.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.vcloud*;version="${project.version}"</Export-Package>
             <Import-Package>
        			org.jclouds.compute.internal;version="${project.version}",
        			org.jclouds.rest.internal;version="${project.version}",
-       			org.jclouds.*;version="${project.version}",
+       			org.jclouds*;version="${project.version}",
  				*
 			</Import-Package>
           </instructions>
diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml
index 367d181..dd069c7 100644
--- a/apis/walrus/pom.xml
+++ b/apis/walrus/pom.xml
@@ -127,8 +127,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.walrus.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.walrus*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/blobstore/pom.xml b/blobstore/pom.xml
index 7d6fcac..c49a279 100644
--- a/blobstore/pom.xml
+++ b/blobstore/pom.xml
@@ -97,8 +97,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.blobstore.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.blobstore*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                         <Fragment-Host>jclouds-core;bundle-version="[1.3,2)"</Fragment-Host>
                     </instructions>
                 </configuration>
diff --git a/common/aws/pom.xml b/common/aws/pom.xml
index 802fce7..ede48f3 100644
--- a/common/aws/pom.xml
+++ b/common/aws/pom.xml
@@ -56,8 +56,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.aws.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.aws*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/common/azure/pom.xml b/common/azure/pom.xml
index e5247b3..00a8f73 100644
--- a/common/azure/pom.xml
+++ b/common/azure/pom.xml
@@ -56,8 +56,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.azure.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.azure*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/common/openstack/pom.xml b/common/openstack/pom.xml
index 0504f5c..99e7da9 100644
--- a/common/openstack/pom.xml
+++ b/common/openstack/pom.xml
@@ -57,8 +57,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.openstack.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.openstack*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/common/trmk/pom.xml b/common/trmk/pom.xml
index 38145fb..3bbb6df 100644
--- a/common/trmk/pom.xml
+++ b/common/trmk/pom.xml
@@ -81,8 +81,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.trmk.vcloud_0_8.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.trmk.vcloud_0_8*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/compute/pom.xml b/compute/pom.xml
index 5539b5c..603118c 100644
--- a/compute/pom.xml
+++ b/compute/pom.xml
@@ -73,8 +73,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.compute.*;version="${project.version}",org.jclouds.cim.*;version="${project.version}",org.jclouds.ovf.*;version="${project.version}",org.jclouds.ssh.*;version="${project.version}"</Export-Package>
-                        <Import-Package>!org.jclouds.compute.*;org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.compute*;version="${project.version}",org.jclouds.cim*;version="${project.version}",org.jclouds.ovf*;version="${project.version}",org.jclouds.ssh*;version="${project.version}"</Export-Package>
+                        <Import-Package>!org.jclouds.compute.*;org.jclouds*;version="${project.version}",*</Import-Package>
                         <Fragment-Host>jclouds-core;bundle-version="[1.3,2)"</Fragment-Host>
                     </instructions>
                 </configuration>
diff --git a/core/pom.xml b/core/pom.xml
index f399670..de1bb2f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -127,7 +127,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.*;version=${project.version}</Export-Package>
+                        <Export-Package>org.jclouds*;version=${project.version}</Export-Package>
                         <DynamicImport-Package>org.jclouds.*</DynamicImport-Package>
                     </instructions>
                 </configuration>
diff --git a/drivers/apachehc/pom.xml b/drivers/apachehc/pom.xml
index d180077..c65d2f9 100644
--- a/drivers/apachehc/pom.xml
+++ b/drivers/apachehc/pom.xml
@@ -78,8 +78,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.http.apachehc.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.http.apachehc*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml
index 1416682..96f41ac 100644
--- a/drivers/bouncycastle/pom.xml
+++ b/drivers/bouncycastle/pom.xml
@@ -73,8 +73,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.encryption.bouncycastle.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.encryption.bouncycastle*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/enterprise/pom.xml b/drivers/enterprise/pom.xml
index ce8d7f6..10d2780 100644
--- a/drivers/enterprise/pom.xml
+++ b/drivers/enterprise/pom.xml
@@ -87,8 +87,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.enterprise.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.enterprise*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/gae/pom.xml b/drivers/gae/pom.xml
index 9443ab5..416aac2 100644
--- a/drivers/gae/pom.xml
+++ b/drivers/gae/pom.xml
@@ -103,8 +103,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.gae.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.gae*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/joda/pom.xml b/drivers/joda/pom.xml
index 4fab69d..d4ffc69 100644
--- a/drivers/joda/pom.xml
+++ b/drivers/joda/pom.xml
@@ -73,8 +73,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.date.joda.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.date.joda*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml
index f90f016..e2d629d 100644
--- a/drivers/jsch/pom.xml
+++ b/drivers/jsch/pom.xml
@@ -101,8 +101,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.ssh.jsch.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.ssh.jsch*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml
index d159b47..c84cd82 100644
--- a/drivers/log4j/pom.xml
+++ b/drivers/log4j/pom.xml
@@ -73,8 +73,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.logging.log4j.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.logging.log4j*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/netty/pom.xml b/drivers/netty/pom.xml
index eaf8b8e..9a4e4ca 100644
--- a/drivers/netty/pom.xml
+++ b/drivers/netty/pom.xml
@@ -86,8 +86,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.netty.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.netty*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml
index 8552355..5b410f2 100644
--- a/drivers/slf4j/pom.xml
+++ b/drivers/slf4j/pom.xml
@@ -73,8 +73,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.logging.slf4j.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.logging.slf4j*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml
index 7d9d258..e0dbb1b 100644
--- a/drivers/sshj/pom.xml
+++ b/drivers/sshj/pom.xml
@@ -106,8 +106,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.sshj.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.sshj*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/loadbalancer/pom.xml b/loadbalancer/pom.xml
index c9bf7ab..9f810c1 100644
--- a/loadbalancer/pom.xml
+++ b/loadbalancer/pom.xml
@@ -89,8 +89,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.loadbalancer.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.loadbalancer*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                         <Fragment-Host>jclouds-core;bundle-version="[1.3,2)"</Fragment-Host>
                     </instructions>
                 </configuration>
diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml
index 5e98af0..7198eac 100644
--- a/providers/aws-cloudwatch/pom.xml
+++ b/providers/aws-cloudwatch/pom.xml
@@ -115,8 +115,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.aws.cloudwatch.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.aws.cloudwatch*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index d930748..5e381d5 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -139,13 +139,12 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.aws.ec2.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.aws.ec2*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.aws;version="${project.version}",
-              org.jclouds.aws.*;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds.aws*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml
index 69e2b7b..8f19f1e 100644
--- a/providers/aws-s3/pom.xml
+++ b/providers/aws-s3/pom.xml
@@ -150,9 +150,9 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.aws.s3.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.aws.s3*;version="${project.version}"</Export-Package>
                         <Import-Package>
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             org.jclouds.http.options;version="${project.version}",
                             *
                         </Import-Package>
diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml
index a763f17e..794f54b 100644
--- a/providers/azureblob/pom.xml
+++ b/providers/azureblob/pom.xml
@@ -120,8 +120,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.azureblob.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.azureblob*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml
index 5e9cd9b..b920b2f 100644
--- a/providers/bluelock-vcloud-zone01/pom.xml
+++ b/providers/bluelock-vcloud-zone01/pom.xml
@@ -128,11 +128,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.bluelock.vcloud.zone01.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.bluelock.vcloud.zone01*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml
index 31b57ea..c91f549 100644
--- a/providers/cloudfiles-uk/pom.xml
+++ b/providers/cloudfiles-uk/pom.xml
@@ -135,8 +135,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.rackspace.cloudfiles.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.rackspace.cloudfiles*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml
index dcbae3b..4c9a82c 100644
--- a/providers/cloudfiles-us/pom.xml
+++ b/providers/cloudfiles-us/pom.xml
@@ -135,8 +135,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.rackspace.cloudfiles.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.rackspace.cloudfiles*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/cloudloadbalancers-uk/pom.xml
index 926d4ff..c3cabfa 100644
--- a/providers/cloudloadbalancers-uk/pom.xml
+++ b/providers/cloudloadbalancers-uk/pom.xml
@@ -132,8 +132,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.rackspace.cloudloadbalancers.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml
index 81fe769..42d2390 100644
--- a/providers/cloudloadbalancers-us/pom.xml
+++ b/providers/cloudloadbalancers-us/pom.xml
@@ -132,8 +132,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.rackspace.cloudloadbalancers.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml
index 77c3f54..bfb9279 100644
--- a/providers/cloudonestorage/pom.xml
+++ b/providers/cloudonestorage/pom.xml
@@ -128,8 +128,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.cloudonestorage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.cloudonestorage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
index 5c4c565..74fc784 100644
--- a/providers/cloudservers-uk/pom.xml
+++ b/providers/cloudservers-uk/pom.xml
@@ -133,11 +133,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.rackspace.cloudservers.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.rackspace.cloudservers*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index 7e84a3f..47e0b73 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -134,11 +134,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.rackspace.cloudservers.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.rackspace.cloudservers*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml
index d7e8427..2a5ed4b 100644
--- a/providers/cloudsigma-lvs/pom.xml
+++ b/providers/cloudsigma-lvs/pom.xml
@@ -128,11 +128,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudsigma.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.cloudsigma*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index dcfbcee..1da488d 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -128,11 +128,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.cloudsigma.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.cloudsigma*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml
index 15443bf..55e7c8e 100644
--- a/providers/elastichosts-lax-p/pom.xml
+++ b/providers/elastichosts-lax-p/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.elastichosts*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 524f3de..a0a7636 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.elastichosts*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index 3b80580..d8d2820 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.elastichosts*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index ac2e713..7aefb7e 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.elastichosts*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml
index 3eeaef2..4a67adb 100644
--- a/providers/elastichosts-tor-p/pom.xml
+++ b/providers/elastichosts-tor-p/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.elastichosts*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml
index 67641c2..938320a 100644
--- a/providers/eucalyptus-partnercloud-ec2/pom.xml
+++ b/providers/eucalyptus-partnercloud-ec2/pom.xml
@@ -140,11 +140,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.epc.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.epc*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml
index 79f4a89..eccdd20 100644
--- a/providers/eucalyptus-partnercloud-s3/pom.xml
+++ b/providers/eucalyptus-partnercloud-s3/pom.xml
@@ -137,11 +137,9 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.epc.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.epc*;version="${project.version}"</Export-Package>
                         <Import-Package>
-                            org.jclouds.compute.internal;version="${project.version}",
-                            org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml
index 2dd12de..1c73aa9 100644
--- a/providers/go2cloud-jhb1/pom.xml
+++ b/providers/go2cloud-jhb1/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.go2cloud.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.go2cloud*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index 3d22670..d1f7e0b 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -117,11 +117,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.gogrid.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.gogrid*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml
index 3d6e96b..7cd831b 100644
--- a/providers/greenhousedata-element-vcloud/pom.xml
+++ b/providers/greenhousedata-element-vcloud/pom.xml
@@ -128,11 +128,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.greenhousedata.element.vcloud.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.greenhousedata.element.vcloud*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/hpcloud-objectstorage-lvs/pom.xml b/providers/hpcloud-objectstorage-lvs/pom.xml
index ad74d13..93ea619 100644
--- a/providers/hpcloud-objectstorage-lvs/pom.xml
+++ b/providers/hpcloud-objectstorage-lvs/pom.xml
@@ -157,8 +157,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.hpcloud.objectstorage.lvs.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.hpcloud.objectstorage.lvs*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml
index 7021c61..522bf90 100644
--- a/providers/ninefold-compute/pom.xml
+++ b/providers/ninefold-compute/pom.xml
@@ -129,11 +129,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.ninefold.compute.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.ninefold.compute*;version="${project.version}"</Export-Package>
             <Import-Package>
               org.jclouds.compute.internal;version="${project.version}",
               org.jclouds.rest.internal;version="${project.version}",
-              org.jclouds.*;version="${project.version}",
+              org.jclouds*;version="${project.version}",
               *
             </Import-Package>
           </instructions>
diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml
index 3da5020..28b78ee 100644
--- a/providers/ninefold-storage/pom.xml
+++ b/providers/ninefold-storage/pom.xml
@@ -127,8 +127,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.ninefold.storage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.ninefold.storage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index e255852..13b1256 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.openhosting.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.openhosting*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml
index c32a7b6..51296a1 100644
--- a/providers/rimuhosting/pom.xml
+++ b/providers/rimuhosting/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.rimuhosting.miro.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.rimuhosting.miro*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml
index 8bc8463..05523c3 100644
--- a/providers/savvis-symphonyvpdc/pom.xml
+++ b/providers/savvis-symphonyvpdc/pom.xml
@@ -141,11 +141,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.savvis.vpdc.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.savvis.vpdc*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 9ba3d57..ff31b6e 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.serverlove.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.serverlove*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index 4ac04ff..03f98bf 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -124,11 +124,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.skalicloud.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.skalicloud*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml
index d83a897..625120d 100644
--- a/providers/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -116,11 +116,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.slicehost.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.slicehost*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index 5ac45a4..99fe4cf 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -133,11 +133,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.softlayer.*;version="${project.version}"</Export-Package>
+            <Export-Package>org.jclouds.softlayer*;version="${project.version}"</Export-Package>
               <Import-Package>
                   org.jclouds.compute.internal;version="${project.version}",
                   org.jclouds.rest.internal;version="${project.version}",
-                  org.jclouds.*;version="${project.version}",
+                  org.jclouds*;version="${project.version}",
                   *
               </Import-Package>
           </instructions>
diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml
index ff10da7..25f0621 100644
--- a/providers/stratogen-vcloud-mycloud/pom.xml
+++ b/providers/stratogen-vcloud-mycloud/pom.xml
@@ -128,11 +128,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.stratogen.vcloud.mycloud.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.stratogen.vcloud.mycloud*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml
index f4afebb..9f326fe 100644
--- a/providers/synaptic-storage/pom.xml
+++ b/providers/synaptic-storage/pom.xml
@@ -127,8 +127,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.synaptic.storage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.synaptic.storage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
index 4230d53..bbab100 100644
--- a/providers/trmk-ecloud/pom.xml
+++ b/providers/trmk-ecloud/pom.xml
@@ -127,11 +127,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.trmk.ecloud.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.trmk.ecloud*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
index 261aeeb..c8bba29 100644
--- a/providers/trmk-vcloudexpress/pom.xml
+++ b/providers/trmk-vcloudexpress/pom.xml
@@ -125,11 +125,11 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.trmk.ecloud.*;version="${project.version}"</Export-Package>
+                        <Export-Package>org.jclouds.trmk.ecloud*;version="${project.version}"</Export-Package>
                         <Import-Package>
                             org.jclouds.compute.internal;version="${project.version}",
                             org.jclouds.rest.internal;version="${project.version}",
-                            org.jclouds.*;version="${project.version}",
+                            org.jclouds*;version="${project.version}",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/sandbox-apis/elb/pom.xml b/sandbox-apis/elb/pom.xml
index f1fdd1c..cf4ff40 100644
--- a/sandbox-apis/elb/pom.xml
+++ b/sandbox-apis/elb/pom.xml
@@ -144,8 +144,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.elb.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.elb*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/libvirt/pom.xml b/sandbox-apis/libvirt/pom.xml
index 398cf61..1d415c1 100644
--- a/sandbox-apis/libvirt/pom.xml
+++ b/sandbox-apis/libvirt/pom.xml
@@ -150,8 +150,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.libvirt.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.libvirt*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/nirvanix/pom.xml b/sandbox-apis/nirvanix/pom.xml
index 85063ba..7197222 100644
--- a/sandbox-apis/nirvanix/pom.xml
+++ b/sandbox-apis/nirvanix/pom.xml
@@ -129,8 +129,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.nirvanix.sdn.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.nirvanix.sdn*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/openstack-nova/pom.xml b/sandbox-apis/openstack-nova/pom.xml
index 9660cb2..e152752 100644
--- a/sandbox-apis/openstack-nova/pom.xml
+++ b/sandbox-apis/openstack-nova/pom.xml
@@ -1,154 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-

-  Licensed to jclouds, Inc. (jclouds) under one or more

-  contributor license agreements.  See the NOTICE file

-  distributed with this work for additional information

-  regarding copyright ownership.  jclouds 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.

-

--->

-<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>

-  <parent>

-    <groupId>org.jclouds</groupId>

-    <artifactId>jclouds-project</artifactId>

-    <version>1.3.0-SNAPSHOT</version>

-    <relativePath>../../project/pom.xml</relativePath>

-  </parent>

-  <groupId>org.jclouds.api</groupId>

-  <artifactId>openstack-nova</artifactId>

-  <name>jcloud openstack-nova api</name>

-  <description>jclouds components to access an implementation of OpenStack Nova</description>

-  <packaging>bundle</packaging>

-

-  <properties>

-    <test.openstack-nova.endpoint>http://localhost:8774/v1.1/</test.openstack-nova.endpoint>

-    <test.openstack-nova.api-version>v1.1</test.openstack-nova.api-version>

-    <test.openstack-nova.build-version></test.openstack-nova.build-version>

-    <test.openstack-nova.identity>FIXME_IDENTITY</test.openstack-nova.identity>

-    <test.openstack-nova.credential>FIXME_CREDENTIALS</test.openstack-nova.credential>

-    <test.openstack-nova.image-id></test.openstack-nova.image-id>

-    <test.openstack-nova.image.login-user></test.openstack-nova.image.login-user>

-    <test.openstack-nova.image.authenticate-sudo></test.openstack-nova.image.authenticate-sudo>

-    <test.ssh.keyfile.public></test.ssh.keyfile.public>

-    <test.ssh.keyfile.private></test.ssh.keyfile.private>

-  </properties>

-

-  <dependencies>

-    <dependency>

-      <groupId>org.jclouds.common</groupId>

-      <artifactId>openstack-common</artifactId>

-      <version>${project.version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.jclouds</groupId>

-      <artifactId>jclouds-compute</artifactId>

-      <version>${project.version}</version>

-    </dependency>

-    <dependency>

-      <groupId>org.jclouds</groupId>

-      <artifactId>jclouds-core</artifactId>

-      <version>${project.version}</version>

-      <type>test-jar</type>

-      <scope>test</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.jclouds.common</groupId>

-      <artifactId>openstack-common</artifactId>

-      <version>${project.version}</version>

-      <type>test-jar</type>

-      <scope>test</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.jclouds</groupId>

-      <artifactId>jclouds-compute</artifactId>

-      <version>${project.version}</version>

-      <type>test-jar</type>

-      <scope>test</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.jclouds.driver</groupId>

-      <artifactId>jclouds-sshj</artifactId>

-      <version>${project.version}</version>

-      <scope>test</scope>

-    </dependency>

-    <dependency>

-      <groupId>org.jclouds.driver</groupId>

-      <artifactId>jclouds-log4j</artifactId>

-      <version>${project.version}</version>

-      <scope>test</scope>

-    </dependency>

-  </dependencies>

-  

-  <profiles>

-    <profile>

-      <id>live</id>

-      <build>

-        <plugins>

-          <plugin>

-            <groupId>org.apache.maven.plugins</groupId>

-            <artifactId>maven-surefire-plugin</artifactId>

-            <dependencies>

-              <dependency>

-                <groupId>org.apache.maven.surefire</groupId>

-                <artifactId>surefire-testng</artifactId>

-              </dependency>

-            </dependencies>

-            <executions>

-              <execution>

-                <id>integration</id>

-                <phase>integration-test</phase>

-                <goals>

-                  <goal>test</goal>

-                </goals>

-                <configuration>

-                  <systemPropertyVariables>

-                    <test.openstack-nova.endpoint>${test.openstack-nova.endpoint}</test.openstack-nova.endpoint>

-                    <test.openstack-nova.api-version>${test.openstack-nova.api-version}</test.openstack-nova.api-version>

-                    <test.openstack-nova.build-version>${test.openstack-nova.build-version}</test.openstack-nova.build-version>

-                    <test.openstack-nova.identity>${test.openstack-nova.identity}</test.openstack-nova.identity>

-                    <test.openstack-nova.credential>${test.openstack-nova.credential}</test.openstack-nova.credential>

-                    <test.openstack-nova.image-id>${test.openstack-nova.image-id}</test.openstack-nova.image-id>

-                    <test.openstack-nova.image.login-user>${test.openstack-nova.image.login-user}</test.openstack-nova.image.login-user>

-                    <test.openstack-nova.image.authenticate-sudo>${test.openstack-nova.image.authenticate-sudo}</test.openstack-nova.image.authenticate-sudo>

-                    <test.ssh.keyfile.public>${test.ssh.keyfile.public}</test.ssh.keyfile.public>

-                    <test.ssh.keyfile.private>${test.ssh.keyfile.private}</test.ssh.keyfile.private>

-                  </systemPropertyVariables>

-                </configuration>

-              </execution>

-            </executions>

-          </plugin>

-        </plugins>

-      </build>

-    </profile>

-  </profiles>

-

-  <build>

-    <plugins>

-      <plugin>  

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

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

-        <configuration>

-          <instructions>

-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>

-            <Export-Package>org.jclouds.openstack.nova.v1_1.*;version="${project.version}"</Export-Package>

-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>

-          </instructions>

-        </configuration>

-      </plugin>

-    </plugins>

-  </build>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  Licensed to jclouds, Inc. (jclouds) under one or more
+  contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  jclouds 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.
+
+-->
+<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>
+  <parent>
+    <groupId>org.jclouds</groupId>
+    <artifactId>jclouds-project</artifactId>
+    <version>1.3.2-SNAPSHOT</version>
+    <relativePath>../../project/pom.xml</relativePath>
+  </parent>
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>openstack-nova</artifactId>
+  <name>jcloud openstack-nova api</name>
+  <description>jclouds components to access an implementation of OpenStack Nova</description>
+  <packaging>bundle</packaging>
+
+  <properties>
+    <!-- keystone endpoint -->
+    <test.openstack-nova.endpoint>http://localhost:5000</test.openstack-nova.endpoint>
+    <!-- keystone version -->
+    <test.openstack-nova.api-version>1.1</test.openstack-nova.api-version>
+    <test.openstack-nova.build-version></test.openstack-nova.build-version>
+    <test.openstack-nova.identity>FIXME_IDENTITY</test.openstack-nova.identity>
+    <test.openstack-nova.credential>FIXME_CREDENTIALS</test.openstack-nova.credential>
+    <test.openstack-nova.image-id></test.openstack-nova.image-id>
+    <test.openstack-nova.image.login-user></test.openstack-nova.image.login-user>
+    <test.openstack-nova.image.authenticate-sudo></test.openstack-nova.image.authenticate-sudo>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.common</groupId>
+      <artifactId>openstack-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-compute</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.common</groupId>
+      <artifactId>openstack-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-compute</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-sshj</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-slf4j</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.29</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>live</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <test.openstack-nova.endpoint>${test.openstack-nova.endpoint}</test.openstack-nova.endpoint>
+                    <test.openstack-nova.api-version>${test.openstack-nova.api-version}</test.openstack-nova.api-version>
+                    <test.openstack-nova.build-version>${test.openstack-nova.build-version}</test.openstack-nova.build-version>
+                    <test.openstack-nova.identity>${test.openstack-nova.identity}</test.openstack-nova.identity>
+                    <test.openstack-nova.credential>${test.openstack-nova.credential}</test.openstack-nova.credential>
+                    <test.openstack-nova.image-id>${test.openstack-nova.image-id}</test.openstack-nova.image-id>
+                    <test.openstack-nova.image.login-user>${test.openstack-nova.image.login-user}</test.openstack-nova.image.login-user>
+                    <test.openstack-nova.image.authenticate-sudo>${test.openstack-nova.image.authenticate-sudo}</test.openstack-nova.image.authenticate-sudo>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>  
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>org.jclouds.openstack.nova.v1_1*;version="${project.version}"</Export-Package>
+            <Import-Package>            
+                        org.jclouds.compute.internal;version="${project.version}",
+                        org.jclouds.rest.internal;version="${project.version}",
+                        org.jclouds*;version="${project.version}",
+                                *
+                        </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/sandbox-apis/pcs/pom.xml b/sandbox-apis/pcs/pom.xml
index dc5ecbd..3186741 100644
--- a/sandbox-apis/pcs/pom.xml
+++ b/sandbox-apis/pcs/pom.xml
@@ -129,8 +129,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.mezeo.pcs.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.mezeo.pcs*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/scality-rs2/pom.xml b/sandbox-apis/scality-rs2/pom.xml
index d11e695..67cafa7 100644
--- a/sandbox-apis/scality-rs2/pom.xml
+++ b/sandbox-apis/scality-rs2/pom.xml
@@ -127,8 +127,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.scality.rs2.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.scality.rs2*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml
index d0ffb06..d6115f4 100644
--- a/sandbox-apis/simpledb/pom.xml
+++ b/sandbox-apis/simpledb/pom.xml
@@ -102,8 +102,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.simpledb.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.simpledb*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/sqs/pom.xml b/sandbox-apis/sqs/pom.xml
index bad642f..b13bf67 100644
--- a/sandbox-apis/sqs/pom.xml
+++ b/sandbox-apis/sqs/pom.xml
@@ -102,8 +102,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.sqs.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.sqs*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-apis/virtualbox/pom.xml b/sandbox-apis/virtualbox/pom.xml
index f4b3a57..19a20ee 100644
--- a/sandbox-apis/virtualbox/pom.xml
+++ b/sandbox-apis/virtualbox/pom.xml
@@ -148,8 +148,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.virtualbox.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.virtualbox*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/sandbox-drivers/asynchttpclient/pom.xml b/sandbox-drivers/asynchttpclient/pom.xml
index 69974a3..2fbf068 100644
--- a/sandbox-drivers/asynchttpclient/pom.xml
+++ b/sandbox-drivers/asynchttpclient/pom.xml
@@ -77,8 +77,8 @@
                 <configuration> 
                     <instructions>      
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.http.ning.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.http.ning*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>     
                 </configuration>
             </plugin>   
diff --git a/sandbox-providers/aws-elb/pom.xml b/sandbox-providers/aws-elb/pom.xml
index 673d042..6abf604 100644
--- a/sandbox-providers/aws-elb/pom.xml
+++ b/sandbox-providers/aws-elb/pom.xml
@@ -150,8 +150,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.aws.elb.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.aws.elb*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml
index 8060295..b466e59 100644
--- a/sandbox-providers/aws-simpledb/pom.xml
+++ b/sandbox-providers/aws-simpledb/pom.xml
@@ -116,8 +116,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.aws.simpledb.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.aws.simpledb*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/azurequeue/pom.xml b/sandbox-providers/azurequeue/pom.xml
index 195da18..4f8e40d 100644
--- a/sandbox-providers/azurequeue/pom.xml
+++ b/sandbox-providers/azurequeue/pom.xml
@@ -109,8 +109,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.azurequeue.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.azurequeue*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/boxdotnet/pom.xml b/sandbox-providers/boxdotnet/pom.xml
index e36166e..29e3a28 100644
--- a/sandbox-providers/boxdotnet/pom.xml
+++ b/sandbox-providers/boxdotnet/pom.xml
@@ -120,8 +120,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.boxdotnet.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.boxdotnet*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/dunkel-vcd/pom.xml b/sandbox-providers/dunkel-vcd/pom.xml
index 99a564c..f0cac78 100644
--- a/sandbox-providers/dunkel-vcd/pom.xml
+++ b/sandbox-providers/dunkel-vcd/pom.xml
@@ -127,8 +127,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.dunkel.vcd.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.dunkel.vcd*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/sandbox-providers/glesys/pom.xml b/sandbox-providers/glesys/pom.xml
index 3a03d0d..436ddf7 100644
--- a/sandbox-providers/glesys/pom.xml
+++ b/sandbox-providers/glesys/pom.xml
@@ -133,8 +133,8 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.jclouds.glesys.*;version="${project.version}"</Export-Package>
-            <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+            <Export-Package>org.jclouds.glesys*;version="${project.version}"</Export-Package>
+            <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/sandbox-providers/googlestorage/pom.xml b/sandbox-providers/googlestorage/pom.xml
index c42aab0..8d14bd8 100644
--- a/sandbox-providers/googlestorage/pom.xml
+++ b/sandbox-providers/googlestorage/pom.xml
@@ -127,8 +127,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.googlestorage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.googlestorage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/hosteurope-storage/pom.xml b/sandbox-providers/hosteurope-storage/pom.xml
index 2b51626..9fe3a95 100644
--- a/sandbox-providers/hosteurope-storage/pom.xml
+++ b/sandbox-providers/hosteurope-storage/pom.xml
@@ -134,8 +134,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.hosteurope.storage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.hosteurope.storage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/ibm-smartcloud/pom.xml b/sandbox-providers/ibm-smartcloud/pom.xml
index c8ea4dd..07bcf04 100644
--- a/sandbox-providers/ibm-smartcloud/pom.xml
+++ b/sandbox-providers/ibm-smartcloud/pom.xml
@@ -134,8 +134,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.ibm.smartcloud.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.ibm.smartcloud*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/scaleup-storage/pom.xml b/sandbox-providers/scaleup-storage/pom.xml
index 9840623..b472866 100644
--- a/sandbox-providers/scaleup-storage/pom.xml
+++ b/sandbox-providers/scaleup-storage/pom.xml
@@ -134,8 +134,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.scaleup.storage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.scaleup.storage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/tiscali-storage/pom.xml b/sandbox-providers/tiscali-storage/pom.xml
index 2deac1f..5ed4c8e 100644
--- a/sandbox-providers/tiscali-storage/pom.xml
+++ b/sandbox-providers/tiscali-storage/pom.xml
@@ -135,8 +135,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.tiscali.storage.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.tiscali.storage*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/twitter/pom.xml b/sandbox-providers/twitter/pom.xml
index cdfcb46..a1c1254 100644
--- a/sandbox-providers/twitter/pom.xml
+++ b/sandbox-providers/twitter/pom.xml
@@ -121,8 +121,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.twitter.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.twitter*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/sandbox-providers/virtacore-publiccloud-lax/pom.xml b/sandbox-providers/virtacore-publiccloud-lax/pom.xml
index 6a8b792..e559d18 100644
--- a/sandbox-providers/virtacore-publiccloud-lax/pom.xml
+++ b/sandbox-providers/virtacore-publiccloud-lax/pom.xml
@@ -127,8 +127,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.virtacore.publiccloud.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.virtacore.publiccloud*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/scriptbuilder/pom.xml b/scriptbuilder/pom.xml
index 28883de..eea82fb 100644
--- a/scriptbuilder/pom.xml
+++ b/scriptbuilder/pom.xml
@@ -50,8 +50,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.scriptbuilder.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.scriptbuilder*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index bed3539..5ed1327 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -121,8 +121,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.jclouds.servermanager.*;version="${project.version}"</Export-Package>
-                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Export-Package>org.jclouds.servermanager*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds*;version="${project.version}",*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>