Author: bramk
Date: Fri Aug 16 08:18:43 2013
New Revision: 1514612
URL: http://svn.apache.org/r1514612
Log:
ACE-407 Updated to Felix HTTP service 2.2.1 SNAPSHOT r1514610
Added:
ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.1.jar
(with props)
Removed:
ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar
Modified:
ace/trunk/cnf/localrepo/index.xml
Modified: ace/trunk/cnf/localrepo/index.xml
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1514612&r1=1514611&r2=1514612&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Fri Aug 16 08:18:43 2013
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<repository increment='1376483716575' name='Local'
xmlns='http://www.osgi.org/xmlns/repository/v1.0.0'>
+<repository increment='1376638154797' 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'/>
@@ -2566,6 +2566,169 @@
</resource>
<resource>
<capability namespace='osgi.identity'>
+ <attribute name='osgi.identity' value='org.apache.felix.http.jetty'/>
+ <attribute name='type' value='osgi.bundle'/>
+ <attribute name='version' type='Version' value='2.2.1.SNAPSHOT'/>
+ </capability>
+ <capability namespace='osgi.content'>
+ <attribute name='osgi.content'
value='dbbf08ad2ee417eb647058e0dd6423aa09ed19da5a07ad34a105ec7cdc2b7755'/>
+ <attribute name='url'
value='org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.1.jar'/>
+ <attribute name='size' type='Long' value='1333670'/>
+ <attribute name='mime' value='application/vnd.osgi.bundle'/>
+ </capability>
+ <capability namespace='osgi.wiring.bundle'>
+ <attribute name='osgi.wiring.bundle'
value='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ </capability>
+ <capability namespace='osgi.wiring.host'>
+ <attribute name='osgi.wiring.host' value='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ </capability>
+ <capability namespace='osgi.wiring.package'>
+ <attribute name='osgi.wiring.package' value='org.apache.felix.http.api'/>
+ <attribute name='version' type='Version' value='2.0.4'/>
+ <attribute name='bundle-symbolic-name'
value='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ <directive name='uses' value='javax.servlet,org.osgi.service.http'/>
+ </capability>
+ <capability namespace='osgi.wiring.package'>
+ <attribute name='osgi.wiring.package' value='org.osgi.service.http'/>
+ <attribute name='version' type='Version' value='1.2.1'/>
+ <attribute name='bundle-symbolic-name'
value='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ <directive name='uses' value='javax.servlet.http,javax.servlet'/>
+ </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='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ </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='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ </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='org.apache.felix.http.jetty'/>
+ <attribute name='bundle-version' type='Version' value='2.2.1.SNAPSHOT'/>
+ <directive name='uses' value='javax.servlet'/>
+ </capability>
+ <capability namespace='osgi.service'>
+ <attribute name='objectClass' value='org.osgi.service.http.HttpService'/>
+ <directive name='uses'
value='org.osgi.service.http,javax.servlet,javax.servlet.http'/>
+ <directive name='effective' value='active'/>
+ </capability>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=javax.imageio)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=javax.management)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=javax.management.modelmbean)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=javax.management.remote)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=javax.naming)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=javax.net.ssl)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=javax.security.auth)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=javax.security.cert)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=javax.servlet)(version>=2.5.0)(!(version>=3.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=javax.servlet.http)(version>=2.5.0)(!(version>=3.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=javax.sql)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=javax.xml.parsers)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=org.apache.felix.http.api)(version>=2.0.0)(!(version>=3.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=org.ietf.jgss)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=org.mortbay.log)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=org.mortbay.util.ajax)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.framework)(version>=1.5.0)(!(version>=2.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.service.event)(version>=1.2.0)(!(version>=2.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.service.http)(version>=1.2.0)(!(version>=2.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.service.log)(version>=1.3.0)(!(version>=2.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.util.tracker)(version>=1.4.0)(!(version>=2.0.0)))'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=org.slf4j)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=org.slf4j.helpers)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=org.slf4j.spi)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter' value='(osgi.wiring.package=org.xml.sax)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ <requirement namespace='osgi.wiring.package'>
+ <directive name='filter'
value='(osgi.wiring.package=org.xml.sax.helpers)'/>
+ <directive name='resolution' value='optional'/>
+ </requirement>
+ </resource>
+ <resource>
+ <capability namespace='osgi.identity'>
<attribute name='osgi.identity' value='com.sun.jersey.jersey-core'/>
<attribute name='type' value='osgi.bundle'/>
<attribute name='version' type='Version' value='1.12.0'/>
@@ -4790,131 +4953,6 @@
</resource>
<resource>
<capability namespace='osgi.identity'>
- <attribute name='osgi.identity' value='org.apache.felix.http.jetty'/>
- <attribute name='type' value='osgi.bundle'/>
- <attribute name='version' type='Version' value='2.2.0'/>
- </capability>
- <capability namespace='osgi.content'>
- <attribute name='osgi.content'
value='200b06287951050faf436723eab9d7a5dc582fa98b99824319da8b9eebe70a0a'/>
- <attribute name='url'
value='org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar'/>
- <attribute name='size' type='Long' value='941716'/>
- <attribute name='mime' value='application/vnd.osgi.bundle'/>
- </capability>
- <capability namespace='osgi.wiring.bundle'>
- <attribute name='osgi.wiring.bundle'
value='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- </capability>
- <capability namespace='osgi.wiring.host'>
- <attribute name='osgi.wiring.host' value='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- </capability>
- <capability namespace='osgi.wiring.package'>
- <attribute name='osgi.wiring.package' value='org.apache.felix.http.api'/>
- <attribute name='version' type='Version' value='2.0.4'/>
- <attribute name='bundle-symbolic-name'
value='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- <directive name='uses' value='javax.servlet,org.osgi.service.http'/>
- </capability>
- <capability namespace='osgi.wiring.package'>
- <attribute name='osgi.wiring.package' value='org.osgi.service.http'/>
- <attribute name='version' type='Version' value='1.2.0'/>
- <attribute name='bundle-symbolic-name'
value='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- <directive name='uses' value='javax.servlet.http,javax.servlet'/>
- </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='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- </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='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- </capability>
- <capability namespace='osgi.wiring.package'>
- <attribute name='osgi.wiring.package'
value='javax.servlet.jsp.resources'/>
- <attribute name='version' type='Version' value='2.5.0'/>
- <attribute name='bundle-symbolic-name'
value='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- </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='org.apache.felix.http.jetty'/>
- <attribute name='bundle-version' type='Version' value='2.2.0'/>
- <directive name='uses' value='javax.servlet'/>
- </capability>
- <capability namespace='osgi.service'>
- <attribute name='objectClass' value='org.osgi.service.http.HttpService'/>
- <directive name='uses'
value='org.osgi.service.http,javax.servlet,javax.servlet.http'/>
- <directive name='effective' value='active'/>
- </capability>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter' value='(osgi.wiring.package=javax.net.ssl)'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(osgi.wiring.package=javax.security.cert)'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=javax.servlet)(version>=2.5.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=javax.servlet.http)(version>=2.5.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=javax.servlet.jsp.resources)(version>=2.5.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=javax.servlet.resources)(version>=2.5.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(osgi.wiring.package=javax.xml.parsers)'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=org.apache.felix.http.api)(version>=2.0.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.framework)(version>=1.3.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.service.http)(version>=1.2.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.service.log)(version>=1.3.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(&(osgi.wiring.package=org.osgi.util.tracker)(version>=1.3.0))'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter' value='(osgi.wiring.package=org.slf4j)'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter' value='(osgi.wiring.package=org.xml.sax)'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- <requirement namespace='osgi.wiring.package'>
- <directive name='filter'
value='(osgi.wiring.package=org.xml.sax.helpers)'/>
- <directive name='resolution' value='optional'/>
- </requirement>
- </resource>
- <resource>
- <capability namespace='osgi.identity'>
<attribute name='osgi.identity' value='bcprov'/>
<attribute name='type' value='osgi.bundle'/>
<attribute name='version' type='Version' value='1.46.0'/>
Added:
ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.1.jar
URL:
http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.1.jar?rev=1514612&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
