ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1727600 [1/2] - in /ace/trunk: build/ build/resources/deps/ build/resources/src/ cnf/localrepo/ cnf/localrepo/com.sun.jersey.client/ cnf/localrepo/com.sun.jersey.core/ cnf/localrepo/com.sun.jersey.jersey-core/ cnf/localrepo/slf4j.api/ cnf/...
Date Fri, 29 Jan 2016 15:40:00 GMT
Author: jawi
Date: Fri Jan 29 15:39:59 2016
New Revision: 1727600

URL: http://svn.apache.org/viewvc?rev=1727600&view=rev
Log:
Preparing for the next release:

- removed the undesired dependency on Jersey client (CDDL+GPL);
- removed the no longer needed Slf4j JARs;
- implemented a very simple REST client that has more or less the same API as
  the Jersey client.


Added:
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/Client.java   (with props)
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResource.java   (with props)
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResourceException.java   (with props)
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResponse.java   (with props)
Removed:
    ace/trunk/cnf/localrepo/com.sun.jersey.client/
    ace/trunk/cnf/localrepo/com.sun.jersey.core/
    ace/trunk/cnf/localrepo/com.sun.jersey.jersey-core/
    ace/trunk/cnf/localrepo/slf4j.api/
    ace/trunk/cnf/localrepo/slf4j.simple/
Modified:
    ace/trunk/build/build.gradle
    ace/trunk/build/resources/deps/NOTICE
    ace/trunk/build/resources/src/NOTICE
    ace/trunk/build/resources/src/README
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/cnf/localrepo/index.xml.sha
    ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/ClientRestUtils.java
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
    ace/trunk/org.apache.ace.client.rest/src/org/apache/ace/client/rest/RESTClientServlet.java

Modified: ace/trunk/build/build.gradle
URL: http://svn.apache.org/viewvc/ace/trunk/build/build.gradle?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/build/build.gradle (original)
+++ ace/trunk/build/build.gradle Fri Jan 29 15:39:59 2016
@@ -84,6 +84,10 @@ task stageSrc(type: Zip) {
 	destinationDir = file('staging')
     
     with([
+	    // LICENSE, NOTICE, README
+	    copySpec {
+	    	from 'resources/src'
+	    },
     	copySpec { 
     		from '..'
 	    	include('*/.project',
@@ -116,19 +120,17 @@ task stageDeps(type: Zip) {
 	    copySpec {
 	    	from 'resources/deps'
 	    },
-	    // cnf
 		copySpec {
 			from '..'
-			into 'cnf'
 			include('cnf/buildrepo/**', 
 					'cnf/localrepo/**', 
 					'cnf/releaserepo/**', 
 					'cnf/lib/**', 
 					'cnf/plugins/**',
 					'cnf/gradle/*.jar',
+					'gradle/**',
 					'gradlew',
-					'gradlew.bat',
-					'gradle/*')
+					'gradlew.bat')
 		}
 	] as CopySpec[]);
 	into "${archivesBaseName}-${version}-src"	 

Modified: ace/trunk/build/resources/deps/NOTICE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/deps/NOTICE?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/build/resources/deps/NOTICE (original)
+++ ace/trunk/build/resources/deps/NOTICE Fri Jan 29 15:39:59 2016
@@ -1,5 +1,5 @@
 Apache ACE
-Copyright 2011-2013 The Apache Software Foundation
+Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -11,10 +11,6 @@ Copyright: (c) OSGi Alliance (2000, 2010
 Copyright (c) 2000 Gatespace AB. All Rights Reserved.
 Licensed under the Apache License 2.0.
 
-This product includes software developed at OPS4J 
-(http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
 This product includes software developed at
 Mortbay (http://mortbay.org)
 Licensed under the Apache License 2.0.
@@ -40,11 +36,6 @@ Testng (http://www.testng.org)
 Licensed under Apache License 2.0
 
 This product includes software developed at
-Jclouds, Inc. (http://www.jclouds.org/).
-Copyright 2009-2012 jclouds, Inc.
-Licensed under Apache License 2.0
-
-This product includes software developed at
 'GSON' (https://code.google.com/p/google-gson/).
 License under Apache License 2.0
 
@@ -74,13 +65,9 @@ Copyright (c) 2007 Mockito contributors
 Licensed under MIT License
 
 This product includes software developed at
-Aopaliance (http://aopalliance.sourceforge.net/)
-Licensed under 'Public Domain'
-
-This product includes software developed at
 The Legion Of The Bouncy Castle
 (http://www.bouncycastle.org)
-Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+Copyright (C) 2013 Legion of the Bouncy Castle Inc.
 Licensed under Bouncy Castle License
 
 This product includes software developed at
@@ -89,23 +76,6 @@ Copyright (c) 2003-2006, Joe Walnes
 Copyright (c) 2006-2007, XStream Committers
 License under Xstream License
 
-This product includes software developed at
-JCraft (http://www.jcraft.com/).
-Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc. 
-Licensed under jCraft License
-	
-
-=========================================================================
-==  Apache Ant Notice (v1.8.4)                                         ==
-=========================================================================
-
-   Apache Ant
-   Copyright 1999-2012 The Apache Software Foundation
-
-   The <sync> task is based on code Copyright (c) 2002, Landmark
-   Graphics Corp that has been kindly donated to the Apache Software
-   Foundation.
-
 
 =========================================================================
 ==  Apache Commons Codec (v1.4)                                        ==
@@ -120,17 +90,6 @@ provided this notice is preserved.
 
 
 =========================================================================
-==  Apache Commons Logging (v1.1.1)                                    ==
-=========================================================================
-
-
-This product includes/uses software(s) developed by 'an unknown organization'
-  - Unnamed - avalon-framework:avalon-framework:jar:4.1.3
-  - Unnamed - log4j:log4j:jar:1.2.12
-  - Unnamed - logkit:logkit:jar:1.0.1
-
-
-=========================================================================
 ==  Apache Commons Codec (v1.4)                                        ==
 =========================================================================
 
@@ -159,52 +118,6 @@ This product includes/uses software(s) d
 
 
 =========================================================================
-==  JClouds (v1.5.0)                                                   ==
-=========================================================================
-
-This product includes Common Annotations (JSR 250, https://jsr250.dev.java.net/)
-distributed under the CDDL Version 1.0 license.
-
-This product includes Jersey (https://jersey.dev.java.net/)
-distributed under the CDDL Version 1.0 license.
-
-This product includes net.oauth.core 
-distributed under the Apache Software License, Version 2.0.
-
-This product includes Gson (http://code.google.com/p/google-gson)
-distributed under the Apache Software License, Version 2.0.
-
-This product includes Guice (http://code.google.com/p/google-guice)
-distributed under the Apache Software License, Version 2.0.
-
-This product includes Guava (http://code.google.com/p/guava-libraries)
-distributed under the Apache Software License, Version 2.0.
-
-org.jclouds.util.Suppliers2 and Suppliers2Test contain pieces of Guava's Suppliers
-distributed under the Apache Software License, Version 2.0.
-(c) 2010 Google Inc.
-
-This product includes BouncyCastle (http://www.bouncycastle.org/licence.html)
-distributed with the following notice:
-  "Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
-
-This product includes findbugs jsr305 (http://code.google.com/p/findbugs)
-distributed under the GNU Lesser GPL License, Version 3.0.
-
-This product includes aopalliance (http://aopalliance.sourceforge.net/)
-distributed in the Public Domain
-
-This product includes software developed at Hewlett-Packard
-Copyright (c) 2011-2012 Hewlett-Packard Development Company, L.P
-
-
-=========================================================================
 ==  Mockito (v1.5.0)                                                   ==
 =========================================================================
 

Modified: ace/trunk/build/resources/src/NOTICE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/src/NOTICE?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/build/resources/src/NOTICE (original)
+++ ace/trunk/build/resources/src/NOTICE Fri Jan 29 15:39:59 2016
@@ -1,5 +1,5 @@
 Apache ACE
-Copyright 2011-2013 The Apache Software Foundation
+Copyright 2011-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: ace/trunk/build/resources/src/README
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/src/README?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/build/resources/src/README (original)
+++ ace/trunk/build/resources/src/README Fri Jan 29 15:39:59 2016
@@ -41,11 +41,8 @@ both:
 2)  Make sure that your JAVA_HOME environment variable is set to the newly
     installed JDK location, and that your PATH includes
     %JAVA_HOME%\bin (windows) or $JAVA_HOME/bin (unix).
-
-3)  Install Apache Ant 1.8 (or later), which can be downloaded from:
-    http://ant.apache.org/bindownload.cgi
     
-4)  Install the latest version of Eclipse with the following plugins:
+3)  Install the latest version of Eclipse with the following plugins:
     * Subclipse;
     * BndTools;
     * TestNG.
@@ -55,11 +52,12 @@ Building
 
 From the command line:
 
-1)  Go into the build directory and invoke Ant:
-    $ ant
+1)  Go into the source root directory and invoke the Gradle wrapper:
+    $ ./gradlew build
 
-2)  To generate a binary package, you can optionally invoke:
-    $ ant -f bin-build.xml package
+2)  To generate the various binaries, you can optionally invoke:
+    $ ./gradlew runbundles
+    The binaries can be found in the `run-*/generated/executables/`.
 
 Within Eclipse:
 

Modified: ace/trunk/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Fri Jan 29 15:39:59 2016
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<repository increment="1453997711000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1454072349000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="bcpkix"/>
@@ -1923,730 +1923,6 @@
   </resource>
   <resource>
     <capability namespace="osgi.identity">
-      <attribute name="osgi.identity" value="com.sun.jersey.client"/>
-      <attribute name="type" value="osgi.bundle"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.content">
-      <attribute name="osgi.content" value="2cb5b9f4a132ab54c0a10a89ad62d601d19eb1216b62184e923657923ceb175d"/>
-      <attribute name="url" value="com.sun.jersey.client/com.sun.jersey.client-1.13.0.jar"/>
-      <attribute name="size" type="Long" value="131269"/>
-      <attribute name="mime" value="application/vnd.osgi.bundle"/>
-    </capability>
-    <capability namespace="osgi.wiring.bundle">
-      <attribute name="osgi.wiring.bundle" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.host">
-      <attribute name="osgi.wiring.host" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.client.filter"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.api.client,com.sun.jersey.core.util,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.client.async"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.api.client"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.client.config"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.util"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.client"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.api.client.async,javax.ws.rs.core,com.sun.jersey.client.impl,com.sun.jersey.api.client.filter,com.sun.jersey.client.proxy,com.sun.jersey.client.impl.async,com.sun.jersey.api.client.config,com.sun.jersey.core.spi.component.ioc,com.sun.jersey.spi.inject,com.sun.jersey.core.util,com.sun.jersey.core.spi.factory,javax.ws.rs.ext,com.sun.jersey.core.spi.component,com.sun.jersey.client.urlconnection,com.sun.jersey.spi,com.sun.jersey.spi.service,com.sun.jersey.core.provider,com.sun.jersey.core.header,com.sun.jersey.core.reflection"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.client.urlconnection"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.net.ssl,com.sun.jersey.api.client,javax.ws.rs.core,com.sun.jersey.core.header,com.sun.jersey.spi"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.client.osgi"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.ws.rs.ext,org.osgi.framework,javax.ws.rs.ext"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.client.impl.async"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.api.client.async,com.sun.jersey.api.client"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.client.proxy"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.api.client.async,com.sun.jersey.api.client"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.client.impl"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.header,com.sun.jersey.api.client,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.ws.rs.ext"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.client"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.factory,javax.ws.rs.core"/>
-    </capability>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.header)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.provider)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.reflection)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.spi.component)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.spi.component.ioc)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.spi.factory)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.core.util)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.spi)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.spi.inject)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=com.sun.jersey.spi.service)(version&gt;=1.13.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.net.ssl)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=javax.ws.rs.core)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=javax.ws.rs.ext)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))"/>
-    </requirement>
-  </resource>
-  <resource>
-    <capability namespace="osgi.identity">
-      <attribute name="osgi.identity" value="com.sun.jersey.core"/>
-      <attribute name="type" value="osgi.bundle"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.content">
-      <attribute name="osgi.content" value="428d6f9c69eab45f416146a6a1acc154fb02098154067db5281214a96fb3ecab"/>
-      <attribute name="url" value="com.sun.jersey.core/com.sun.jersey.core-1.13.0.jar"/>
-      <attribute name="size" type="Long" value="465649"/>
-      <attribute name="mime" value="application/vnd.osgi.bundle"/>
-    </capability>
-    <capability namespace="osgi.wiring.bundle">
-      <attribute name="osgi.wiring.bundle" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.host">
-      <attribute name="osgi.wiring.host" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="javax.ws.rs"/>
-      <attribute name="version" type="Version" value="1.1.1"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="javax.ws.rs.core"/>
-      <attribute name="version" type="Version" value="1.1.1"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs.ext,javax.ws.rs"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="javax.ws.rs.ext"/>
-      <attribute name="version" type="Version" value="1.1.1"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs.core,javax.ws.rs"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.provider.jaxb"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.impl.provider.header"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.header.reader,com.sun.jersey.spi,javax.ws.rs.core,com.sun.jersey.core.header"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.impl"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.localization"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.util"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.impl,javax.ws.rs.core,javax.xml.parsers"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.provider"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.util,javax.ws.rs.ext,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.scanning"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.provider.jaxb"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.header"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.impl.provider.xml"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.header.reader"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs.core,com.sun.jersey.core.header,com.sun.jersey.core.impl.provider.header"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.osgi"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.spi"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs.ext,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.spi.inject"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.component"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.localization"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.scanning.uri"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.scanning,com.sun.jersey.core.util,com.sun.jersey.api.uri,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.component"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.spi.inject,com.sun.jersey.core.reflection,javax.ws.rs,com.sun.jersey.core.spi.factory,com.sun.jersey.spi.service"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.factory"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.component.ioc"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.component,com.sun.jersey.spi.inject"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.representation"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.core.util"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.reflection"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs,javax.ws.rs.core,com.sun.jersey.impl"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.impl.provider.entity"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="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"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.spi.service"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="com.sun.jersey.impl,com.sun.jersey.core.reflection"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.uri"/>
-      <attribute name="version" type="Version" value="1.13.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.core"/>
-      <attribute name="bundle-version" type="Version" value="1.13.0"/>
-      <directive name="uses" value="javax.ws.rs,com.sun.jersey.core.util,javax.ws.rs.core"/>
-    </capability>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.activation)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.imageio)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.imageio.spi)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.imageio.stream)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.mail)"/>
-      <directive name="resolution" value="optional"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.mail.internet)"/>
-      <directive name="resolution" value="optional"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.mail.util)"/>
-      <directive name="resolution" value="optional"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.bind)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.bind.annotation)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.parsers)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.stream)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform.dom)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform.sax)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform.stream)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.validation)"/>
-    </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="(osgi.wiring.package=org.w3c.dom)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=org.xml.sax)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=org.xml.sax.helpers)"/>
-    </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"/>
-    </capability>
-    <capability namespace="osgi.content">
-      <attribute name="osgi.content" value="0d0aa270e92e06afc813be75cf79fe511b2cea9c54e66037bacfcdc435c95f9e"/>
-      <attribute name="url" value="com.sun.jersey.jersey-core/com.sun.jersey.jersey-core-1.12.0.jar"/>
-      <attribute name="size" type="Long" value="461868"/>
-      <attribute name="mime" value="application/vnd.osgi.bundle"/>
-    </capability>
-    <capability namespace="osgi.wiring.bundle">
-      <attribute name="osgi.wiring.bundle" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.host">
-      <attribute name="osgi.wiring.host" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.provider.jaxb"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs,javax.xml.parsers,com.sun.jersey.core.util,com.sun.jersey.core.provider,com.sun.jersey.core.impl.provider.entity,javax.ws.rs.ext,org.xml.sax,com.sun.jersey.api.provider.jaxb,javax.xml.stream,javax.xml.transform,javax.xml.bind.annotation,javax.xml.transform.stream,javax.xml.transform.sax,javax.xml.bind,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.impl.provider.header"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.header,com.sun.jersey.core.header.reader,com.sun.jersey.spi,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="javax.ws.rs"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.impl"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.localization"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.util"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.impl,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.provider"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.util,javax.ws.rs.ext,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.provider.jaxb"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.scanning"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.scanning.uri,com.sun.jersey.spi.service,com.sun.jersey.core.util,com.sun.jersey.core.reflection,com.sun.jersey.api.uri"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.impl.provider.xml"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.xml.stream,com.sun.jersey.core.spi.component,javax.xml.transform,javax.xml.parsers,com.sun.jersey.core.util,com.sun.jersey.spi.inject,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.header"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.impl.provider.header,javax.ws.rs,com.sun.jersey.core.header.reader,com.sun.jersey.core.util,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.header.reader"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.impl.provider.header,com.sun.jersey.core.header,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.osgi"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.scanning.uri,com.sun.jersey.impl,com.sun.jersey.core.spi.scanning,org.osgi.framework,com.sun.jersey.spi.service"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.spi"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs.ext,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.spi.inject"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.component"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="javax.ws.rs.core"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs,javax.ws.rs.ext"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.localization"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.scanning.uri"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.scanning,com.sun.jersey.core.util,javax.ws.rs.core,com.sun.jersey.api.uri"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.component"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs,com.sun.jersey.core.spi.factory,com.sun.jersey.spi.service,com.sun.jersey.core.reflection,com.sun.jersey.spi.inject"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.factory"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.component,javax.ws.rs,com.sun.jersey.core.util,com.sun.jersey.core.reflection,javax.ws.rs.ext,com.sun.jersey.core.header,com.sun.jersey.spi,com.sun.jersey.spi.service,com.sun.jersey.spi.inject,com.sun.jersey.api.uri,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.spi.component.ioc"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.spi.component,com.sun.jersey.spi.inject"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.representation"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.util"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.reflection"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs,com.sun.jersey.impl,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="javax.ws.rs.ext"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs,javax.ws.rs.core"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.core.impl.provider.entity"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.core.provider.jaxb,javax.ws.rs,javax.mail.internet,javax.imageio.stream,com.sun.jersey.impl,javax.imageio.spi,javax.mail.util,com.sun.jersey.core.util,com.sun.jersey.core.provider,javax.xml.transform.dom,org.xml.sax,javax.imageio,javax.xml.stream,com.sun.jersey.spi,javax.xml.transform.sax,com.sun.jersey.spi.inject,javax.ws.rs.core,javax.xml.parsers,com.sun.jersey.api.representation,javax.ws.rs.ext,org.w3c.dom,javax.activation,javax.xml.transform,javax.xml.bind.annotation,javax.xml.transform.stream,javax.mail,javax.xml.bind"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.spi.service"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="com.sun.jersey.impl,com.sun.jersey.core.reflection"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="com.sun.jersey.api.uri"/>
-      <attribute name="version" type="Version" value="0.0.0"/>
-      <attribute name="bundle-symbolic-name" value="com.sun.jersey.jersey-core"/>
-      <attribute name="bundle-version" type="Version" value="1.12.0"/>
-      <directive name="uses" value="javax.ws.rs,com.sun.jersey.core.util,javax.ws.rs.core"/>
-    </capability>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.api.provider.jaxb)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.api.representation)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.api.uri)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.header)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.header.reader)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.impl.provider.entity)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.impl.provider.header)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.impl.provider.xml)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.osgi)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.provider)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.provider.jaxb)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.reflection)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.spi.component)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.spi.component.ioc)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.spi.factory)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.spi.scanning)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.spi.scanning.uri)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.core.util)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.impl)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.localization)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.spi)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.spi.inject)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=com.sun.jersey.spi.service)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.activation)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.imageio)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.imageio.spi)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.imageio.stream)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.mail)"/>
-      <directive name="resolution" value="optional"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.mail.internet)"/>
-      <directive name="resolution" value="optional"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.mail.util)"/>
-      <directive name="resolution" value="optional"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.bind)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.bind.annotation)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.parsers)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.stream)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform.dom)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform.sax)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=javax.xml.transform.stream)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=org.osgi.framework)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(osgi.wiring.package=org.w3c.dom)"/>
-    </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="com.vaadin"/>
       <attribute name="type" value="osgi.bundle"/>
       <attribute name="version" type="Version" value="6.8.13"/>
@@ -7390,86 +6666,4 @@
       <directive name="resolution" value="optional"/>
     </requirement>
   </resource>
-  <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.6.4"/>
-    </capability>
-    <capability namespace="osgi.content">
-      <attribute name="osgi.content" value="2700de670285dfbfc0f05aaa5ebfb9de2c4eeb2acf759b3db907ff89190712da"/>
-      <attribute name="url" value="slf4j.api/slf4j.api-1.6.4.jar"/>
-      <attribute name="size" type="Long" value="26522"/>
-      <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.6.4"/>
-    </capability>
-    <capability namespace="osgi.wiring.host">
-      <attribute name="osgi.wiring.host" value="slf4j.api"/>
-      <attribute name="bundle-version" type="Version" value="1.6.4"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="org.slf4j"/>
-      <attribute name="version" type="Version" value="1.6.4"/>
-      <attribute name="bundle-symbolic-name" value="slf4j.api"/>
-      <attribute name="bundle-version" type="Version" value="1.6.4"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="org.slf4j.spi"/>
-      <attribute name="version" type="Version" value="1.6.4"/>
-      <attribute name="bundle-symbolic-name" value="slf4j.api"/>
-      <attribute name="bundle-version" type="Version" value="1.6.4"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="org.slf4j.helpers"/>
-      <attribute name="version" type="Version" value="1.6.4"/>
-      <attribute name="bundle-symbolic-name" value="slf4j.api"/>
-      <attribute name="bundle-version" type="Version" value="1.6.4"/>
-    </capability>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=org.slf4j.impl)(version&gt;=1.6.0))"/>
-    </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="slf4j.simple"/>
-      <attribute name="type" value="osgi.fragment"/>
-      <attribute name="version" type="Version" value="1.5.11"/>
-    </capability>
-    <capability namespace="osgi.content">
-      <attribute name="osgi.content" value="19391e725f028196329bd1e49b91c9bfd11333ca0ccd5c0a5cc95d1045406139"/>
-      <attribute name="url" value="slf4j.simple/slf4j.simple-1.5.11.jar"/>
-      <attribute name="size" type="Long" value="7854"/>
-      <attribute name="mime" value="application/vnd.osgi.bundle"/>
-    </capability>
-    <capability namespace="osgi.wiring.package">
-      <attribute name="osgi.wiring.package" value="org.slf4j.impl"/>
-      <attribute name="version" type="Version" value="1.5.11"/>
-      <attribute name="bundle-symbolic-name" value="slf4j.simple"/>
-      <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)(version&gt;=1.5.11))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=org.slf4j.spi)(version&gt;=1.5.11))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.package">
-      <directive name="filter" value="(&amp;(osgi.wiring.package=org.slf4j.helpers)(version&gt;=1.5.11))"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.bundle">
-      <directive name="filter" value="(osgi.wiring.bundle=slf4j.api)"/>
-    </requirement>
-    <requirement namespace="osgi.wiring.host">
-      <directive name="filter" value="(&amp;(osgi.wiring.host=slf4j.api)(bundle-version&gt;=0.0.0))"/>
-    </requirement>
-    <requirement namespace="osgi.ee">
-      <directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.3))"/>
-    </requirement>
-  </resource>
 </repository>
\ No newline at end of file

Modified: ace/trunk/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml.sha?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml.sha (original)
+++ ace/trunk/cnf/localrepo/index.xml.sha Fri Jan 29 15:39:59 2016
@@ -1 +1 @@
-e9bded8edf361ef528d842424bd0da1dad318bbdeb7c8e56c1fb54366fdc00e3
\ No newline at end of file
+80bd383da3db31a17db778f3ec4525d2aaecb999aa4805fb720c52746b6b5409
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd Fri Jan 29 15:39:59 2016
@@ -4,8 +4,6 @@
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	junit.osgi,\
-	com.sun.jersey.client,\
-	com.sun.jersey.core,\
 	com.google.gson,\
 	org.apache.felix.http.servlet-api,\
 	org.apache.felix.dependencymanager,\
@@ -30,8 +28,6 @@
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runbundles: \
 	osgi.cmpn,\
-	com.sun.jersey.client,\
-	com.sun.jersey.core,\
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.configadmin,\
 	org.apache.felix.eventadmin,\
@@ -84,6 +80,7 @@
 
 Private-Package: \
 	org.apache.ace.client.rest.itest,\
+	org.apache.ace.client.rest.util,\
 	com.google.gson*
 Import-Package: \
 	*

Modified: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/ClientRestUtils.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/ClientRestUtils.java?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/ClientRestUtils.java (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/ClientRestUtils.java Fri Jan 29 15:39:59 2016
@@ -26,13 +26,12 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
+import org.apache.ace.client.rest.util.Client;
+import org.apache.ace.client.rest.util.WebResourceException;
+import org.apache.ace.client.rest.util.WebResource;
 import org.apache.ace.test.utils.FileUtils;
 
 import com.google.gson.Gson;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
 
 /**
  * Helper methods for talking to the ACE client through REST.
@@ -43,7 +42,7 @@ public class ClientRestUtils {
     public static void assertEntitiesExist(WebResource... entities) throws Exception {
         for (WebResource r : entities) {
             System.out.println(r.getURI().toString());
-            r.get(String.class);
+            r.getString();
         }
     }
 
@@ -51,11 +50,11 @@ public class ClientRestUtils {
      * Asserts that a collection of resources exist by trying to GET the list, validate the number of items and finally
      * GET each item.
      */
-    public static void assertResources(Gson gson, WebResource w2, String type, int number) {
-        String[] artifacts = gson.fromJson(w2.path(type).get(String.class), String[].class);
+    public static void assertResources(Gson gson, WebResource w2, String type, int number) throws IOException {
+        String[] artifacts = gson.fromJson(w2.path(type).getString(), String[].class);
         assertEquals("Wrong number of " + type + "s", number, artifacts.length);
         for (String id : artifacts) {
-            w2.path(type + "/" + id).get(String.class);
+            w2.path(type + "/" + id).getString();
         }
     }
 
@@ -109,7 +108,7 @@ public class ClientRestUtils {
     /** creates a new REST-client. */
     public static Client createClient() {
         Client client = Client.create();
-        client.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, false);
+        client.getProperties().put(Client.PROPERTY_FOLLOW_REDIRECTS, false);
         return client;
     }
 
@@ -122,10 +121,10 @@ public class ClientRestUtils {
     public static WebResource createEntity(Client c, WebResource work, String type, String data) throws IOException {
         WebResource entity = work.path(type);
         try {
-            entity.post(String.class, data);
+            entity.post(data);
             throw new IOException("Could not create " + type + " with data " + data);
         }
-        catch (UniformInterfaceException e2) {
+        catch (WebResourceException e2) {
             return c.resource(e2.getResponse().getLocation());
         }
     }
@@ -178,17 +177,20 @@ public class ClientRestUtils {
     public static WebResource createWorkspace(String host, Client c) {
         WebResource r = c.resource(host.concat("/client/work/"));
         try {
-            r.post(String.class, "");
+            r.post();
             fail("We should have been redirected to a new workspace.");
-            return null; // to keep the compiler happy, it does not understand what fail() does
         }
-        catch (UniformInterfaceException e) {
+        catch (WebResourceException e) {
             assertEquals("Expected a valid redirect after creating a workspace", 302, e.getResponse().getStatus());
             return c.resource(e.getResponse().getLocation());
         }
+        catch (IOException e) {
+            fail("Unexpected exception: " + e.getMessage());
+        }
+        return null; // to keep the compiler happy, it does not understand what fail() does
     }
 
-    public static void deleteResources(Gson gson, WebResource workspace) {
+    public static void deleteResources(Gson gson, WebResource workspace) throws IOException {
         deleteResources(gson, workspace, "artifact");
         deleteResources(gson, workspace, "artifact2feature");
         deleteResources(gson, workspace, "feature");
@@ -198,8 +200,8 @@ public class ClientRestUtils {
         deleteResources(gson, workspace, "target");
     }
 
-    public static void deleteResources(Gson gson, WebResource workspace, String type) {
-        String[] artifacts = gson.fromJson(workspace.path(type).get(String.class), String[].class);
+    public static void deleteResources(Gson gson, WebResource workspace, String type) throws IOException {
+        String[] artifacts = gson.fromJson(workspace.path(type).getString(), String[].class);
         for (String id : artifacts) {
             workspace.path(type + "/" + id).delete();
         }
@@ -207,7 +209,6 @@ public class ClientRestUtils {
 
     public static void ensureCleanStore(String path) throws IOException {
         File store = new File(path);
-        System.out.println("store: " + store.getAbsolutePath());
         if (store.exists()) {
             if (!store.isDirectory()) {
                 throw new IllegalStateException("Configured store is not a directory: " + store.getAbsolutePath());

Modified: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java?rev=1727600&r1=1727599&r2=1727600&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java Fri Jan 29 15:39:59 2016
@@ -41,9 +41,14 @@ import java.util.Date;
 import java.util.Enumeration;
 
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
+import org.apache.ace.client.rest.util.Client;
+import org.apache.ace.client.rest.util.WebResource;
+import org.apache.ace.client.rest.util.WebResourceException;
+import org.apache.ace.client.rest.util.WebResponse;
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.test.constants.TestConstants;
+import org.apache.ace.test.utils.NetUtils;
 import org.apache.felix.dm.Component;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -55,10 +60,6 @@ import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
 import com.google.gson.Gson;
-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;
 
 public class RESTClientTest extends IntegrationTestBase {
     // From: ConfigurationHelper (somehow directly using them here fails)
@@ -111,22 +112,22 @@ public class RESTClientTest extends Inte
     public void testCreateAndDestroyRESTSession() throws Exception {
         Client client = createClient();
         try {
-            WebResource r = client.resource(HOST.concat("/client/work"));
+            WebResource r = client.resource(HOST.concat("/client/work/"));
             try {
-                r.post(String.class, "");
+                r.post();
                 fail("We should have been redirected to a new workspace.");
             }
-            catch (UniformInterfaceException e) {
-                ClientResponse response = e.getResponse();
+            catch (WebResourceException e) {
+                WebResponse response = e.getResponse();
                 URI location = response.getLocation();
-                assertTrue(location.toString().startsWith(HOST.concat("/client/work/rest-")));
+                assertTrue(location.toString(), location.toString().startsWith(HOST.concat("/client/work/rest-")));
                 WebResource r2 = client.resource(location);
-                r2.get(String.class);
+                r2.getString();
                 r2.delete();
                 try {
-                    r2.get(String.class);
+                    r2.getString();
                 }
-                catch (UniformInterfaceException e2) {
+                catch (WebResourceException e2) {
                     assertEquals(404, e2.getResponse().getStatus());
                 }
             }
@@ -174,7 +175,7 @@ public class RESTClientTest extends Inte
                 w2.delete();
             }
             WebResource t1versions = client.resource(HOST.concat("/deployment/bar.t1/versions"));
-            assertEquals("1.0.0\n", t1versions.get(String.class));
+            assertEquals("1.0.0\n", t1versions.getString());
         }
         catch (Exception e) {
             showBundles();
@@ -237,7 +238,7 @@ public class RESTClientTest extends Inte
             w2.delete();
 
             WebResource t1versions = client.resource(HOST.concat("/deployment/foo.t1/versions"));
-            assertEquals("1.0.0\n", t1versions.get(String.class));
+            assertEquals("1.0.0\n", t1versions.getString());
         }
         catch (Exception e) {
             showBundles();
@@ -263,8 +264,7 @@ public class RESTClientTest extends Inte
                     "      </Attribute>\n" +
                     "    </Object>\n" +
                     "  </Designate>\n" +
-                    "</MetaData>\n"
-                );
+                    "</MetaData>\n");
 
             WebResource w1 = createWorkspace(HOST, client);
             deleteResources(gson, w1);
@@ -295,7 +295,7 @@ public class RESTClientTest extends Inte
             w2.delete();
 
             WebResource t1versions = client.resource(HOST.concat("/deployment/t4/versions"));
-            assertEquals("1.0.0\n", t1versions.get(String.class));
+            assertEquals("1.0.0\n", t1versions.getString());
         }
         catch (Exception e) {
             showBundles();
@@ -316,6 +316,10 @@ public class RESTClientTest extends Inte
             ensureCleanStore(STOREPATH);
             configureServer();
             createServerUser();
+
+            // Wait until our RESTClientServlet is up and responding...
+            NetUtils.waitForURL(HOST, 200, 1000);
+
             m_hasBeenSetup = true;
         }
 
@@ -343,7 +347,7 @@ public class RESTClientTest extends Inte
     private void assertEntitiesExist(WebResource... entities) throws Exception {
         for (WebResource r : entities) {
             System.out.println(r.getURI().toString());
-            r.get(String.class);
+            r.getString();
         }
     }
 
@@ -351,11 +355,11 @@ public class RESTClientTest extends Inte
      * Asserts that a collection of resources exist by trying to GET the list, validate the number of items and finally
      * GET each item.
      */
-    private void assertResources(Gson gson, WebResource w2, String type, int number) {
-        String[] artifacts = gson.fromJson(w2.path(type).get(String.class), String[].class);
+    private void assertResources(Gson gson, WebResource w2, String type, int number) throws IOException {
+        String[] artifacts = gson.fromJson(w2.path(type).getString(), String[].class);
         assertEquals("Wrong number of " + type + "s", number, artifacts.length);
         for (String id : artifacts) {
-            w2.path(type + "/" + id).get(String.class);
+            w2.path(type + "/" + id).getString();
         }
     }
 

Added: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/Client.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/Client.java?rev=1727600&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/Client.java (added)
+++ ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/Client.java Fri Jan 29 15:39:59 2016
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ace.client.rest.util;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Mini REST client.
+ */
+public class Client {
+    public static final String PROPERTY_FOLLOW_REDIRECTS = "followRedirects";
+    public static final String PROPERTY_DEFAULT_CHARSET = "defaultCharset";
+
+    public static Client create() {
+        return new Client();
+    }
+
+    private final Map<String, Object> m_props;
+
+    private Client() {
+        m_props = new HashMap<>();
+        m_props.put(PROPERTY_DEFAULT_CHARSET, System.getProperty("file.encoding", "UTF-8"));
+        m_props.put(PROPERTY_FOLLOW_REDIRECTS, Boolean.TRUE);
+    }
+
+    public String getDefaultCharset() {
+        return (String) m_props.get(PROPERTY_DEFAULT_CHARSET);
+    }
+
+    public Map<String, Object> getProperties() {
+        return m_props;
+    }
+
+    public boolean isFollowRedirects() {
+        return Boolean.TRUE.equals(m_props.get(PROPERTY_FOLLOW_REDIRECTS));
+    }
+
+    public WebResource resource(String path) {
+        return resource(URI.create(path));
+    }
+
+    public WebResource resource(URI location) {
+        return new WebResource(this, location);
+    }
+}

Propchange: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/Client.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResource.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResource.java?rev=1727600&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResource.java (added)
+++ ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResource.java Fri Jan 29 15:39:59 2016
@@ -0,0 +1,177 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ace.client.rest.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+
+/**
+ * 
+ */
+public class WebResource {
+    private final Client m_client;
+    private final URI m_uri;
+
+    protected WebResource(Client client, URI uri) {
+        m_client = client;
+        m_uri = uri;
+    }
+
+    public WebResponse delete() throws IOException {
+        return delete("");
+    }
+
+    public WebResponse delete(String data) throws IOException {
+        HttpURLConnection conn = openConnection();
+        try {
+            conn.setRequestMethod("DELETE");
+
+            if (data.length() > 0) {
+                conn.setFixedLengthStreamingMode(data.length());
+                conn.setDoOutput(data.length() > 0);
+
+                try (OutputStream os = conn.getOutputStream()) {
+                    os.write(data.getBytes());
+                    os.flush();
+                }
+            }
+            return handleResponse(m_uri, conn);
+        }
+        finally {
+            conn.disconnect();
+        }
+    }
+
+    public String getString() throws IOException {
+        HttpURLConnection conn = openConnection();
+        try {
+            conn.setRequestMethod("GET");
+            
+            return handleResponse(m_uri, conn).getContent();
+        } finally {
+            conn.disconnect();
+        }
+    }
+
+    public URI getURI() {
+        return m_uri;
+    }
+
+    public WebResource path(String path) {
+        return new WebResource(m_client, m_uri.resolve(path));
+    }
+
+    public void post() throws IOException {
+        post("");
+    }
+
+    public WebResponse post(String data) throws IOException {
+        HttpURLConnection conn = openConnection();
+        try {
+            conn.setRequestMethod("POST");
+
+            if (data.length() > 0) {
+                conn.setFixedLengthStreamingMode(data.length());
+                conn.setDoOutput(data.length() > 0);
+
+                try (OutputStream os = conn.getOutputStream()) {
+                    os.write(data.getBytes());
+                    os.flush();
+                }
+            }
+            return handleResponse(m_uri, conn);
+        }
+        finally {
+            conn.disconnect();
+        }
+    }
+
+    private String getContent(HttpURLConnection conn, String encoding) throws IOException {
+        InputStream is;
+        try {
+            is = conn.getInputStream();
+        }
+        catch (IOException e) {
+            is = conn.getErrorStream();
+        }
+
+        int len = conn.getContentLength();
+        if (len < 0) {
+            len = 4096;
+        }
+
+        try {
+            byte[] buf = new byte[4096];
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(len);
+            int read = 0;
+            while ((read = is.read(buf)) > 0) {
+                baos.write(buf, 0, read);
+            }
+            return baos.toString(encoding);
+        }
+        finally {
+            is.close();
+        }
+    }
+
+    private WebResponse handleResponse(URI location, HttpURLConnection conn) throws IOException {
+        int rc = conn.getResponseCode();
+        String enc = conn.getContentEncoding();
+        if (enc == null) {
+            enc = m_client.getDefaultCharset();
+        }
+
+        if (rc >= 200 && rc < 300) {
+            // Success
+            return new WebResponse(location, rc, getContent(conn, enc));
+        }
+        else if (rc >= 300 && rc < 400) {
+            // Redirection
+            String newLocation = conn.getHeaderField("Location");
+            throw new WebResourceException(new WebResponse(newLocation, rc, getContent(conn, enc)));
+        }
+        else if (rc >= 400 && rc < 600) {
+            // Client or server error
+            throw new WebResourceException(new WebResponse(location, rc, getContent(conn, enc)));
+        }
+        else {
+            throw new IOException("Unknown/unhandled response code: " + rc);
+        }
+    }
+
+    private HttpURLConnection openConnection() throws IOException {
+        URL url = m_uri.toURL();
+
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setInstanceFollowRedirects(m_client.isFollowRedirects());
+        conn.setAllowUserInteraction(false);
+        conn.setDefaultUseCaches(false);
+        conn.setUseCaches(false);
+        conn.setConnectTimeout(1000);
+        conn.setReadTimeout(1000);
+
+        return conn;
+    }
+}

Propchange: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResourceException.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResourceException.java?rev=1727600&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResourceException.java (added)
+++ ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResourceException.java Fri Jan 29 15:39:59 2016
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ace.client.rest.util;
+
+import java.io.IOException;
+
+/**
+ * 
+ */
+public class WebResourceException extends IOException {
+    private final WebResponse m_response;
+
+    public WebResourceException(WebResponse response) {
+        super(response.toString());
+        m_response = response;
+    }
+
+    public WebResponse getResponse() {
+        return m_response;
+    }
+}

Propchange: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/util/WebResourceException.java
------------------------------------------------------------------------------
    svn:eol-style = native




Mime
View raw message