From 073fcab1cf3045ff6f31f2b42cd33cb99c069e51 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 20 Oct 2010 04:24:39 +0000 Subject: Updating sample to use latest wink release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1024518 13f79535-47bb-0310-9956-ffa450edef68 --- .../lresende/sca-2.x/samples/store-jaxrs/.project | 52 +++++++++------------- .../lresende/sca-2.x/samples/store-jaxrs/pom.xml | 37 +++++++++++---- .../store-jaxrs/src/main/webapp/WEB-INF/web.xml | 33 +++++++++----- 3 files changed, 73 insertions(+), 49 deletions(-) (limited to 'sandbox/lresende') diff --git a/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project b/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project index 63959a34e6..7890010b31 100644 --- a/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project +++ b/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project @@ -1,34 +1,26 @@ - - sample-store-jaxrs-webapp - The Apache Software Foundation provides support for the Apache community of open-source software projects. + sample-store-jaxrs-webapp + The Apache Software Foundation provides support for the Apache community of open-source software projects. The Apache projects are characterized by a collaborative, consensus based development process, an open and pragmatic software license, and a desire to create high quality software that leads the way in its field. We consider ourselves not simply a group of projects sharing a server, but rather a community of developers - and users. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - + and users. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature + + \ No newline at end of file diff --git a/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml b/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml index 676dcbe956..7d536db3dc 100644 --- a/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml +++ b/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml @@ -7,15 +7,15 @@ * 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. + * under the License. --> 4.0.0 @@ -42,23 +42,44 @@ http://repository.codehaus.org/ - + + + javax.ws.rs + jsr311-api + 1.1 + + org.apache.wink wink-common - 1.0-incubating + 1.1.2-incubating-SNAPSHOT org.apache.wink wink-server - 1.0-incubating + 1.1.2-incubating-SNAPSHOT + + org.apache.wink + wink-client + 1.1.2-incubating-SNAPSHOT + org.codehaus.jackson jackson-jaxrs - 1.4.1 + 1.6.0 + + org.slf4j + slf4j-api + 1.6.1 + + + org.slf4j + slf4j-jdk14 + 1.6.1 + junit junit @@ -66,7 +87,7 @@ test - + store-jaxrs diff --git a/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml index b6f0c3db16..5060ad0fb2 100644 --- a/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml @@ -1,11 +1,12 @@ - - store-jaxrs - - + + store-jaxrs + + restSdkService org.apache.wink.server.internal.servlet.RestServlet @@ -19,8 +20,18 @@ restSdkService /services/* - - - store.html - + + + restSdkAdmin + org.apache.wink.server.internal.servlet.AdminServlet + + + + restSdkAdmin + /admin + + + + store.html + \ No newline at end of file -- cgit v1.2.3