You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2013/10/04 11:47:36 UTC

svn commit: r1529112 [2/3] - in /ace/trunk: cnf/localrepo/ cnf/localrepo/org.apache.felix.configadmin/ org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/ org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/ org.apache.ace.authentic...

Modified: ace/trunk/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1529112&r1=1529111&r2=1529112&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Fri Oct  4 09:47:36 2013
@@ -1,157 +1,88 @@
 <?xml version='1.0' encoding='utf-8'?>
-<repository increment='1379573573825' name='Local' xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'>
+<repository increment='1380872364930' name='Local' xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'>
   <resource>
     <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='org.apache.felix.log'/>
+      <attribute name='osgi.identity' value='slf4j.api'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.0.1'/>
+      <attribute name='version' type='Version' value='1.5.11'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='88c4038729ab8dc4dddb018aeb41811443db0516b87d20cd60e55cd0593b85b1'/>
-      <attribute name='url' value='org.apache.felix.log/org.apache.felix.log-1.0.1.jar'/>
-      <attribute name='size' type='Long' value='22243'/>
+      <attribute name='osgi.content' value='b21bf26d56a98054dd3d668f85b4dfbdb33a5398453e0c551b801a5731edf11d'/>
+      <attribute name='url' value='slf4j.api/slf4j.api-1.5.11.jar'/>
+      <attribute name='size' type='Long' value='24199'/>
       <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
     <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='org.apache.felix.log'/>
-      <attribute name='bundle-version' type='Version' value='1.0.1'/>
+      <attribute name='osgi.wiring.bundle' value='slf4j.api'/>
+      <attribute name='bundle-version' type='Version' value='1.5.11'/>
     </capability>
     <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='org.apache.felix.log'/>
-      <attribute name='bundle-version' type='Version' value='1.0.1'/>
+      <attribute name='osgi.wiring.host' value='slf4j.api'/>
+      <attribute name='bundle-version' type='Version' value='1.5.11'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.osgi.service.log'/>
-      <attribute name='version' type='Version' value='1.3.0'/>
-      <attribute name='bundle-symbolic-name' value='org.apache.felix.log'/>
-      <attribute name='bundle-version' type='Version' value='1.0.1'/>
-      <directive name='uses' value='org.osgi.framework'/>
-    </capability>
-    <capability namespace='osgi.service'>
-      <attribute name='objectClass' value='org.osgi.service.log.LogService'/>
-      <directive name='effective' value='active'/>
-    </capability>
-    <capability namespace='osgi.service'>
-      <attribute name='objectClass' value='org.osgi.service.log.LogReaderService'/>
-      <directive name='effective' value='active'/>
-    </capability>
-    <capability namespace='osgi.service'>
-      <attribute name='objectClass' value='org.osgi.service.log.LogService'/>
-      <directive name='uses' value='org.osgi.service.log'/>
-      <directive name='effective' value='active'/>
-    </capability>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.4.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.log)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-  </resource>
-  <resource>
-    <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='org.apache.felix.useradmin.filestore'/>
-      <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.0.1'/>
-    </capability>
-    <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='80b4f7af7d2d340e69803ec71df37d8bb206aaf4685b27b732b21edcd6d08a27'/>
-      <attribute name='url' value='org.apache.felix.useradmin.filestore/org.apache.felix.useradmin.filestore-1.0.1.jar'/>
-      <attribute name='size' type='Long' value='16849'/>
-      <attribute name='mime' value='application/vnd.osgi.bundle'/>
-    </capability>
-    <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='org.apache.felix.useradmin.filestore'/>
-      <attribute name='bundle-version' type='Version' value='1.0.1'/>
-    </capability>
-    <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='org.apache.felix.useradmin.filestore'/>
-      <attribute name='bundle-version' type='Version' value='1.0.1'/>
-    </capability>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.apache.felix.useradmin)(version&gt;=1.0.0)(!(version&gt;=1.1.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.cm)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.useradmin)(version&gt;=1.1.0)(!(version&gt;=1.2.0)))'/>
-    </requirement>
-  </resource>
-  <resource>
-    <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='org.apache.felix.gogo.shell'/>
-      <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='0.10.0'/>
-    </capability>
-    <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='95e85d53c1683d01d456275ac5eb20fe9e37f03e2ac5a1fd11e204aaedbb803c'/>
-      <attribute name='url' value='org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar'/>
-      <attribute name='size' type='Long' value='49004'/>
-      <attribute name='mime' value='application/vnd.osgi.bundle'/>
+      <attribute name='osgi.wiring.package' value='org.slf4j'/>
+      <attribute name='version' type='Version' value='1.5.11'/>
+      <attribute name='bundle-symbolic-name' value='slf4j.api'/>
+      <attribute name='bundle-version' type='Version' value='1.5.11'/>
     </capability>
-    <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='org.apache.felix.gogo.shell'/>
-      <attribute name='bundle-version' type='Version' value='0.10.0'/>
+    <capability namespace='osgi.wiring.package'>
+      <attribute name='osgi.wiring.package' value='org.slf4j.spi'/>
+      <attribute name='version' type='Version' value='1.5.11'/>
+      <attribute name='bundle-symbolic-name' value='slf4j.api'/>
+      <attribute name='bundle-version' type='Version' value='1.5.11'/>
     </capability>
-    <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='org.apache.felix.gogo.shell'/>
-      <attribute name='bundle-version' type='Version' value='0.10.0'/>
+    <capability namespace='osgi.wiring.package'>
+      <attribute name='osgi.wiring.package' value='org.slf4j.helpers'/>
+      <attribute name='version' type='Version' value='1.5.11'/>
+      <attribute name='bundle-symbolic-name' value='slf4j.api'/>
+      <attribute name='bundle-version' type='Version' value='1.5.11'/>
     </capability>
     <requirement namespace='osgi.wiring.package'>
-      <attribute name='status' value='provisional'/>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.apache.felix.service.command)(version&gt;=0.10.0))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.osgi.framework)'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.osgi.service.startlevel)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.slf4j.impl)(version&gt;=1.5.5))'/>
     </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.osgi.util.tracker)'/>
+    <requirement namespace='osgi.ee'>
+      <directive name='filter' value='(&amp;(osgi.ee=JavaSE)(version=1.3))'/>
     </requirement>
   </resource>
   <resource>
     <capability namespace='osgi.identity'>
       <attribute name='osgi.identity' value='org.apache.felix.configadmin'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.6.0'/>
+      <attribute name='version' type='Version' value='1.8.0'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='a916382683770f5fecdf0244a6ddc3e1cdb3d2767a9855ed957a3e1e5eb32d1d'/>
-      <attribute name='url' value='org.apache.felix.configadmin/org.apache.felix.configadmin-1.6.0.jar'/>
-      <attribute name='size' type='Long' value='114545'/>
+      <attribute name='osgi.content' value='b2b43babdd1121fb1597993dadf8bdb234e049da05403b5f01adce6dceb08c02'/>
+      <attribute name='url' value='org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.0.jar'/>
+      <attribute name='size' type='Long' value='116382'/>
       <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
     <capability namespace='osgi.wiring.bundle'>
       <attribute name='osgi.wiring.bundle' value='org.apache.felix.configadmin'/>
-      <attribute name='bundle-version' type='Version' value='1.6.0'/>
+      <attribute name='bundle-version' type='Version' value='1.8.0'/>
     </capability>
     <capability namespace='osgi.wiring.host'>
       <attribute name='osgi.wiring.host' value='org.apache.felix.configadmin'/>
-      <attribute name='bundle-version' type='Version' value='1.6.0'/>
+      <attribute name='bundle-version' type='Version' value='1.8.0'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
       <attribute name='osgi.wiring.package' value='org.apache.felix.cm'/>
       <attribute name='version' type='Version' value='1.0.0'/>
       <attribute name='bundle-symbolic-name' value='org.apache.felix.configadmin'/>
-      <attribute name='bundle-version' type='Version' value='1.6.0'/>
+      <attribute name='bundle-version' type='Version' value='1.8.0'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
       <attribute name='osgi.wiring.package' value='org.apache.felix.cm.file'/>
       <attribute name='version' type='Version' value='1.0.0'/>
       <attribute name='bundle-symbolic-name' value='org.apache.felix.configadmin'/>
-      <attribute name='bundle-version' type='Version' value='1.6.0'/>
+      <attribute name='bundle-version' type='Version' value='1.8.0'/>
       <directive name='uses' value='org.apache.felix.cm,org.osgi.framework'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
       <attribute name='osgi.wiring.package' value='org.osgi.service.cm'/>
       <attribute name='version' type='Version' value='1.5.0'/>
       <attribute name='bundle-symbolic-name' value='org.apache.felix.configadmin'/>
-      <attribute name='bundle-version' type='Version' value='1.6.0'/>
+      <attribute name='bundle-version' type='Version' value='1.8.0'/>
       <directive name='uses' value='org.osgi.framework'/>
     </capability>
     <capability namespace='osgi.service'>
@@ -192,537 +123,413 @@
   </resource>
   <resource>
     <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='biz.aQute.bnd'/>
+      <attribute name='osgi.identity' value='com.google.guava'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='c73e781a1fcdd5e841d35c5eb7e3552205702e30edf1044d513d987c46c27abf'/>
-      <attribute name='url' value='biz.aQute.bnd/biz.aQute.bnd-2.1.0.jar'/>
-      <attribute name='size' type='Long' value='1856112'/>
+      <attribute name='osgi.content' value='138c9e67182196d60ae4525f89790a1dad0383a36e9b52884dd92d7584ac5ada'/>
+      <attribute name='url' value='com.google.guava/com.google.guava-12.0.0.jar'/>
+      <attribute name='size' type='Long' value='1817834'/>
       <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
     <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='osgi.wiring.bundle' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
     </capability>
     <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='osgi.wiring.host' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.service'/>
-      <attribute name='version' type='Version' value='3.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.bnd.osgi,aQute.bnd.build,aQute.bnd.version,aQute.service.reporter'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.net'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.base,javax.annotation,com.google.common.hash,com.google.common.io,com.google.common.primitives,com.google.common.collect'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.service.action'/>
-      <attribute name='version' type='Version' value='1.43.1'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.bnd.build'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.collect'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.base,javax.annotation,com.google.common.primitives,com.google.common.math'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.service.diff'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.bnd.osgi'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.primitives'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='javax.annotation,com.google.common.base,sun.misc'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.service.repository'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.bnd.version,aQute.service.reporter'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.base'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='javax.annotation'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.service.url'/>
-      <attribute name='version' type='Version' value='1.1.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.cache'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.collect,com.google.common.util.concurrent,javax.annotation,com.google.common.base,com.google.common.primitives'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.header'/>
-      <attribute name='version' type='Version' value='1.1.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.service.reporter'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.eventbus'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.collect,com.google.common.base,com.google.common.cache'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.osgi'/>
-      <attribute name='version' type='Version' value='2.1.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.bnd.header,aQute.bnd.service,aQute.bnd.version,aQute.service.reporter'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.util.concurrent'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.base,javax.annotation,com.google.common.collect'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.build'/>
-      <attribute name='version' type='Version' value='2.1.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='aQute.bnd.maven.support,aQute.bnd.osgi,aQute.bnd.service,aQute.bnd.service.action,aQute.bnd.version,aQute.service.reporter'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.hash'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.base,com.google.common.math,com.google.common.primitives,javax.annotation'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.version'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.io'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.hash,com.google.common.base,javax.annotation,com.google.common.primitives'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.maven.support'/>
-      <attribute name='version' type='Version' value='2.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='javax.xml.xpath,org.w3c.dom,aQute.bnd.service,aQute.bnd.version,aQute.service.reporter'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.reflect'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='javax.annotation,com.google.common.base,com.google.common.collect'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.osgi.service.bindex'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.math'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
+      <directive name='uses' value='com.google.common.base,javax.annotation'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.service.reporter'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='aQute.bnd.osgi.resource'/>
-      <attribute name='version' type='Version' value='1.1.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='org.osgi.resource'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.osgi.service.repository'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
-      <directive name='uses' value='org.osgi.resource'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.osgi.resource'/>
-      <attribute name='version' type='Version' value='1.0.0'/>
-      <attribute name='bundle-symbolic-name' value='biz.aQute.bnd'/>
-      <attribute name='bundle-version' type='Version' value='2.1.0.20130613-062523'/>
+      <attribute name='osgi.wiring.package' value='com.google.common.annotations'/>
+      <attribute name='version' type='Version' value='12.0.0'/>
+      <attribute name='bundle-symbolic-name' value='com.google.guava'/>
+      <attribute name='bundle-version' type='Version' value='12.0.0'/>
     </capability>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.apache.tools.ant)'/>
-      <directive name='resolution' value='optional'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.apache.tools.ant.taskdefs)'/>
-      <directive name='resolution' value='optional'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.apache.tools.ant.types)'/>
+      <directive name='filter' value='(osgi.wiring.package=javax.annotation)'/>
       <directive name='resolution' value='optional'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=junit.framework)(version&gt;=3.8.0)(!(version&gt;=4.0.0)))'/>
+      <directive name='filter' value='(osgi.wiring.package=sun.misc)'/>
       <directive name='resolution' value='optional'/>
     </requirement>
+  </resource>
+  <resource>
+    <capability namespace='osgi.identity'>
+      <attribute name='osgi.identity' value='org.ops4j.pax.swissbox.tinybundles'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='1.3.1'/>
+      <directive name='singleton' value='true'/>
+    </capability>
+    <capability namespace='osgi.content'>
+      <attribute name='osgi.content' value='062d7f19cfd92453993def343a0938c31e368a2f29671cd91bfe2e605c3cc679'/>
+      <attribute name='url' value='org.ops4j.pax.swissbox.tinybundles/org.ops4j.pax.swissbox.tinybundles-1.3.1.jar'/>
+      <attribute name='size' type='Long' value='29253'/>
+      <attribute name='mime' value='application/vnd.osgi.bundle'/>
+    </capability>
+    <capability namespace='osgi.wiring.bundle'>
+      <attribute name='osgi.wiring.bundle' value='org.ops4j.pax.swissbox.tinybundles'/>
+      <attribute name='bundle-version' type='Version' value='1.3.1'/>
+    </capability>
+    <capability namespace='osgi.wiring.host'>
+      <attribute name='osgi.wiring.host' value='org.ops4j.pax.swissbox.tinybundles'/>
+      <attribute name='bundle-version' type='Version' value='1.3.1'/>
+    </capability>
+    <capability namespace='osgi.wiring.package'>
+      <attribute name='osgi.wiring.package' value='org.ops4j.pax.swissbox.tinybundles.core'/>
+      <attribute name='version' type='Version' value='1.3.1'/>
+      <attribute name='bundle-symbolic-name' value='org.ops4j.pax.swissbox.tinybundles'/>
+      <attribute name='bundle-version' type='Version' value='1.3.1'/>
+      <directive name='uses' value='org.ops4j.store'/>
+    </capability>
+    <capability namespace='osgi.wiring.package'>
+      <attribute name='osgi.wiring.package' value='org.ops4j.pax.swissbox.tinybundles.dp'/>
+      <attribute name='version' type='Version' value='1.3.1'/>
+      <attribute name='bundle-symbolic-name' value='org.ops4j.pax.swissbox.tinybundles'/>
+      <attribute name='bundle-version' type='Version' value='1.3.1'/>
+      <directive name='uses' value='org.osgi.framework,org.ops4j.store,org.ops4j.pax.swissbox.tinybundles.core'/>
+    </capability>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=aQute.bnd.service)(version&gt;=3.0.0)(!(version&gt;=4.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=aQute.bnd.service.action)(version&gt;=1.43.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=aQute.bnd.service.diff)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=aQute.bnd.version)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=aQute.service.reporter)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.naming)'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.xml.namespace)'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.xml.parsers)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.apache.commons.logging)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.xml.transform)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.ops4j.io)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.xml.transform.dom)'/>
+      <directive name='filter' value='(osgi.wiring.package=org.ops4j.pax.swissbox.bnd)'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.xml.transform.stream)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.ops4j.pax.swissbox.tinybundles.core)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.xml.xpath)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.ops4j.pax.swissbox.tinybundles.dp)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.5.0)(!(version&gt;=2.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.ops4j.store)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.resource)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
+  </resource>
+  <resource>
+    <capability namespace='osgi.identity'>
+      <attribute name='osgi.identity' value='org.apache.felix.log'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='1.0.1'/>
+    </capability>
+    <capability namespace='osgi.content'>
+      <attribute name='osgi.content' value='88c4038729ab8dc4dddb018aeb41811443db0516b87d20cd60e55cd0593b85b1'/>
+      <attribute name='url' value='org.apache.felix.log/org.apache.felix.log-1.0.1.jar'/>
+      <attribute name='size' type='Long' value='22243'/>
+      <attribute name='mime' value='application/vnd.osgi.bundle'/>
+    </capability>
+    <capability namespace='osgi.wiring.bundle'>
+      <attribute name='osgi.wiring.bundle' value='org.apache.felix.log'/>
+      <attribute name='bundle-version' type='Version' value='1.0.1'/>
+    </capability>
+    <capability namespace='osgi.wiring.host'>
+      <attribute name='osgi.wiring.host' value='org.apache.felix.log'/>
+      <attribute name='bundle-version' type='Version' value='1.0.1'/>
+    </capability>
+    <capability namespace='osgi.wiring.package'>
+      <attribute name='osgi.wiring.package' value='org.osgi.service.log'/>
+      <attribute name='version' type='Version' value='1.3.0'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.log'/>
+      <attribute name='bundle-version' type='Version' value='1.0.1'/>
+      <directive name='uses' value='org.osgi.framework'/>
+    </capability>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.log.LogService'/>
+      <directive name='effective' value='active'/>
+    </capability>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.log.LogReaderService'/>
+      <directive name='effective' value='active'/>
+    </capability>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.log.LogService'/>
+      <directive name='uses' value='org.osgi.service.log'/>
+      <directive name='effective' value='active'/>
+    </capability>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.w3c.dom)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.4.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.xml.sax)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.log)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
   </resource>
   <resource>
     <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='com.sun.jersey.client'/>
+      <attribute name='osgi.identity' value='ec2'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
+      <attribute name='version' type='Version' value='1.5.0.beta_6'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='2cb5b9f4a132ab54c0a10a89ad62d601d19eb1216b62184e923657923ceb175d'/>
-      <attribute name='url' value='com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar'/>
-      <attribute name='size' type='Long' value='131269'/>
+      <attribute name='osgi.content' value='56708b308277a7815c78d5284b721f16c38a07745e6fa9a8701043749afff8d5'/>
+      <attribute name='url' value='ec2/ec2-1.5.0.jar'/>
+      <attribute name='size' type='Long' value='344780'/>
       <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
     <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
+      <attribute name='osgi.wiring.bundle' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
     </capability>
     <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
+      <attribute name='osgi.wiring.host' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.api.client.filter'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.api.client,com.sun.jersey.core.util,javax.ws.rs.core'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.reference'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.api.client.async'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.api.client'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.predicates'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.ec2.domain,com.google.common.base,org.jclouds.compute.predicates,org.jclouds.predicates,javax.annotation,com.google.common.collect,org.jclouds.ec2,org.jclouds.ec2.options,org.jclouds.ec2.services,org.jclouds.ec2.compute.functions,org.jclouds.logging,org.jclouds.aws.util,javax.inject,org.jclouds.rest,org.jclouds.ec2.compute.domain,com.google.inject'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.api.client.config'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.core.util'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.domain'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='com.google.common.base,com.google.common.collect,org.jclouds.javax.annotation,org.jclouds.util,org.jclouds.crypto'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.api.client'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.api.client.async,javax.ws.rs.core,com.sun.jersey.client.impl,com.sun.jersey.api.client.filter,com.sun.jersey.client.proxy,com.sun.jersey.client.impl.async,com.sun.jersey.api.client.config,com.sun.jersey.core.spi.component.ioc,com.sun.jersey.spi.inject,com.sun.jersey.core.util,com.sun.jersey.core.spi.factory,javax.ws.rs.ext,com.sun.jersey.core.spi.component,com.sun.jersey.client.urlconnection,com.sun.jersey.spi,com.sun.jersey.spi.service,com.sun.jersey.core.provider,com.sun.jersey.core.header,com.sun.jersey.core.reflection'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.extensions'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='org.jclouds.predicates,org.jclouds.compute.domain,com.google.common.util.concurrent,org.jclouds.ec2.domain,javax.annotation,org.jclouds.ec2,org.jclouds.ec2.options,com.google.common.collect,org.jclouds.ec2.services,com.google.common.base,org.jclouds.logging,org.jclouds.aws.util,org.jclouds.concurrent,javax.inject,com.google.inject,org.jclouds.compute.extensions'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.client.urlconnection'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='javax.net.ssl,com.sun.jersey.api.client,javax.ws.rs.core,com.sun.jersey.core.header,com.sun.jersey.spi'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.options'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='com.google.common.collect,com.google.common.base,org.jclouds.rest.annotations,org.jclouds.ec2.options.internal,com.google.inject,org.jclouds.ec2.domain,org.jclouds.javax.annotation,org.jclouds.encryption.internal'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.client.osgi'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.ws.rs.ext,org.osgi.framework,javax.ws.rs.ext'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='com.google.common.reflect,org.jclouds.apis,org.jclouds.apis.internal,org.jclouds.ec2.compute,org.jclouds.rest.internal,com.google.common.collect,org.jclouds.ec2.config,org.jclouds.ec2.compute.config,org.jclouds.rest,org.jclouds.ec2.services,org.jclouds.rest.annotations,org.jclouds.concurrent'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.client.impl.async'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.api.client.async,com.sun.jersey.api.client'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.xml'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='org.jclouds.logging,org.jclouds.http.functions,javax.annotation,org.jclouds.ec2.domain,com.google.common.base,org.jclouds.aws.util,org.jclouds.date,org.jclouds.rest.internal,org.jclouds.location,javax.inject,com.google.common.collect,org.jclouds.util,org.xml.sax,com.google.inject,org.jclouds.rest,org.jclouds.http,org.jclouds.encryption.internal,org.jclouds.crypto'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.client.proxy'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.api.client.async,com.sun.jersey.api.client'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.services'/>
+      <attribute name='version' type='Version' value='1.5.0.beta6'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
+      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,org.jclouds.ec2.binders,org.jclouds.aws.filters,org.jclouds.ec2.options,javax.ws.rs,org.jclouds.ec2.xml,org.jclouds.location.functions,org.jclouds.rest.annotations,org.jclouds.javax.annotation,org.jclouds.rest.functions,com.google.common.util.concurrent,org.jclouds.concurrent,org.jclouds.ec2.functions'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.jersey.client.impl'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.core.header,com.sun.jersey.api.client,javax.ws.rs.core'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='com.sun.ws.rs.ext'/>
-      <attribute name='version' type='Version' value='1.13.0'/>
-      <attribute name='bundle-symbolic-name' value='com.sun.jersey.client'/>
-      <attribute name='bundle-version' type='Version' value='1.13.0'/>
-      <directive name='uses' value='com.sun.jersey.core.spi.factory,javax.ws.rs.core'/>
-    </capability>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.header)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.provider)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.reflection)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.spi.component)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.spi.component.ioc)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.spi.factory)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.core.util)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.spi)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.spi.inject)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.sun.jersey.spi.service)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.net.ssl)'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=javax.ws.rs.core)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=javax.ws.rs.ext)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
-    </requirement>
-  </resource>
-  <resource>
-    <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='jclouds-compute'/>
-      <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.5.0.beta_6'/>
-    </capability>
-    <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='48e4a3a441cfbe77d43fb8c417ff44380779d3ae4d2ff8950185d7bf08f80409'/>
-      <attribute name='url' value='jclouds-compute/jclouds-compute-1.5.0.jar'/>
-      <attribute name='size' type='Long' value='470098'/>
-      <attribute name='mime' value='application/vnd.osgi.bundle'/>
-    </capability>
-    <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-    </capability>
-    <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.cim.xml'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.http.functions,org.jclouds.util,org.xml.sax,org.jclouds.cim,com.google.common.base,com.google.common.collect'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.cim.functions'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.base,org.jclouds.cim,org.jclouds.compute.domain.internal,com.google.common.collect,javax.inject'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.cim'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.base,com.google.common.collect,org.jclouds.compute.domain'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.compute.internal,org.jclouds.scriptbuilder.domain,com.google.common.util.concurrent,com.google.common.base,org.jclouds.compute.options,org.jclouds.domain,com.google.inject,org.jclouds.compute.extensions,org.jclouds.javax.annotation,org.jclouds.rest,org.jclouds,org.jclouds.apis,org.jclouds.providers,com.google.common.collect,org.jclouds.compute.util,org.jclouds.ssh'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.events'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.scriptbuilder.domain,org.jclouds.scriptbuilder,com.google.common.base'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.functions'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,javax.annotation,com.google.common.net,com.google.common.base,org.jclouds.logging,org.jclouds.compute.reference,org.jclouds.domain,org.jclouds.compute.util,javax.inject,com.google.inject,org.jclouds.ssh,org.jclouds.javax.annotation,org.jclouds.compute.options,org.jclouds.compute.internal,org.jclouds.scriptbuilder.domain,org.jclouds.scriptbuilder.statements.ssh,com.google.common.collect,org.jclouds.scriptbuilder'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.domain.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.collect,org.jclouds.domain.internal,com.google.common.base,org.jclouds.domain,org.jclouds.javax.annotation,org.jclouds.compute.util,com.google.common.primitives,javax.annotation,org.jclouds.collect,org.jclouds.compute.options,org.jclouds.util,org.jclouds.logging,javax.inject'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.stub.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.base,org.jclouds.rest,com.google.common.collect,org.jclouds.compute,org.jclouds.compute.options,org.jclouds.location.suppliers.all,org.jclouds.domain,org.jclouds.compute.util,javax.inject,org.jclouds.compute.predicates,org.jclouds.concurrent,org.jclouds.compute.config,com.google.inject,com.google.common.cache,org.jclouds.predicates,com.google.common.net,org.jclouds.compute.domain.internal,org.jclouds.rest.annotations'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.predicates.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging,org.jclouds.compute.domain,javax.annotation,com.google.common.collect,com.google.common.base,org.jclouds.domain,org.jclouds.compute.util,javax.inject,org.jclouds.compute.strategy,com.google.inject'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.extensions'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.util.concurrent'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.domain'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.javax.annotation,org.jclouds.cim,org.jclouds.ovf,org.jclouds.ovf.internal,org.jclouds.compute.domain.internal,org.jclouds.domain,com.google.inject,com.google.common.collect,com.google.common.base,com.google.common.io,org.jclouds.compute.config,org.jclouds.compute.predicates,org.jclouds.compute.options'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.strategy'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.loaders'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.collect,org.jclouds.compute.strategy.impl,org.jclouds.compute.config,com.google.inject,com.google.common.base,org.jclouds.compute.options,javax.annotation,org.jclouds.scriptbuilder.domain,com.google.common.net,com.google.inject.assistedinject,org.jclouds.compute.callables,org.jclouds.logging,org.jclouds.compute.reference,org.jclouds.javax.annotation,org.jclouds.compute.util,javax.inject,org.jclouds.domain'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,javax.annotation,org.jclouds.ec2,com.google.common.collect,org.jclouds.ec2.services,com.google.common.base,com.google.common.cache,org.jclouds.logging,org.jclouds.ec2.compute.domain,javax.inject,org.jclouds.compute.domain,org.jclouds.ec2.options,org.jclouds.ec2.compute.functions'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.internal'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.options.internal'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.javax.annotation,com.google.common.base,org.jclouds.logging,org.jclouds.compute.strategy,com.google.common.util.concurrent,org.jclouds.scriptbuilder.domain,org.jclouds.compute.options,org.jclouds.compute.callables,org.jclouds.predicates,javax.annotation,org.jclouds.compute,org.jclouds.util,org.jclouds.scriptbuilder.functions,org.jclouds.domain,org.jclouds.compute.extensions,org.jclouds.collect,com.google.common.collect,org.jclouds.compute.reference,org.jclouds.concurrent,org.jclouds.compute.util,javax.inject,org.jclouds.compute.predicates,org.jclouds.rest,org.jclouds.location,com.google.common.reflect,org.jclouds.internal,org.jclouds,org.jclouds.compute.functions,com.google.common.cache,org.jclouds.predicates.validators,com.google.inject,org.jclouds.xml,org.jclouds.json,org.jclouds.crypto,com.google.common.eventbus,org.jclouds.rest.internal,org.jclouds.date,org.jclouds.ssh'/>
+      <directive name='uses' value='com.google.common.base,com.google.common.collect,org.jclouds.http.options'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.strategy.impl'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.functions'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.base,org.jclouds.domain,org.jclouds.compute.strategy,javax.annotation,com.google.common.collect,org.jclouds.compute,org.jclouds.compute.options,org.jclouds.logging,org.jclouds.compute.util,javax.inject,org.jclouds.compute.predicates,org.jclouds.compute.functions,com.google.common.util.concurrent,org.jclouds.compute.config,org.jclouds.concurrent,org.jclouds.javax.annotation'/>
+      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.aws.util,org.jclouds.ec2.compute.domain,com.google.common.collect,com.google.common.base,javax.inject,com.google.common.cache,org.jclouds.logging,org.jclouds.compute.functions,org.jclouds.ec2.domain,javax.annotation,org.jclouds.ec2,org.jclouds.ec2.services,com.google.inject,org.jclouds.domain,org.jclouds.compute.strategy,org.jclouds.collect,org.jclouds.ec2.compute.strategy,org.jclouds.compute.util,org.jclouds.compute.domain.internal,org.jclouds.util,com.google.common.util.concurrent,javax.crypto,org.jclouds.crypto,org.jclouds.encryption.internal'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.callables'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.config'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.base,org.jclouds.predicates,com.google.common.util.concurrent,javax.annotation,org.jclouds.scriptbuilder.domain,com.google.common.primitives,com.google.inject.assistedinject,org.jclouds.compute.events,org.jclouds.scriptbuilder,com.google.common.eventbus,org.jclouds.compute.reference,org.jclouds.logging,com.google.inject.name,com.google.inject,javax.inject,org.jclouds.compute.options,org.jclouds.scriptbuilder.statements.login,org.jclouds.domain,org.jclouds.ssh,com.google.common.collect'/>
+      <directive name='uses' value='org.jclouds.ec2.compute.strategy,org.jclouds.compute.strategy,org.jclouds.compute.config,org.jclouds.compute.domain,org.jclouds.ec2.compute.suppliers,com.google.common.base,com.google.inject,com.google.common.collect,com.google.common.cache,org.jclouds.ec2.compute.domain,org.jclouds.ec2.compute.loaders,org.jclouds.rest,org.jclouds.rest.suppliers,org.jclouds.concurrent,com.google.inject.name,javax.inject,org.jclouds.compute.extensions,org.jclouds.predicates,org.jclouds.ec2.compute.predicates,org.jclouds.ec2.domain,org.jclouds.ec2.compute.extensions,org.jclouds.compute,org.jclouds.ec2.compute.functions,org.jclouds.domain,org.jclouds.ec2.compute,org.jclouds.ec2.compute.options,org.jclouds.compute.options,org.jclouds.ec2.compute.internal,com.google.inject.binder'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.options'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.domain'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.domain,org.jclouds.javax.annotation,com.google.common.base,org.jclouds.scriptbuilder.domain,com.google.common.collect,com.google.common.primitives'/>
+      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.base,org.jclouds.ec2.domain,org.jclouds.compute.domain.internal,com.google.common.collect,org.jclouds.domain,org.jclouds.compute.predicates'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.reference'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.suppliers'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='javax.inject,com.google.inject,com.google.common.base'/>
+      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.ec2.compute.domain,com.google.common.collect,com.google.common.base,javax.inject,javax.annotation,org.jclouds.ec2.options,org.jclouds.ec2.compute.functions,com.google.common.cache,org.jclouds.ec2.compute.strategy,org.jclouds.logging,org.jclouds.location'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.stub'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.functions'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.apis,org.jclouds.apis.internal,org.jclouds.compute.stub.config,org.jclouds.compute'/>
+      <directive name='uses' value='com.google.common.base,javax.inject,org.jclouds.crypto,org.jclouds.aws.domain,org.jclouds.aws'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.config'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.util'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.inject,org.jclouds.compute.domain,com.google.common.base,org.jclouds.compute.reference,org.jclouds.json,com.google.common.collect,org.jclouds.scriptbuilder.domain,org.jclouds.compute.callables,org.jclouds.compute.options,javax.inject,com.google.common.util.concurrent,org.jclouds.rest,com.google.inject.assistedinject,org.jclouds.util,org.jclouds.compute.functions,org.jclouds.rest.suppliers,org.jclouds.location,org.jclouds.domain,org.jclouds.config,com.google.inject.name,org.jclouds.compute.extensions,org.jclouds.compute.strategy,org.jclouds.collect,com.google.inject.binder,org.jclouds.compute.strategy.impl,org.jclouds.compute,org.jclouds.location.suppliers,org.jclouds.predicates,org.jclouds.compute.predicates,org.jclouds.javax.annotation,org.jclouds.functions,org.jclouds.scriptbuilder.functions,org.jclouds.compute.internal'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,com.google.common.collect,com.google.common.base,org.jclouds.util'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.util'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.binders'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,com.google.common.base,org.jclouds.rest,org.jclouds.scriptbuilder.domain,com.google.common.collect,org.jclouds.compute,org.jclouds.compute.options,org.jclouds.http,com.google.common.reflect,org.jclouds.compute.strategy,org.jclouds.compute.config,javax.inject,com.google.common.net,org.jclouds.logging,org.jclouds.predicates,javax.annotation,com.google.common.util.concurrent,com.google.inject'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,org.jclouds.rest,org.jclouds.http,com.google.common.collect,org.jclouds.http.utils,com.google.common.base,org.jclouds.aws.util,javax.inject,org.jclouds.ec2.util,org.jclouds.aws.filters,org.jclouds.crypto'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.compute.predicates'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.compute.strategy,com.google.common.collect,org.jclouds.compute.predicates.internal,javax.inject,com.google.common.base,com.google.inject,org.jclouds.javax.annotation,org.jclouds.domain,org.jclouds.util,org.jclouds.ssh,org.jclouds.logging,javax.annotation'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,com.google.common.collect,com.google.common.base,org.jclouds.logging,org.jclouds.predicates,org.jclouds.ec2,org.jclouds.ec2.services,org.jclouds.compute,org.jclouds.util,org.jclouds.scriptbuilder.functions,com.google.common.cache,org.jclouds.compute.functions,org.jclouds.aws.util,org.jclouds.ec2.compute.domain,org.jclouds.domain,org.jclouds.compute.extensions,org.jclouds.compute.domain,org.jclouds.compute.strategy,org.jclouds.compute.internal,org.jclouds.collect,org.jclouds.ec2.compute.options,org.jclouds.compute.options,org.jclouds.compute.callables,org.jclouds.compute.reference,javax.inject,com.google.inject,org.jclouds.ec2.compute.internal'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.net.util'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.options'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.net.domain,com.google.common.collect,com.google.common.base'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,org.jclouds.javax.annotation,org.jclouds.domain,org.jclouds.scriptbuilder.domain,com.google.common.collect,com.google.common.base,org.jclouds.util,org.jclouds.compute.options'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.net.domain'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.strategy'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.collect,com.google.common.base'/>
+      <directive name='uses' value='org.jclouds.compute.domain,org.jclouds.ec2.domain,org.jclouds.scriptbuilder.domain,org.jclouds.ec2.options,com.google.common.collect,org.jclouds.ec2.compute.options,com.google.common.base,org.jclouds.compute.options,org.jclouds.crypto,com.google.common.cache,org.jclouds.compute.functions,org.jclouds.javax.annotation,org.jclouds.ec2.compute.domain,javax.inject,com.google.inject,com.google.common.util.concurrent,org.jclouds.ec2,org.jclouds.ec2.services,javax.annotation,org.jclouds.logging,org.jclouds.concurrent,org.jclouds.ec2.compute.predicates,org.jclouds.aws.util,org.jclouds.domain,org.jclouds.compute.strategy,org.jclouds.compute.config,org.jclouds.compute.util,org.jclouds.ec2.compute.util,org.jclouds.location,org.jclouds.compute.predicates,org.jclouds.compute.strategy.impl'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.ovf'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.suppliers'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.collect,com.google.common.base,org.jclouds.ovf.internal,org.jclouds.javax.annotation,org.jclouds.cim'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,com.google.common.base,javax.annotation,org.jclouds.ec2,com.google.common.collect,org.jclouds.ec2.options,org.jclouds.ec2.services,org.jclouds.util,org.jclouds.logging,org.jclouds.http,org.jclouds.location,org.jclouds.location.suppliers,javax.inject'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.ovf.xml'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.internal'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.ovf,org.jclouds.util,javax.inject,org.xml.sax,org.jclouds.logging,javax.annotation,org.jclouds.ovf.xml.internal,org.jclouds.http.functions,org.jclouds.cim.xml,com.google.common.base,org.jclouds.cim'/>
+      <directive name='uses' value='org.jclouds.compute.internal,org.jclouds.ec2.compute,org.jclouds.location,org.jclouds.compute,com.google.common.reflect,javax.inject,org.jclouds,org.jclouds.compute.domain,org.jclouds.ec2.compute.domain,com.google.common.util.concurrent,com.google.common.base,org.jclouds.util,com.google.common.cache,org.jclouds.collect,com.google.common.collect,org.jclouds.compute.options,org.jclouds.compute.domain.internal,org.jclouds.domain'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.ovf.xml.internal'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.predicates'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.http.functions,org.jclouds.ovf,org.jclouds.ovf.internal,com.google.common.collect,org.jclouds.util,org.jclouds.ovf.xml,javax.inject,com.google.inject,org.xml.sax'/>
+      <directive name='uses' value='org.jclouds.ec2.domain,javax.annotation,org.jclouds.ec2,com.google.common.collect,org.jclouds.ec2.services,com.google.common.base,org.jclouds.aws,org.jclouds.logging,org.jclouds.aws.domain,javax.inject,com.google.inject,org.jclouds.rest,org.jclouds.ec2.options'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.ovf.internal'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.config'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.ovf,com.google.common.collect,com.google.common.base'/>
+      <directive name='uses' value='org.jclouds.location.suppliers.derived,org.jclouds.rest,org.jclouds.aws.config,com.google.common.collect,org.jclouds.ec2,org.jclouds.ec2.services,org.jclouds.location.config,org.jclouds.ec2.suppliers,com.google.common.reflect,org.jclouds.location.suppliers,com.google.inject.binder,com.google.inject'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.ssh'/>
+      <attribute name='osgi.wiring.package' value='org.jclouds.ec2.compute.util'/>
       <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-compute'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.net,org.jclouds.domain,org.jclouds.compute.domain,org.jclouds.io'/>
+      <directive name='uses' value='org.jclouds.domain,javax.inject'/>
     </capability>
     <requirement namespace='osgi.wiring.package'>
       <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.base)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
@@ -734,58 +541,103 @@
       <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.collect)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.eventbus)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.reflect)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.io)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.util.concurrent)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.net)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.primitives)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject.binder)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.reflect)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject.name)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.util.concurrent)(version&gt;=12.0.0)(!(version&gt;=13.0.0)))'/>
+      <directive name='filter' value='(osgi.wiring.package=javax.annotation)'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
+      <directive name='filter' value='(osgi.wiring.package=javax.crypto)'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject.assistedinject)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
+      <directive name='filter' value='(osgi.wiring.package=javax.inject)'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject.binder)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
+      <directive name='filter' value='(osgi.wiring.package=javax.ws.rs)'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.inject.name)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.annotation)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.apis)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.inject)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.apis.internal)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.aws)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.apis)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.aws.config)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.apis.internal)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.aws.domain)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.aws.filters)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.aws.util)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.collect)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.concurrent)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.config)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.callables)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.config)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.domain)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.domain.internal)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.extensions)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.functions)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.internal)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.options)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.predicates)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.reference)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.strategy)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.strategy.impl)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.compute.util)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.concurrent)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.crypto)(version&gt;=1.5.0.beta6))'/>
@@ -797,10 +649,7 @@
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.domain)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.domain.internal)(version&gt;=1.5.0.beta6))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.functions)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.encryption.internal)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.http)(version&gt;=1.5.0.beta6))'/>
@@ -809,37 +658,34 @@
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.http.functions)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.internal)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.http.options)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.io)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.http.utils)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.javax.annotation)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.json)(version&gt;=1.5.0.beta6))'/>
-    </requirement>
-    <requirement namespace='osgi.wiring.package'>
       <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.suppliers)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.config)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.suppliers.all)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.functions)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.logging)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.suppliers)(version&gt;=1.5.0.beta6))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.predicates)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.suppliers.derived)(version&gt;=1.5.0.beta6))'/>
     </requirement>

[... 11041 lines stripped ...]