From 4704e29941a96baa13567994ba6f452955110490 Mon Sep 17 00:00:00 2001
From: Ioannis Canellos <iocanel@apache.org>
Date: Wed, 13 Jun 2012 13:04:37 +0300
Subject: [PATCH] Fixed openstack and openstack-keystone OSGi headers.

---
 apis/openstack-keystone/pom.xml |  4 +---
 common/openstack/pom.xml        | 13 +------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/apis/openstack-keystone/pom.xml b/apis/openstack-keystone/pom.xml
index c7657e422c..243167b505 100644
--- a/apis/openstack-keystone/pom.xml
+++ b/apis/openstack-keystone/pom.xml
@@ -43,9 +43,7 @@
     <test.openstack-keystone.credential>FIXME_CREDENTIALS</test.openstack-keystone.credential>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
 
-    <jclouds.osgi.export>org.jclouds.openstack.v2_0*;version="${project.version}",
-      org.jclouds.openstack.keystone.v2_0*;version="${project.version}" 
-    </jclouds.osgi.export>
+    <jclouds.osgi.export>org.jclouds.openstack*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.rest.internal;version="${project.version}",
       org.jclouds*;version="${project.version}",
diff --git a/common/openstack/pom.xml b/common/openstack/pom.xml
index af29166945..af8aa2a6c0 100644
--- a/common/openstack/pom.xml
+++ b/common/openstack/pom.xml
@@ -35,18 +35,7 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <jclouds.osgi.export>org.jclouds.openstack.config*;version="${project.version}",
-          org.jclouds.openstack.domain*;version="${project.version}"
-          org.jclouds.openstack.filters*;version="${project.version}"
-          org.jclouds.openstack.functions*;version="${project.version}"
-          org.jclouds.openstack.handlers*;version="${project.version}"
-          org.jclouds.openstack.internal*;version="${project.version}"
-          org.jclouds.openstack.keystone.v1_1*;version="${project.version}"
-          org.jclouds.openstack.options*;version="${project.version}"
-          org.jclouds.openstack.predicates*;version="${project.version}"
-          org.jclouds.openstack.reference*;version="${project.version}"
-          org.jclouds.openstack.services*;version="${project.version}"
-        </jclouds.osgi.export>
+        <jclouds.osgi.export>org.jclouds.openstack*;version="${project.version}";-noimport:=true</jclouds.osgi.export>
         <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
      </properties>