Author: marrs
Date: Sat Aug 4 18:44:32 2012
New Revision: 1369403
URL: http://svn.apache.org/viewvc?rev=1369403&view=rev
Log:
Added a new project containing an integration test for our REST client API.
Right now it only contains a simple test, but it can easily be expanded.
Added:
ace/sandbox/marrs/cnf/repo/com.sun.jersey.client/
ace/sandbox/marrs/cnf/repo/com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar
(with props)
ace/sandbox/marrs/cnf/repo/com.sun.jersey.core/
ace/sandbox/marrs/cnf/repo/com.sun.jersey.core/com.sun.jersey.core-1.13.0.jar
(with props)
ace/sandbox/marrs/org.apache.ace.client.rest.itest/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.classpath
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.project
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.settings/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.settings/org.eclipse.jdt.core.prefs
ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd
ace/sandbox/marrs/org.apache.ace.client.rest.itest/build.xml
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
ace/sandbox/marrs/org.apache.ace.client.rest.itest/test/
Modified:
ace/sandbox/marrs/cnf/ext/repositories.bnd
ace/sandbox/marrs/cnf/lib/repository.xml
ace/sandbox/marrs/cnf/repo/repository.xml
Modified: ace/sandbox/marrs/cnf/ext/repositories.bnd
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/ext/repositories.bnd?rev=1369403&r1=1369402&r2=1369403&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/ext/repositories.bnd (original)
+++ ace/sandbox/marrs/cnf/ext/repositories.bnd Sat Aug 4 18:44:32 2012
@@ -8,4 +8,3 @@ releaserepo: ${build}/releaserepo
org.osgi.impl.bundle.bindex.BundleAndLibraryIndexer;path:='${build}/bin/'
-releaserepo: Release
-
Modified: ace/sandbox/marrs/cnf/lib/repository.xml
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/lib/repository.xml?rev=1369403&r1=1369402&r2=1369403&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/lib/repository.xml (original)
+++ ace/sandbox/marrs/cnf/lib/repository.xml Sat Aug 4 18:44:32 2012
@@ -1,5 +1,6 @@
<repository>
<resource id='ant/1.8.4' symbolicname='ant' uri='ant/ant-1.8.4.jar'
version='1.8.4'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='ant'/><p n='version' t='version'
v='1.8.4'/></capability></resource>
+ <resource id='bcprov-jdk14/1.40' symbolicname='bcprov-jdk14'
uri='bcprov-jdk14/bcprov-jdk14-1.40.jar' version='1.40'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname'
v='bcprov-jdk14'/><p n='version' t='version' v='1.40'/></capability></resource>
<resource id='commons-codec/1.4' symbolicname='commons-codec'
uri='commons-codec/commons-codec-1.4.jar' version='1.4'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname'
v='commons-codec'/><p n='version' t='version' v='1.4'/></capability></resource>
<resource id='commons-collections/3.2.1' symbolicname='commons-collections'
uri='commons-collections/commons-collections-3.2.1.jar'
version='3.2.1'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='commons-collections'/><p n='version' t='version'
v='3.2.1'/></capability></resource>
<resource id='commons-io/2.0.1' symbolicname='commons-io'
uri='commons-io/commons-io-2.0.1.jar' version='2.0.1'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname'
v='commons-io'/><p n='version' t='version' v='2.0.1'/></capability></resource>
Added:
ace/sandbox/marrs/cnf/repo/com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/repo/com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar?rev=1369403&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ace/sandbox/marrs/cnf/repo/com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
ace/sandbox/marrs/cnf/repo/com.sun.jersey.core/com.sun.jersey.core-1.13.0.jar
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/repo/com.sun.jersey.core/com.sun.jersey.core-1.13.0.jar?rev=1369403&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
ace/sandbox/marrs/cnf/repo/com.sun.jersey.core/com.sun.jersey.core-1.13.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ace/sandbox/marrs/cnf/repo/repository.xml
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/repo/repository.xml?rev=1369403&r1=1369402&r2=1369403&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/repo/repository.xml (original)
+++ ace/sandbox/marrs/cnf/repo/repository.xml Sat Aug 4 18:44:32 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml-stylesheet type='text/xsl' href='http://www.osgi.org/www/obr2html.xsl'?>
-<repository lastmodified='20120717154205.850' name='Local Repository'>
+<repository lastmodified='20120804183628.749' name='Local Repository'>
<resource id='bcprov/1.46.0' presentationname='bcprov' symbolicname='bcprov'
uri='bcprov/bcprov-1.46.0.jar' version='1.46.0'>
<size>
1878175
@@ -603,6 +603,330 @@
Execution Environment (|(ee=J2SE-1.5))
</require>
</resource>
+ <resource id='com.sun.jersey.client/1.13.0' presentationname='jersey-client'
symbolicname='com.sun.jersey.client'
uri='com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar' version='1.13.0'>
+ <description>
+ Jersey is the open source (under dual CDDL+GPL license) JAX-RS
+ (JSR 311) production quality Reference Implementation
+ for building RESTful Web services.
+ </description>
+ <size>
+ 131269
+ </size>
+ <license>
+ http://glassfish.java.net/public/CDDL+GPL_1_1.html,
http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ </license>
+ <documentation>
+ http://www.oracle.com/
+ </documentation>
+ <capability name='bundle'>
+ <p n='manifestversion' v='2'/>
+ <p n='presentationname' v='jersey-client'/>
+ <p n='symbolicname' v='com.sun.jersey.client'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.client.filter'/>
+ <p n='uses'
v='com.sun.jersey.api.client,com.sun.jersey.core.util,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.client.async'/>
+ <p n='uses' v='com.sun.jersey.api.client'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.client.config'/>
+ <p n='uses' v='com.sun.jersey.core.util'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.client'/>
+ <p n='uses'
v='com.sun.jersey.api.client.async,javax.ws.rs.core,com.sun.jersey.client.impl,com.sun.jersey.api.client.filter,com.sun.jersey.client.proxy,com.sun.jersey.client.impl.async,com.sun.jersey.api.client.config,com.sun.jersey.core.spi.component.ioc,com.sun.jersey.spi.inject,com.sun.jersey.core.util,com.sun.jersey.core.spi.factory,javax.ws.rs.ext,com.sun.jersey.core.spi.component,com.sun.jersey.client.urlconnection,com.sun.jersey.spi,com.sun.jersey.spi.service,com.sun.jersey.core.provider,com.sun.jersey.core.header,com.sun.jersey.core.reflection'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.client.urlconnection'/>
+ <p n='uses'
v='javax.net.ssl,com.sun.jersey.api.client,javax.ws.rs.core,com.sun.jersey.core.header,com.sun.jersey.spi'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.client.osgi'/>
+ <p n='uses' v='com.sun.ws.rs.ext,org.osgi.framework,javax.ws.rs.ext'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.client.impl.async'/>
+ <p n='uses'
v='com.sun.jersey.api.client.async,com.sun.jersey.api.client'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.client.proxy'/>
+ <p n='uses'
v='com.sun.jersey.api.client.async,com.sun.jersey.api.client'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.client.impl'/>
+ <p n='uses'
v='com.sun.jersey.core.header,com.sun.jersey.api.client,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.ws.rs.ext'/>
+ <p n='uses' v='com.sun.jersey.core.spi.factory,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.header)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.header ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.provider)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.provider ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.reflection)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.reflection ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.spi.component)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.spi.component ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.spi.component.ioc)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.spi.component.ioc
;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.spi.factory)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.spi.factory ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.core.util)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.core.util ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.spi)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.spi ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.spi.inject)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.spi.inject ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=com.sun.jersey.spi.service)(version>=1.13.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package com.sun.jersey.spi.service ;version=[1.13.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=javax.net.ssl)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.net.ssl
+ </require>
+ <require extend='false'
filter='(&(package=javax.ws.rs.core)(version>=1.1.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package javax.ws.rs.core ;version=[1.1.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=javax.ws.rs.ext)(version>=1.1.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package javax.ws.rs.ext ;version=[1.1.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=org.osgi.framework)(version>=1.3.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package org.osgi.framework ;version=[1.3.0,2.0.0)
+ </require>
+ </resource>
+ <resource id='com.sun.jersey.core/1.13.0' presentationname='jersey-core'
symbolicname='com.sun.jersey.core'
uri='com.sun.jersey.core/com.sun.jersey.core-1.13.0.jar' version='1.13.0'>
+ <description>
+ Jersey is the open source (under dual CDDL+GPL license) JAX-RS
+ (JSR 311) production quality Reference Implementation
+ for building RESTful Web services.
+ </description>
+ <size>
+ 465649
+ </size>
+ <license>
+ http://glassfish.java.net/public/CDDL+GPL_1_1.html,
http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ </license>
+ <documentation>
+ http://www.oracle.com/
+ </documentation>
+ <capability name='bundle'>
+ <p n='manifestversion' v='2'/>
+ <p n='presentationname' v='jersey-core'/>
+ <p n='symbolicname' v='com.sun.jersey.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='javax.ws.rs'/>
+ <p n='uses' v='javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.1.1'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='javax.ws.rs.core'/>
+ <p n='uses' v='javax.ws.rs.ext,javax.ws.rs'/>
+ <p n='version' t='version' v='1.1.1'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='javax.ws.rs.ext'/>
+ <p n='uses' v='javax.ws.rs.core,javax.ws.rs'/>
+ <p n='version' t='version' v='1.1.1'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.provider.jaxb'/>
+ <p n='uses'
v='javax.ws.rs,javax.ws.rs.ext,javax.xml.bind,javax.ws.rs.core,javax.xml.parsers,com.sun.jersey.core.util,com.sun.jersey.core.provider,org.xml.sax,com.sun.jersey.api.provider.jaxb,javax.xml.transform.sax,javax.xml.bind.annotation,com.sun.jersey.core.impl.provider.entity,javax.xml.stream,javax.xml.transform,javax.xml.transform.stream'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.impl.provider.header'/>
+ <p n='uses'
v='com.sun.jersey.core.header.reader,com.sun.jersey.spi,javax.ws.rs.core,com.sun.jersey.core.header'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.impl'/>
+ <p n='uses' v='com.sun.jersey.localization'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.util'/>
+ <p n='uses' v='com.sun.jersey.impl,javax.ws.rs.core,javax.xml.parsers'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.provider'/>
+ <p n='uses'
v='com.sun.jersey.core.util,javax.ws.rs.ext,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.spi.scanning'/>
+ <p n='uses'
v='com.sun.jersey.core.util,com.sun.jersey.core.spi.scanning.uri,com.sun.jersey.spi.service,com.sun.jersey.core.reflection,com.sun.jersey.api.uri'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.provider.jaxb'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.header'/>
+ <p n='uses'
v='com.sun.jersey.core.header.reader,javax.ws.rs.core,com.sun.jersey.core.util,com.sun.jersey.core.impl.provider.header,javax.ws.rs'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.impl.provider.xml'/>
+ <p n='uses'
v='javax.xml.parsers,com.sun.jersey.core.util,javax.ws.rs.core,com.sun.jersey.core.spi.component,com.sun.jersey.spi.inject,org.xml.sax,javax.xml.validation,org.xml.sax.helpers,com.sun.jersey.impl,javax.xml.transform,javax.xml.stream'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.header.reader'/>
+ <p n='uses'
v='javax.ws.rs.core,com.sun.jersey.core.header,com.sun.jersey.core.impl.provider.header'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.osgi'/>
+ <p n='uses'
v='com.sun.jersey.core.spi.scanning,org.osgi.framework,com.sun.jersey.core.spi.scanning.uri,com.sun.jersey.impl,com.sun.jersey.spi.service'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.spi'/>
+ <p n='uses' v='javax.ws.rs.ext,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.spi.inject'/>
+ <p n='uses' v='com.sun.jersey.core.spi.component'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.localization'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.spi.scanning.uri'/>
+ <p n='uses'
v='com.sun.jersey.core.spi.scanning,com.sun.jersey.core.util,com.sun.jersey.api.uri,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.spi.component'/>
+ <p n='uses'
v='com.sun.jersey.spi.inject,com.sun.jersey.core.reflection,javax.ws.rs,com.sun.jersey.core.spi.factory,com.sun.jersey.spi.service'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.spi.factory'/>
+ <p n='uses'
v='com.sun.jersey.spi,com.sun.jersey.spi.service,javax.ws.rs.ext,com.sun.jersey.api.uri,javax.ws.rs.core,com.sun.jersey.core.spi.component,com.sun.jersey.spi.inject,javax.ws.rs,com.sun.jersey.core.header,com.sun.jersey.core.util,com.sun.jersey.core.reflection'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.spi.component.ioc'/>
+ <p n='uses'
v='com.sun.jersey.core.spi.component,com.sun.jersey.spi.inject'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.representation'/>
+ <p n='uses' v='com.sun.jersey.core.util'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.reflection'/>
+ <p n='uses' v='javax.ws.rs,javax.ws.rs.core,com.sun.jersey.impl'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.core.impl.provider.entity'/>
+ <p n='uses'
v='javax.ws.rs,com.sun.jersey.core.util,com.sun.jersey.core.provider,javax.ws.rs.core,javax.activation,javax.xml.parsers,javax.xml.transform.dom,org.w3c.dom,org.xml.sax,javax.xml.transform,javax.xml.transform.stream,com.sun.jersey.spi.inject,com.sun.jersey.spi,javax.ws.rs.ext,com.sun.jersey.api.representation,javax.mail.internet,javax.mail.util,javax.mail,javax.imageio.stream,javax.imageio.spi,javax.imageio,javax.xml.transform.sax,com.sun.jersey.core.provider.jaxb,javax.xml.bind,javax.xml.stream,javax.xml.bind.annotation,com.sun.jersey.impl'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.spi.service'/>
+ <p n='uses' v='com.sun.jersey.impl,com.sun.jersey.core.reflection'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <capability name='package'>
+ <p n='package' v='com.sun.jersey.api.uri'/>
+ <p n='uses' v='javax.ws.rs,com.sun.jersey.core.util,javax.ws.rs.core'/>
+ <p n='version' t='version' v='1.13.0'/>
+ </capability>
+ <require extend='false'
filter='(&(package=javax.activation)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.activation
+ </require>
+ <require extend='false'
filter='(&(package=javax.imageio)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.imageio
+ </require>
+ <require extend='false'
filter='(&(package=javax.imageio.spi)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.imageio.spi
+ </require>
+ <require extend='false'
filter='(&(package=javax.imageio.stream)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.imageio.stream
+ </require>
+ <require extend='false'
filter='(&(package=javax.mail)(version>=0.0.0))' multiple='false'
name='package' optional='true'>
+ Import package javax.mail
+ </require>
+ <require extend='false'
filter='(&(package=javax.mail.internet)(version>=0.0.0))'
multiple='false' name='package' optional='true'>
+ Import package javax.mail.internet
+ </require>
+ <require extend='false'
filter='(&(package=javax.mail.util)(version>=0.0.0))' multiple='false'
name='package' optional='true'>
+ Import package javax.mail.util
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.bind)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.xml.bind
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.bind.annotation)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.xml.bind.annotation
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.parsers)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.xml.parsers
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.stream)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package javax.xml.stream
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.transform)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.transform.dom)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform.dom
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.transform.sax)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform.sax
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.transform.stream)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.xml.transform.stream
+ </require>
+ <require extend='false'
filter='(&(package=javax.xml.validation)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package javax.xml.validation
+ </require>
+ <require extend='false'
filter='(&(package=org.osgi.framework)(version>=1.3.0)(!(version>=2.0.0)))'
multiple='false' name='package' optional='false'>
+ Import package org.osgi.framework ;version=[1.3.0,2.0.0)
+ </require>
+ <require extend='false'
filter='(&(package=org.w3c.dom)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package org.w3c.dom
+ </require>
+ <require extend='false'
filter='(&(package=org.xml.sax)(version>=0.0.0))' multiple='false'
name='package' optional='false'>
+ Import package org.xml.sax
+ </require>
+ <require extend='false'
filter='(&(package=org.xml.sax.helpers)(version>=0.0.0))'
multiple='false' name='package' optional='false'>
+ Import package org.xml.sax.helpers
+ </require>
+ </resource>
<resource id='com.vaadin/6.5.1' presentationname='Vaadin'
symbolicname='com.vaadin' uri='com.vaadin/com.vaadin-6.5.1.jar' version='6.5.1'>
<size>
4070164
Added: ace/sandbox/marrs/org.apache.ace.client.rest.itest/.classpath
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/.classpath?rev=1369403&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest.itest/.classpath (added)
+++ ace/sandbox/marrs/org.apache.ace.client.rest.itest/.classpath Sat Aug 4
18:44:32 2012
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ace/sandbox/marrs/org.apache.ace.client.rest.itest/.project
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/.project?rev=1369403&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest.itest/.project (added)
+++ ace/sandbox/marrs/org.apache.ace.client.rest.itest/.project Sat Aug 4
18:44:32 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.apache.ace.client.rest.itest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>bndtools.core.bndbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>bndtools.core.bndnature</nature>
+ </natures>
+</projectDescription>
Added:
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/.settings/org.eclipse.jdt.core.prefs?rev=1369403&view=auto
==============================================================================
---
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.settings/org.eclipse.jdt.core.prefs
(added)
+++
ace/sandbox/marrs/org.apache.ace.client.rest.itest/.settings/org.eclipse.jdt.core.prefs
Sat Aug 4 18:44:32 2012
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd?rev=1369403&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd (added)
+++ ace/sandbox/marrs/org.apache.ace.client.rest.itest/bnd.bnd Sat Aug 4
18:44:32 2012
@@ -0,0 +1,73 @@
+Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
+-buildpath: junit.osgi,\
+ osgi.core,\
+ osgi.cmpn,\
+ org.apache.felix.dependencymanager,\
+ org.apache.ace.test;version=latest,\
+ org.apache.ace.log;version=latest,\
+ org.apache.ace.httplistener;version=latest,\
+ org.apache.ace.discovery.api;version=latest,\
+ org.apache.ace.discovery.property;version=latest,\
+ org.apache.ace.identification.api;version=latest,\
+ org.apache.ace.identification.property;version=latest,\
+ org.apache.ace.server.log.store;version=latest,\
+ javax.servlet,\
+ org.apache.ace.scheduler.api;version=latest,\
+ org.apache.ace.deployment.servlet;version=latest,\
+ org.apache.ace.deployment.provider.filebased;version=latest,\
+ org.apache.ace.obr.storage;version=latest,\
+ org.apache.ace.repository.api;version=latest,\
+ org.apache.ace.repository.impl;version=latest,\
+ com.sun.jersey.client,\
+ com.sun.jersey.core
+-runfw: org.apache.felix.framework;version='[4,5)'
+-runbundles: org.apache.ace.test;version=latest,\
+ org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
+ org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
+ org.apache.ace.httplistener;version=latest,\
+ osgi.cmpn;version='[4.2.1,4.2.2)',\
+ org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
+ org.apache.felix.http.jetty,\
+ org.apache.felix.shell,\
+ org.apache.felix.shell.tui,\
+ org.apache.felix.dependencymanager.shell,\
+ org.apache.felix.deploymentadmin,\
+ org.apache.ace.authentication.api;version=latest,\
+ org.apache.ace.connectionfactory;version=latest,\
+ org.apache.ace.scheduler;version=latest,\
+ org.apache.ace.scheduler.api;version=latest,\
+ org.apache.ace.deployment.provider.api;version=latest,\
+ org.apache.ace.discovery.api;version=latest,\
+ org.apache.ace.discovery.property;version=latest,\
+ org.apache.ace.identification.api;version=latest,\
+ org.apache.ace.identification.property;version=latest,\
+ org.apache.ace.deployment.api;version=latest,\
+ org.apache.ace.deployment.deploymentadmin;version=latest,\
+ org.apache.ace.deployment.servlet;version=latest,\
+ org.apache.ace.deployment.task;version=latest,\
+ org.apache.ace.deployment.task.base;version=latest,\
+ org.apache.ace.deployment.streamgenerator;version=latest,\
+ org.apache.ace.deployment.provider.base;version=latest,\
+ org.apache.felix.prefs,\
+ org.apache.felix.useradmin;version='[0.9.9,1.0.0)',\
+ org.apache.felix.log;version='[1.0.1,1.0.2)',\
+ org.apache.ace.range.api;version=latest,\
+ org.apache.ace.log;version=latest,\
+ org.apache.ace.server.log.store;version=latest,\
+ org.apache.ace.repository.api;version=latest,\
+ org.apache.ace.repository.impl;version=latest,\
+ org.apache.ace.repository.servlet;version=latest,\
+ org.apache.ace.configurator.serveruseradmin;version=latest,\
+ org.apache.ace.obr.metadata;version=latest,\
+ org.apache.ace.obr.servlet;version=latest,\
+ org.apache.ace.obr.storage;version=latest,\
+ org.apache.ace.client.repository.api;version=latest,\
+ org.apache.ace.client.repository.helper.base;version=latest,\
+ org.apache.ace.client.repository.helper.bundle;version=latest,\
+ org.apache.ace.client.repository.helper.configuration;version=latest,\
+ org.apache.ace.client.repository.impl;version=latest,\
+ org.apache.ace.client.rest;version=latest,\
+ com.sun.jersey.client,\
+ com.sun.jersey.core,\
+ org.apache.ace.deployment.provider.repositorybased;version=latest
+Private-Package: org.apache.ace.client.rest.itest
Added: ace/sandbox/marrs/org.apache.ace.client.rest.itest/build.xml
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/build.xml?rev=1369403&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest.itest/build.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.client.rest.itest/build.xml Sat Aug 4
18:44:32 2012
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build">
+ <import file="../cnf/build.xml"/>
+</project>
Added:
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
URL:
http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java?rev=1369403&view=auto
==============================================================================
---
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
(added)
+++
ace/sandbox/marrs/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
Sat Aug 4 18:44:32 2012
@@ -0,0 +1,139 @@
+package org.apache.ace.client.rest.itest;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.apache.ace.http.listener.constants.HttpConstants;
+import org.apache.ace.it.IntegrationTestBase;
+import org.apache.felix.dm.Component;
+import org.osgi.service.useradmin.Role;
+import org.osgi.service.useradmin.User;
+import org.osgi.service.useradmin.UserAdmin;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.ClientConfig;
+
+public class RESTClientTest extends IntegrationTestBase {
+ private volatile UserAdmin m_user;
+
+ @Override
+ protected Component[] getDependencies() {
+ return new Component[] {
+
createComponent().setImplementation(this).add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
+ };
+ }
+
+ /**
+ * Creates a new workspace, ensures it works correctly by asking for a
list of entity types, then
+ * deletes the workspace again and ensures it's no longer available.
+ */
+ public void testCreateAndDestroyRESTSession() throws Exception {
+ configureServer();
+ createServerUser();
+
+ Client c = Client.create();
+ c.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, false);
+ WebResource r = c.resource("http://localhost:8080/client/work";);
+ try {
+ r.post(String.class, "");
+ fail("We should have been redirected to a new workspace.");
+ }
+ catch (UniformInterfaceException e) {
+ ClientResponse response = e.getResponse();
+ URI location = response.getLocation();
+ assertEquals("http://localhost:8080/client/work/rest-1";,
location.toString());
+ WebResource r2 = c.resource(location);
+ r2.get(String.class);
+ r2.delete();
+ try {
+ r2.get(String.class);
+ }
+ catch (UniformInterfaceException e2) {
+ assertEquals(404, e2.getResponse().getStatus());
+ }
+ }
+ }
+
+ private void configureServer() throws IOException {
+ configure("org.apache.ace.client.rest",
+ "org.apache.ace.server.servlet.endpoint", "/client",
+ "authentication.enabled", "false");
+
+ configure("org.apache.ace.deployment.servlet",
+ "org.apache.ace.server.servlet.endpoint", "/deployment",
+ "authentication.enabled", "false");
+
+ configure("org.apache.ace.repository.servlet.RepositoryServlet",
+ "org.apache.ace.server.servlet.endpoint", "/repository",
+ "authentication.enabled", "false");
+
+ configure("org.apache.ace.obr.servlet",
+ "org.apache.ace.server.servlet.endpoint", "/obr",
+ "authentication.enabled", "false");
+
+ configure("org.apache.ace.obr.storage.file",
+ "fileLocation", "store");
+
+ configure("org.apache.ace.deployment.provider.repositorybased",
+ "url", "http://localhost:8080/repository";,
+ "name", "deployment",
+ "customer", "apache");
+
+ configure("org.apache.ace.discovery.property",
+ "serverURL", "http://localhost:8080";);
+
+ configure("org.apache.ace.identification.property",
+ "targetID", "target-test");
+
+ configureFactory("org.apache.ace.server.log.servlet.factory",
+ "name", "auditlog",
+ HttpConstants.ENDPOINT, "/auditlog",
+ "authentication.enabled", "false");
+
+ configureFactory("org.apache.ace.server.log.store.factory",
+ "name", "auditlog");
+
+ configureFactory("org.apache.ace.server.repository.factory",
+ "name", "user",
+ "customer", "apache",
+ "master", "true"
+ );
+
+ configureFactory("org.apache.ace.server.repository.factory",
+ "name", "shop",
+ "customer", "apache",
+ "master", "true");
+
+ configureFactory("org.apache.ace.server.repository.factory",
+ "name", "deployment",
+ "customer", "apache",
+ "master", "true");
+
+ configureFactory("org.apache.ace.server.repository.factory",
+ "name", "target",
+ "customer", "apache",
+ "master", "true");
+
+ configureFactory("org.apache.ace.server.repository.factory",
+ "name", "users",
+ "customer", "apache",
+ "master", "true");
+
+
configure("org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask",
+ "repositoryLocation", "http://localhost:8080/repository";,
+ "repositoryCustomer", "apache",
+ "repositoryName", "user");
+ }
+ private void createServerUser() {
+ User user = (User) m_user.createRole("d", Role.USER);
+ user.getProperties().put("username", "d");
+ user.getCredentials().put("password", "f");
+ }
+
+ public static void main(String[] args) throws Exception {
+ new RESTClientTest().testCreateAndDestroyRESTSession();
+ }
+}
