Author: gmazza
Date: Sun Nov 6 07:35:39 2011
New Revision: 1198189
URL: http://svn.apache.org/viewvc?rev=1198189&view=rev
Log:
WAR deployment option added to intro Java-first example.
Added:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
(with props)
Removed:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/wsdl/
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1198189&r1=1198188&r2=1198189&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/pom.xml
Sun Nov 6 07:35:39 2011
@@ -16,10 +16,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.samples</groupId>
<artifactId>java_first_jaxws</artifactId>
+ <packaging>war</packaging>
<name>Java First demo using JAX-WS APIs</name>
<version>2.4.5-SNAPSHOT</version>
<description>Java First demo using JAX-WS APIs</description>
@@ -31,6 +33,7 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
+ <cxf.release.base>${basedir}/../..</cxf.release.base>
</properties>
<build>
<plugins>
@@ -41,6 +44,26 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <webXml>${cxf.release.base}/etc/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <server>myTomcat</server>
+ <!-- if using Tomcat 6 (see README) -->
+ <!--url>http://localhost:8080/manager</url-->
+ <!-- if using Tomcat 7 (see README) -->
+ <url>http://localhost:8080/manager/text</url>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -66,6 +89,13 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>2.4.5-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>client</id>
@@ -102,10 +132,5 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>2.4.5-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.4.5-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
Added:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml?rev=1198189&view=auto
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
(added)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
Sun Nov 6 07:35:39 2011
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:jaxws="http://cxf.apache.org/jaxws";
+ xmlns:soap="http://cxf.apache.org/bindings/soap";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/bindings/soap
http://cxf.apache.org/schemas/configuration/soap.xsd
+http://cxf.apache.org/jaxws
+http://cxf.apache.org/schemas/jaxws.xsd";>
+
+ <jaxws:server id="jaxwsService" serviceClass="demo.hw.server.HelloWorld"
address="/hello_world">
+ <jaxws:serviceBean>
+ <bean class="demo.hw.server.HelloWorldImpl" />
+ </jaxws:serviceBean>
+ </jaxws:server>
+</beans>
Propchange:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/cxf-servlet.xml
------------------------------------------------------------------------------
svn:executable = *
