Commit a2319b4e authored by Philippe Merle's avatar Philippe Merle
Browse files

Replaced Jersey by Apache CXF REST.

parent dfd7dffc
......@@ -168,12 +168,6 @@
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.12</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
......
......@@ -14,13 +14,14 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
* Author: Gwnal Cattez
* Author: Gwenael Cattez
*
* Contributor(s):
* Contributor(s): Philippe Merle
*
*/
......@@ -33,6 +34,7 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.After;
import org.junit.BeforeClass;
......@@ -43,8 +45,6 @@ import org.ow2.frascati.remote.introspection.resources.Binding;
import org.ow2.frascati.remote.introspection.resources.BindingKind;
import org.ow2.frascati.remote.introspection.resources.Port;
import com.sun.jersey.core.util.MultivaluedMapImpl;
/**
*
*/
......@@ -61,7 +61,7 @@ public class AddBinding
@Test
public void testAddWSBinding()
{
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
MultivaluedMap<String, String> params = new MetadataMap();
params.add("kind", "WS");
params.add("uri", "http://localhost:9100/r");
......
......@@ -14,13 +14,14 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
* Author: Gwnal Cattez
* Author: Gwenael Cattez
*
* Contributor(s):
* Contributor(s): Philippe Merle
*
*/
......@@ -33,6 +34,7 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.Before;
import org.junit.BeforeClass;
......@@ -43,8 +45,6 @@ import org.ow2.frascati.remote.introspection.resources.Binding;
import org.ow2.frascati.remote.introspection.resources.BindingKind;
import org.ow2.frascati.remote.introspection.resources.Port;
import com.sun.jersey.core.util.MultivaluedMapImpl;
/**
*
*/
......@@ -62,7 +62,7 @@ public class RemoveBinding
@Before
public void addWSBinding()
{
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
MultivaluedMap<String, String> params = new MetadataMap();
params.add("kind", "WS");
params.add("uri", "http://localhost:9100/r");
......
......@@ -14,13 +14,14 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
* Author: Gwnal Cattez
* Author: Gwenael Cattez
*
* Contributor(s):
* Contributor(s): Philippe Merle
*
*/
......@@ -33,6 +34,7 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.After;
import org.junit.Before;
......@@ -44,8 +46,6 @@ import org.ow2.frascati.remote.introspection.resources.Binding;
import org.ow2.frascati.remote.introspection.resources.BindingKind;
import org.ow2.frascati.remote.introspection.resources.Port;
import com.sun.jersey.core.util.MultivaluedMapImpl;
/**
*
*/
......@@ -62,7 +62,7 @@ public class SetAttributeBinding
@Before
public void addWSBinding()
{
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
MultivaluedMap<String, String> params = new MetadataMap();
params.add("kind", "WS");
params.add("uri", "http://localhost:9100/r");
......
......@@ -14,13 +14,14 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Contact: frascati@ow2.org
*
* Author: Gwnal Cattez
* Author: Gwenael Cattez
*
* Contributor(s):
* Contributor(s): Philippe Merle
*
*/
......@@ -38,6 +39,7 @@ import java.io.IOException;
import java.util.List;
import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
......@@ -51,8 +53,6 @@ import org.ow2.frascati.remote.introspection.resources.BindingKind;
import org.ow2.frascati.remote.introspection.resources.Component;
import org.ow2.frascati.remote.introspection.resources.Port;
import com.sun.jersey.core.util.MultivaluedMapImpl;
/**
*
*/
......@@ -89,7 +89,7 @@ public class SetBinding
IntrospectionAllTest.domain.removeBinding("/Subscriber/sub/messageIn",0);
MultivaluedMap<String, String> params = new MultivaluedMapImpl();
MultivaluedMap<String, String> params = new MetadataMap();
params.add("kind", "WS");
params.add("uri", "http://localhost:9100/newWS");
IntrospectionAllTest.domain.addBinding("/Subscriber/sub/messageIn", params);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment