You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/10/20 06:24:39 UTC
svn commit: r1024518 - in
/tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs: .project pom.xml
src/main/webapp/WEB-INF/web.xml
Author: lresende
Date: Wed Oct 20 04:24:39 2010
New Revision: 1024518
URL: http://svn.apache.org/viewvc?rev=1024518&view=rev
Log:
Updating sample to use latest wink release
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project
tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml
tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml
Modified: tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project
URL: http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project?rev=1024518&r1=1024517&r2=1024518&view=diff
==============================================================================
--- tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project (original)
+++ tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/.project Wed Oct 20 04:24:39 2010
@@ -1,34 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>sample-store-jaxrs-webapp</name>
- <comment>The Apache Software Foundation provides support for the Apache community of open-source software projects.
+ <name>sample-store-jaxrs-webapp</name>
+ <comment>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.</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
+ and users. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml?rev=1024518&r1=1024517&r2=1024518&view=diff
==============================================================================
--- tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml (original)
+++ tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/pom.xml Wed Oct 20 04:24:39 2010
@@ -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.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -42,23 +42,44 @@
<url>http://repository.codehaus.org/</url>
</repository>
</repositories>
-
+
<dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-common</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1.2-incubating-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-client</artifactId>
+ <version>1.1.2-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.4.1</version>
+ <version>1.6.0</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.6.1</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -66,7 +87,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<finalName>store-jaxrs</finalName>
</build>
Modified: tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml?rev=1024518&r1=1024517&r2=1024518&view=diff
==============================================================================
--- tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml (original)
+++ tuscany/sandbox/lresende/sca-2.x/samples/store-jaxrs/src/main/webapp/WEB-INF/web.xml Wed Oct 20 04:24:39 2010
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
- <display-name>store-jaxrs</display-name>
-
- <!--
- Wink SDK servlet configuration. This servlet handles HTTP requests
- of SDK web service on application server.
- -->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <display-name>store-jaxrs</display-name>
+
+ <!-- Wink SDK servlet configuration. This servlet handles HTTP requests
+ of SDK web service on application server. -->
<servlet>
<servlet-name>restSdkService</servlet-name>
<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
@@ -19,8 +20,18 @@
<servlet-name>restSdkService</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>store.html</welcome-file>
- </welcome-file-list>
+
+ <servlet>
+ <servlet-name>restSdkAdmin</servlet-name>
+ <servlet-class>org.apache.wink.server.internal.servlet.AdminServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>restSdkAdmin</servlet-name>
+ <url-pattern>/admin</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>store.html</welcome-file>
+ </welcome-file-list>
</web-app>
\ No newline at end of file