ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1583967 [2/3] - in /ace/trunk/cnf/localrepo: index.xml org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.5.jar org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.6.jar
Date Wed, 02 Apr 2014 11:16:59 GMT

Modified: ace/trunk/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1583967&r1=1583966&r2=1583967&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Wed Apr  2 11:16:58 2014
@@ -1,5 +1,159 @@
 <?xml version='1.0' encoding='utf-8'?>
-<repository increment='1396340812514' name='Local' xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'>
+<repository increment='1396434283002' name='Local' xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'>
+  <resource>
+    <capability namespace='osgi.identity'>
+      <attribute name='osgi.identity' value='slf4j.api'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='1.5.11'/>
+    </capability>
+    <capability namespace='osgi.content'>
+      <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='slf4j.api'/>
+      <attribute name='bundle-version' type='Version' value='1.5.11'/>
+    </capability>
+    <capability namespace='osgi.wiring.host'>
+      <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.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.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.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'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.slf4j.impl)(version&gt;=1.5.5))'/>
+    </requirement>
+    <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.8.0'/>
+    </capability>
+    <capability namespace='osgi.content'>
+      <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.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.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.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.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.8.0'/>
+      <directive name='uses' value='org.osgi.framework'/>
+    </capability>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.cm.ConfigurationAdmin'/>
+      <attribute name='service.description' value='Configuration Admin Service Specification 1.5 Implementation'/>
+      <attribute name='service.pid' value='org.osgi.service.cm.ConfigurationAdmin'/>
+      <attribute name='service.vendor' value='Apache Software Foundation'/>
+      <directive name='effective' value='active'/>
+    </capability>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.apache.felix.cm.PersistenceManager'/>
+      <attribute name='service.description' value='Platform Filesystem Persistence Manager'/>
+      <attribute name='service.pid' value='org.apache.felix.cm.file.FilePersistenceManager'/>
+      <attribute name='service.vendor' value='Apache Software Foundation'/>
+      <directive name='effective' value='active'/>
+    </capability>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.cm.ConfigurationAdmin'/>
+      <directive name='uses' value='org.osgi.service.cm'/>
+      <directive name='effective' value='active'/>
+    </capability>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.apache.felix.cm)(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.apache.felix.cm.file)(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.4.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.5.0)(!(version&gt;=1.6.0)))'/>
+    </requirement>
+    <requirement namespace='osgi.service'>
+      <directive name='filter' value='(objectClass=org.osgi.service.log.LogService)'/>
+      <directive name='effective' value='active'/>
+    </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.2'/>
+    </capability>
+    <capability namespace='osgi.content'>
+      <attribute name='osgi.content' value='34ec9f555bc1f8a95cc41fbc9fc50f17a01b4779ac1cb28cc949572e3e158fa8'/>
+      <attribute name='url' value='org.apache.felix.useradmin.filestore/org.apache.felix.useradmin.filestore-1.0.2.jar'/>
+      <attribute name='size' type='Long' value='23273'/>
+      <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.2'/>
+    </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.2'/>
+    </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='com.google.guava'/>
@@ -114,6972 +268,6891 @@
   </resource>
   <resource>
     <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='javax.servlet'/>
+      <attribute name='osgi.identity' value='org.ops4j.pax.swissbox.tinybundles'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='2.5.0.v200910301333'/>
+      <attribute name='version' type='Version' value='1.3.1'/>
+      <directive name='singleton' value='true'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='c2030131f54c997400a1b245980f609489fd4cded5283ac3fb17bfee6ca8ff49'/>
-      <attribute name='url' value='javax.servlet/javax.servlet-2.5.0.jar'/>
-      <attribute name='size' type='Long' value='118865'/>
+      <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='javax.servlet'/>
-      <attribute name='bundle-version' type='Version' value='2.5.0.v200910301333'/>
+      <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='javax.servlet'/>
-      <attribute name='bundle-version' type='Version' value='2.5.0.v200910301333'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='javax.servlet'/>
-      <attribute name='version' type='Version' value='2.5.0'/>
-      <attribute name='bundle-symbolic-name' value='javax.servlet'/>
-      <attribute name='bundle-version' type='Version' value='2.5.0.v200910301333'/>
+      <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='javax.servlet.http'/>
-      <attribute name='version' type='Version' value='2.5.0'/>
-      <attribute name='bundle-symbolic-name' value='javax.servlet'/>
-      <attribute name='bundle-version' type='Version' value='2.5.0.v200910301333'/>
+      <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='javax.servlet.resources'/>
-      <attribute name='version' type='Version' value='2.5.0'/>
-      <attribute name='bundle-symbolic-name' value='javax.servlet'/>
-      <attribute name='bundle-version' type='Version' value='2.5.0.v200910301333'/>
+      <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.ee'>
-      <directive name='filter' value='(|(&amp;(osgi.ee=CDC/Foundation)(version=1.1))(&amp;(osgi.ee=JavaSE)(version=1.4)))'/>
+    <requirement namespace='osgi.wiring.package'>
+      <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='(&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=org.ops4j.pax.swissbox.bnd)'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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='(&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.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.framework)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
   </resource>
   <resource>
     <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='jclouds-bouncycastle'/>
+      <attribute name='osgi.identity' value='org.apache.felix.deploymentadmin'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.5.0.beta_6'/>
+      <attribute name='version' type='Version' value='0.9.6'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='a45daae73f7af1d088a6ee3cb84dc846a67fdca4b475ec7c2a8ba3700d39424f'/>
-      <attribute name='url' value='jclouds-bouncycastle/jclouds-bouncycastle-1.5.0.jar'/>
-      <attribute name='size' type='Long' value='10134'/>
+      <attribute name='osgi.content' value='190a42f29291d0ea8420d6a09573c896cd82487073e14f7a36b494f37008de7e'/>
+      <attribute name='url' value='org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.6.jar'/>
+      <attribute name='size' type='Long' value='100502'/>
       <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
     <capability namespace='osgi.wiring.bundle'>
-      <attribute name='osgi.wiring.bundle' value='jclouds-bouncycastle'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <attribute name='osgi.wiring.bundle' value='org.apache.felix.deploymentadmin'/>
+      <attribute name='bundle-version' type='Version' value='0.9.6'/>
     </capability>
     <capability namespace='osgi.wiring.host'>
-      <attribute name='osgi.wiring.host' value='jclouds-bouncycastle'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <attribute name='osgi.wiring.host' value='org.apache.felix.deploymentadmin'/>
+      <attribute name='bundle-version' type='Version' value='0.9.6'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.encryption.bouncycastle'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-bouncycastle'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.bouncycastle.jce.provider,javax.inject,org.jclouds.encryption.internal'/>
+      <attribute name='osgi.wiring.package' value='org.osgi.service.deploymentadmin'/>
+      <attribute name='version' type='Version' value='1.0.0'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.deploymentadmin'/>
+      <attribute name='bundle-version' type='Version' value='0.9.6'/>
+      <directive name='uses' value='org.osgi.framework'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.encryption.bouncycastle.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-bouncycastle'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.encryption.bouncycastle,com.google.inject.binder,org.jclouds.crypto,com.google.inject'/>
+      <attribute name='osgi.wiring.package' value='org.osgi.service.deploymentadmin.spi'/>
+      <attribute name='version' type='Version' value='1.0.0'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.deploymentadmin'/>
+      <attribute name='bundle-version' type='Version' value='0.9.6'/>
+      <directive name='uses' value='org.osgi.framework,org.osgi.service.deploymentadmin'/>
     </capability>
     <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='(&amp;(osgi.wiring.package=org.apache.felix.dm)(version&gt;=3.0.0)(!(version&gt;=4.0.0)))'/>
     </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='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.5.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=javax.inject)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.deploymentadmin)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(osgi.wiring.package=org.bouncycastle.jce.provider)'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.deploymentadmin.spi)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
     <requirement namespace='osgi.wiring.package'>
-      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.crypto)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.event)(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.jclouds.encryption.internal)(version&gt;=1.5.0.beta6))'/>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.log)(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.packageadmin)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))'/>
     </requirement>
   </resource>
   <resource>
     <capability namespace='osgi.identity'>
-      <attribute name='osgi.identity' value='jclouds-core'/>
+      <attribute name='osgi.identity' value='org.apache.felix.log'/>
       <attribute name='type' value='osgi.bundle'/>
-      <attribute name='version' type='Version' value='1.5.0.beta_6'/>
+      <attribute name='version' type='Version' value='1.0.1'/>
     </capability>
     <capability namespace='osgi.content'>
-      <attribute name='osgi.content' value='2cae190e357a73233690c332bb39d6211dd3bd80537a02e11211dd314a50985f'/>
-      <attribute name='url' value='jclouds-core/jclouds-core-1.5.0.jar'/>
-      <attribute name='size' type='Long' value='743250'/>
+      <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='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <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='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+      <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.jclouds.events.handlers'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.eventbus,org.jclouds.logging,javax.annotation,javax.inject'/>
+      <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.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.xml.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.xml,com.google.inject.name,javax.inject,javax.xml.bind'/>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.log.LogService'/>
+      <directive name='effective' value='active'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.logging.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging,javax.annotation,com.google.common.io,com.google.common.base,org.jclouds.io'/>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.log.LogReaderService'/>
+      <directive name='effective' value='active'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.rest.annotations'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='javax.inject,org.jclouds.rest,com.google.common.base,org.jclouds.predicates,org.jclouds.http,org.jclouds.http.functions'/>
+    <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>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.util'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.base,com.google.common.io,org.jclouds.javax.annotation,org.jclouds.domain,com.google.common.net,com.google.common.collect,javax.inject,com.google.inject,com.google.common.cache,org.xml.sax,javax.annotation,org.jclouds.logging,org.jclouds.rest,org.jclouds.http,org.jclouds.concurrent,com.google.inject.spi,com.google.common.reflect'/>
+    <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='ec2'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='1.5.0.beta_6'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.location.reference'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+    <capability namespace='osgi.content'>
+      <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.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.http.options'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
+    <capability namespace='osgi.wiring.bundle'>
+      <attribute name='osgi.wiring.bundle' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.collect,org.jclouds.date,com.google.common.base,org.jclouds.date.internal'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.location.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
+    <capability namespace='osgi.wiring.host'>
+      <attribute name='osgi.wiring.host' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.inject,com.google.common.collect,com.google.common.base,org.jclouds.rest,org.jclouds.collect,org.jclouds.util,org.jclouds.location.predicates,org.jclouds.rest.functions,org.jclouds.rest.suppliers,org.jclouds.location,org.jclouds.domain,org.jclouds.location.suppliers,com.google.inject.binder,javax.inject'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.location.suppliers.all'/>
+      <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='jclouds-core'/>
+      <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.location,org.jclouds.domain,javax.inject,org.jclouds.location.suppliers,org.jclouds.logging,javax.annotation,org.jclouds.location.predicates'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.logging'/>
+      <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='jclouds-core'/>
+      <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,org.jclouds.logging.jdk.config,com.google.common.collect,org.jclouds.logging.config'/>
+      <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='org.jclouds.json.config'/>
+      <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='jclouds-core'/>
+      <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.gson.reflect,com.google.gson,com.google.inject,org.jclouds.date,com.google.gson.stream,javax.inject,org.jclouds.crypto,com.google.common.primitives,com.google.common.collect,org.jclouds.json.internal,org.jclouds.domain,com.google.gson.internal,org.jclouds.json,com.google.inject.binder'/>
+      <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='org.jclouds.rest.internal'/>
+      <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='jclouds-core'/>
+      <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,com.google.common.cache,com.google.common.base,javax.inject,org.jclouds.http,javax.annotation,org.jclouds.rest,com.google.common.collect,org.jclouds.rest.annotations,org.jclouds.util,org.jclouds.logging,com.google.common.util.concurrent,org.jclouds.concurrent,org.jclouds.internal,com.google.inject.util,com.google.common.reflect,org.jclouds.apis,org.jclouds.apis.internal,org.jclouds.io,org.jclouds.javax.annotation,org.jclouds.io.payloads,org.jclouds.http.options,org.jclouds.http.functions,javax.ws.rs,org.jclouds.http.utils,org.jclouds.location,javax.ws.rs.core,org.jclouds.functions,org.jclouds.rest.functions,org.jclouds.rest.binders,org.jclouds.json.internal,org.jclouds.providers,org.jclouds.lifecycle,org.jclouds.xml,org.jclouds.json,org.jclouds.crypto,com.google.common.eventbus,org.jclouds.date,org.jclouds.domain'/>
+      <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='org.jclouds.http'/>
+      <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='jclouds-core'/>
+      <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.io,com.google.common.collect,com.google.common.base,org.jclouds.javax.annotation,org.jclouds.http.internal,org.jclouds.io.payloads,org.jclouds.util,org.jclouds.logging.internal,org.jclouds.crypto,org.jclouds.logging,com.google.common.io,javax.inject,com.google.inject,org.jclouds.http.handlers,com.google.common.util.concurrent,org.jclouds.concurrent,javax.annotation,org.jclouds.rest.internal'/>
+      <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='org.jclouds.http.utils'/>
+      <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='jclouds-core'/>
+      <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.javax.annotation,org.jclouds.http,com.google.common.collect,org.jclouds.io.payloads,com.google.common.base,org.jclouds.util,org.jclouds.io,javax.ws.rs.core'/>
+      <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='org.jclouds.location.predicates.fromconfig'/>
+      <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='jclouds-core'/>
+      <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.location.predicates,org.jclouds.location.suppliers.fromconfig,com.google.common.base,javax.inject'/>
+      <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='org.jclouds.location.suppliers.fromconfig'/>
+      <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='jclouds-core'/>
+      <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.location,org.jclouds.location.suppliers,javax.inject,org.jclouds.logging,javax.annotation,com.google.inject.assistedinject,org.jclouds.config,org.jclouds.providers,org.jclouds.rest.suppliers'/>
+      <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='org.jclouds.logging.config'/>
+      <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-core'/>
+      <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,com.google.inject.spi,com.google.inject,javax.annotation,com.google.common.base,com.google.common.collect,javax.inject,com.google.inject.matcher'/>
+      <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.location'/>
+      <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-core'/>
+      <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'/>
+      <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.internal'/>
+      <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-core'/>
+      <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.location,com.google.common.reflect,javax.inject,org.jclouds,org.jclouds.javax.annotation,org.jclouds.providers,org.jclouds.rest,org.jclouds.rest.annotations,org.jclouds.apis,com.google.common.io,org.jclouds.lifecycle,org.jclouds.domain,com.google.inject,com.google.inject.name'/>
+      <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.config'/>
+      <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-core'/>
+      <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,org.nnsoft.guice.rocoto.configuration,org.jclouds.internal,javax.inject,com.google.inject,org.nnsoft.guice.rocoto,org.jclouds.rest,org.jclouds.rest.internal,com.google.common.reflect,com.google.inject.binder,com.google.inject.util,com.google.inject.name'/>
+      <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.encryption.internal'/>
+      <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-core'/>
+      <attribute name='bundle-symbolic-name' value='ec2'/>
       <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='javax.crypto.spec,org.jclouds.javax.annotation,javax.inject,javax.crypto,org.jclouds.crypto'/>
+      <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'/>
+      <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-core'/>
+      <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.providers,org.jclouds.rest,org.jclouds.javax.annotation,org.jclouds.internal,org.jclouds.domain,com.google.inject,org.jclouds.apis,com.google.common.base,org.jclouds.http.config,org.jclouds.events.config,org.jclouds.concurrent.config,org.jclouds.concurrent,org.jclouds.providers.internal,org.jclouds.providers.config,org.jclouds.util,org.jclouds.logging.config,org.jclouds.config,org.jclouds.rest.config,com.google.common.collect,org.jclouds.lifecycle.config,org.jclouds.logging.jdk.config,com.google.common.util.concurrent,com.google.common.reflect'/>
+      <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.rest.config'/>
+      <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-core'/>
+      <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.rest,javax.inject,com.google.inject,com.google.common.collect,com.google.inject.binder,org.jclouds.concurrent.internal,com.google.common.base,com.google.inject.name,com.google.common.cache,org.jclouds.internal,org.jclouds.util,org.jclouds.logging,javax.annotation,org.jclouds.domain,org.jclouds.json,org.jclouds.collect,com.google.common.io,com.google.common.reflect,org.jclouds.rest.internal,com.google.inject.util,org.jclouds.http,org.jclouds.functions,com.google.inject.assistedinject,org.jclouds.http.functions.config,org.jclouds.location.config,org.jclouds.json.config,org.jclouds.rest.binders,com.sun.jersey.api.uri,javax.ws.rs.core'/>
+      <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.collect'/>
+      <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-core'/>
+      <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.javax.annotation,com.google.common.base,org.jclouds.logging,javax.annotation,com.google.common.collect,javax.inject,com.google.common.io'/>
+      <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.cache'/>
+      <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-core'/>
+      <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.cache,com.google.common.util.concurrent,org.jclouds.cache.internal'/>
+      <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.events.config.annotations'/>
+      <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-core'/>
+      <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'/>
+      <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.javax.annotation.concurrent'/>
+      <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-core'/>
+      <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.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.location.suppliers.implicit'/>
+      <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-core'/>
+      <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.location.predicates,org.jclouds.collect,com.google.common.collect,org.jclouds.location.functions,com.google.common.base,org.jclouds.domain,org.jclouds.location.suppliers,javax.inject,org.jclouds.suppliers,org.jclouds.location'/>
+      <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.xml'/>
+      <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-core'/>
+      <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.xml.internal,com.google.inject'/>
+      <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.location.functions'/>
+      <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-core'/>
+      <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.javax.annotation,com.google.common.base,org.jclouds.location,javax.inject,org.jclouds.domain'/>
+      <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.lifecycle.config'/>
+      <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-core'/>
+      <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,org.jclouds.lifecycle,com.google.inject.spi,com.google.common.base,com.google.common.util.concurrent,org.jclouds.concurrent,javax.annotation,com.google.inject.binder,com.google.inject.matcher'/>
+      <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.io'/>
+      <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-core'/>
+      <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.javax.annotation,com.google.common.collect,org.jclouds.io.payloads,com.google.common.base,org.jclouds.logging,javax.annotation,org.jclouds.date,com.google.inject,org.jclouds.crypto,org.jclouds.collect,com.google.common.io,javax.inject,org.jclouds.encryption.internal,org.jclouds.io.internal'/>
+      <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.http.pool'/>
+      <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-core'/>
+      <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,javax.inject'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.json'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <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.logging.jdk.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging,org.jclouds.logging.jdk,org.jclouds.logging.config'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.cache.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.util.concurrent,org.jclouds.cache,com.google.common.base,com.google.common.cache,com.google.common.collect,org.jclouds.util'/>
+    <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)))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=com.google.common.cache)(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.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.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.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.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.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.inject.name)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=javax.annotation)'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=javax.crypto)'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=javax.inject)'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=javax.ws.rs)'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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='(&amp;(osgi.wiring.package=org.jclouds.apis)(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))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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.aws.config)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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.compute)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.date)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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.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))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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.http.options)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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.location)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <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.functions)(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))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.location.suppliers.derived)(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))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.predicates)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.rest)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.rest.annotations)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.rest.functions)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.rest.internal)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.rest.suppliers)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.scriptbuilder.domain)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.scriptbuilder.functions)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.jclouds.util)(version&gt;=1.5.0.beta6))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=org.xml.sax)'/>
+    </requirement>
+  </resource>
+  <resource>
+    <capability namespace='osgi.identity'>
+      <attribute name='osgi.identity' value='org.apache.felix.dependencymanager'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='3.1.0'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.crypto.pem'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='net.oauth.signature.pem'/>
+    <capability namespace='osgi.content'>
+      <attribute name='osgi.content' value='0742513cf0638fd6647142c84f876c0c19f74bb9f20a0869e1410c7fe3befb26'/>
+      <attribute name='url' value='org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar'/>
+      <attribute name='size' type='Long' value='174283'/>
+      <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.rest.binders'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.rest,com.google.common.net,org.jclouds.http,com.google.common.base,javax.inject,javax.ws.rs.core,org.jclouds.http.utils,org.jclouds.rest.annotations,org.jclouds.io,org.jclouds.rest.internal,org.jclouds.io.payloads,org.jclouds.json,com.google.common.collect,com.google.inject.assistedinject,org.jclouds.xml'/>
+    <capability namespace='osgi.wiring.bundle'>
+      <attribute name='osgi.wiring.bundle' value='org.apache.felix.dependencymanager'/>
+      <attribute name='bundle-version' type='Version' value='3.1.0'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.json.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.base,com.google.gson.stream,com.google.gson,com.google.gson.internal,com.google.gson.reflect,com.google.gson.internal.bind,com.google.common.cache,com.google.common.collect,javax.inject,org.jclouds.json,com.google.gson.annotations'/>
+    <capability namespace='osgi.wiring.host'>
+      <attribute name='osgi.wiring.host' value='org.apache.felix.dependencymanager'/>
+      <attribute name='bundle-version' type='Version' value='3.1.0'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.domain.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.javax.annotation,com.google.common.collect,com.google.common.base,org.jclouds.domain'/>
+      <attribute name='osgi.wiring.package' value='org.apache.felix.dm'/>
+      <attribute name='version' type='Version' value='3.0.0'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.dependencymanager'/>
+      <attribute name='bundle-version' type='Version' value='3.1.0'/>
+      <directive name='uses' value='org.osgi.framework'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.logging.jdk'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging'/>
+      <attribute name='osgi.wiring.package' value='org.apache.felix.dm.tracker'/>
+      <attribute name='version' type='Version' value='3.1.0'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.dependencymanager'/>
+      <attribute name='bundle-version' type='Version' value='3.1.0'/>
+      <directive name='uses' value='org.osgi.framework,org.apache.felix.dm'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.events.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.events.handlers,com.google.common.eventbus,org.jclouds.events.config.annotations,com.google.inject.binder,javax.inject,com.google.inject'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.location.suppliers'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.location.suppliers.implicit,com.google.common.base,com.google.inject,org.jclouds.location.suppliers.fromconfig,org.jclouds.location.suppliers.all,org.jclouds.javax.annotation,com.google.inject.assistedinject'/>
-    </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.http.functions'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.http,org.jclouds.logging,javax.annotation,org.jclouds.rest,com.google.common.base,org.jclouds.io,javax.inject,com.google.gson.stream,com.google.common.collect,com.google.common.io,org.jclouds.json.internal,com.google.inject,com.google.gson,org.jclouds.util,org.jclouds.json,org.jclouds.rest.internal,org.xml.sax.helpers,org.jclouds.javax.annotation,org.xml.sax,javax.ws.rs.core,org.jclouds.xml'/>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.apache.felix.dm.tracker)(version&gt;=3.1.0)(!(version&gt;=3.2.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)))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.cm)(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.metatype)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))'/>
+    </requirement>
+  </resource>
+  <resource>
+    <capability namespace='osgi.identity'>
+      <attribute name='osgi.identity' value='org.apache.felix.metatype'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='1.0.4'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.location.suppliers.derived'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.common.base,org.jclouds.location,org.jclouds.location.suppliers,javax.inject,com.google.inject,com.google.common.collect'/>
+    <capability namespace='osgi.content'>
+      <attribute name='osgi.content' value='3eba0039242a2bd3c26609648d50c0850b3f11cdebbca94acb45b555ddddef10'/>
+      <attribute name='url' value='org.apache.felix.metatype/org.apache.felix.metatype-1.0.4.jar'/>
+      <attribute name='size' type='Long' value='93990'/>
+      <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.predicates'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging,javax.annotation,com.google.common.net,javax.inject,com.google.inject,com.google.common.base,org.jclouds.util,org.jclouds.javax.annotation'/>
+    <capability namespace='osgi.wiring.bundle'>
+      <attribute name='osgi.wiring.bundle' value='org.apache.felix.metatype'/>
+      <attribute name='bundle-version' type='Version' value='1.0.4'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.http.handlers'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging,javax.annotation,org.jclouds.http,com.google.common.base,javax.inject,com.google.inject,org.jclouds.util,org.jclouds.io,org.jclouds.http.annotation,org.jclouds.http.utils,javax.ws.rs.core'/>
+    <capability namespace='osgi.wiring.host'>
+      <attribute name='osgi.wiring.host' value='org.apache.felix.metatype'/>
+      <attribute name='bundle-version' type='Version' value='1.0.4'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.rest'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <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.rest.internal,javax.inject,com.google.inject.util,com.google.inject,org.jclouds.http,org.jclouds.http.functions,org.jclouds.rest.functions,javax.ws.rs,com.google.common.util.concurrent,org.jclouds.rest.annotations,org.jclouds.io,org.jclouds.concurrent,org.jclouds.predicates,com.google.common.collect,com.google.common.base,org.jclouds.providers,com.google.common.reflect,org.jclouds,org.jclouds.javax.annotation,org.jclouds.xml,org.jclouds.json,org.jclouds.crypto,org.jclouds.logging,com.google.common.eventbus,org.jclouds.date,org.jclouds.domain'/>
+      <attribute name='osgi.wiring.package' value='org.apache.felix.metatype'/>
+      <attribute name='version' type='Version' value='1.0.4'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.metatype'/>
+      <attribute name='bundle-version' type='Version' value='1.0.4'/>
+      <directive name='uses' value='org.osgi.service.metatype,org.osgi.framework'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.io.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.io.payloads,com.google.common.io,com.google.common.base,org.jclouds.io,javax.inject'/>
+      <attribute name='osgi.wiring.package' value='org.osgi.service.metatype'/>
+      <attribute name='version' type='Version' value='1.1.0'/>
+      <attribute name='bundle-symbolic-name' value='org.apache.felix.metatype'/>
+      <attribute name='bundle-version' type='Version' value='1.0.4'/>
+      <directive name='uses' value='org.osgi.framework'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.providers.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.providers,org.jclouds.apis,org.jclouds.javax.annotation,com.google.common.collect,com.google.common.base'/>
+    <capability namespace='osgi.service'>
+      <attribute name='objectClass' value='org.osgi.service.metatype.MetaTypeService'/>
+      <directive name='uses' value='org.osgi.service.metatype'/>
+      <directive name='effective' value='active'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.providers.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='com.google.inject,org.jclouds.providers,com.google.common.base,org.jclouds.rest.annotations,org.jclouds.apis,org.jclouds.location,com.google.common.reflect,org.jclouds.domain,com.google.inject.name,com.google.inject.binder,javax.inject,com.google.inject.util,org.jclouds'/>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.apache.felix.metatype)(version&gt;=1.0.0))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.3.0))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.log)(version&gt;=1.3.0))'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(&amp;(osgi.wiring.package=org.osgi.service.metatype)(version&gt;=1.1.0))'/>
+    </requirement>
+  </resource>
+  <resource>
+    <capability namespace='osgi.identity'>
+      <attribute name='osgi.identity' value='org.osgi.impl.bundle.repoindex.lib'/>
+      <attribute name='type' value='osgi.bundle'/>
+      <attribute name='version' type='Version' value='0.0.4.201306141305'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.suppliers'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.logging,javax.annotation,com.google.common.collect,com.google.common.base'/>
+    <capability namespace='osgi.content'>
+      <attribute name='osgi.content' value='7804a3ae6d774f224bc1a2d8b642ebbe715a0141afd524215d37dbf710761936'/>
+      <attribute name='url' value='org.osgi.impl.bundle.repoindex.lib/org.osgi.impl.bundle.repoindex.lib-0.0.4.jar'/>
+      <attribute name='size' type='Long' value='317844'/>
+      <attribute name='mime' value='application/vnd.osgi.bundle'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.http.functions.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.http.functions,com.google.common.base,javax.xml.parsers,javax.inject,com.google.inject,org.xml.sax,com.google.inject.binder'/>
+    <capability namespace='osgi.wiring.bundle'>
+      <attribute name='osgi.wiring.bundle' value='org.osgi.impl.bundle.repoindex.lib'/>
+      <attribute name='bundle-version' type='Version' value='0.0.4.201306141305'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.date.internal'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.date,com.google.common.base,javax.inject,com.google.inject'/>
+    <capability namespace='osgi.wiring.host'>
+      <attribute name='osgi.wiring.host' value='org.osgi.impl.bundle.repoindex.lib'/>
+      <attribute name='bundle-version' type='Version' value='0.0.4.201306141305'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.http.config'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.http,com.google.inject.binder,org.jclouds.http.internal,com.google.inject,org.jclouds.logging,javax.annotation,com.google.common.collect,javax.net.ssl,javax.inject,com.google.common.base,com.google.inject.name'/>
+      <attribute name='osgi.wiring.package' value='org.osgi.service.indexer'/>
+      <attribute name='version' type='Version' value='1.0.2'/>
+      <attribute name='bundle-symbolic-name' value='org.osgi.impl.bundle.repoindex.lib'/>
+      <attribute name='bundle-version' type='Version' value='0.0.4.201306141305'/>
     </capability>
     <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.apis'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
-      <directive name='uses' value='org.jclouds.javax.annotation,com.google.common.reflect,com.google.inject,org.jclouds,com.google.common.base,org.jclouds.rest,org.jclouds.util,com.google.common.collect'/>
+      <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.osgi.impl.bundle.repoindex.lib'/>
+      <attribute name='bundle-version' type='Version' value='0.0.4.201306141305'/>
+      <directive name='uses' value='org.osgi.framework'/>
     </capability>
-    <capability namespace='osgi.wiring.package'>
-      <attribute name='osgi.wiring.package' value='org.jclouds.javax.annotation'/>
-      <attribute name='version' type='Version' value='1.5.0.beta6'/>
-      <attribute name='bundle-symbolic-name' value='jclouds-core'/>
-      <attribute name='bundle-version' type='Version' value='1.5.0.beta_6'/>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=javax.security.auth.x500)'/>
+    </requirement>
+    <requirement namespace='osgi.wiring.package'>
+      <directive name='filter' value='(osgi.wiring.package=javax.xml.parsers)'/>
+    </requirement>

[... 15304 lines stripped ...]


Mime
View raw message