Return-Path: 
 <commits-return-21624-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DE6D4D7B9
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 15 Aug 2012 16:48:44 +0000 (UTC)
Received: (qmail 16056 invoked by uid 500); 15 Aug 2012 16:48:44 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 16006 invoked by uid 500); 15 Aug 2012 16:48:44 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 15996 invoked by uid 99); 15 Aug 2012 16:48:44 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 16:48:44 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 16:48:42 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 48BC323889B8;
	Wed, 15 Aug 2012 16:47:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1373526 - in /cxf/trunk/distribution/src/main/release:
 etc/
 samples/groovy_spring_support/
 samples/groovy_spring_support/src/main/webapp/WEB-INF/
 samples/java_first_jaxws/
 samples/java_first_jaxws/src/main/java/demo/hw/client/ samples/java...
Date: Wed, 15 Aug 2012 16:47:58 -0000
To: commits@cxf.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120815164759.48BC323889B8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmazza
Date: Wed Aug 15 16:47:57 2012
New Revision: 1373526

URL: http://svn.apache.org/viewvc?rev=1373526&view=rev
Log:
Placing web.xml in each sample that needs it, rather than relying on a common /etc/web.xml file.

Added:
    cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml
    cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/
    cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/WEB-INF/
    cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/WEB-INF/web.xml
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml
Removed:
    cxf/trunk/distribution/src/main/release/etc/web.xml
Modified:
    cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml

Modified: cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/pom.xml Wed Aug 15 16:47:57 2012
@@ -42,7 +42,7 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.1</version>
                     <configuration>
-                        <webXml>${cxf.release.base}/etc/web.xml</webXml>
+                        <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
                     </configuration>
                 </plugin>
             </plugins>

Added: cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml?rev=1373526&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml (added)
+++ cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/main/webapp/WEB-INF/web.xml Wed Aug 15 16:47:57 2012
@@ -0,0 +1,44 @@
+<?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.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>cxf</display-name>
+
+    <servlet>
+        <servlet-name>cxf</servlet-name>
+        <display-name>cxf</display-name>
+        <description>Apache CXF Endpoint</description>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>cxf</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
+</web-app>
+

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/README.txt Wed Aug 15 16:47:57 2012
@@ -21,13 +21,9 @@ files, run "mvn clean".
 
 Alternative: WAR deployment of service in a servlet container (e.g. Tomcat)
 ---------------------------------------------------------------------------
-
 1.) Update the endpointAddress value in the client.Client class to the WAR-hosted 
-value. The endpointAddress value will be installation-specific, but could be 
-"http://localhost:8080/java_first_jaxws-{CXF Version}/services/hello_world" 
-for a default local installation of Tomcat.  Replace {CXF Version} with the
-CXF version declared in the parent POM -- for example, "2.6.1", "2.6.1-SNAPSHOT", 
-etc.
+value, for running this sample on your local machine most likely:
+"http://localhost:8080/java_first_jaxws/services/hello_world".
 
 2.) Manually copy the generated WAR file to the Tomcat webapps folder, or, if you
 have Maven and Tomcat set up to use the Tomcat Maven Plugin 
@@ -38,4 +34,5 @@ switching to the the Tomcat 6-specific "
 
 Prior to running the client (mvn -Pclient) good to confirm the generated WSDL 
 can be seen from a web browser at: 
-http://{server}:{port}/java_first_jaxws-{CXF Version}/services/hello_world?wsdl
+http://localhost:8080/java_first_jaxws/services/hello_world?wsdl
+

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml Wed Aug 15 16:47:57 2012
@@ -47,7 +47,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1</version>
                 <configuration>
-                    <webXml>${cxf.release.base}/etc/web.xml</webXml>
+                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
                 </configuration>
             </plugin>
             <plugin>
@@ -64,6 +64,7 @@
                 </configuration>
             </plugin>
         </plugins>
+        <finalName>java_first_jaxws</finalName>
     </build>
     <profiles>
         <profile>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java Wed Aug 15 16:47:57 2012
@@ -45,7 +45,7 @@ public final class Client {
         // Endpoint Address
         String endpointAddress = "http://localhost:9000/helloWorld";
         // If web service deployed on Tomcat deployment, endpoint should be changed to:
-        // http://localhost:8080/java_first_jaxws-<cxf-version>/services/hello_world
+        // String endpointAddress = "http://localhost:8080/java_first_jaxws/services/hello_world";
 
         // Add a port to the Service
         service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, endpointAddress);

Added: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml?rev=1373526&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml (added)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/webapp/WEB-INF/web.xml Wed Aug 15 16:47:57 2012
@@ -0,0 +1,44 @@
+<?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.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>cxf</display-name>
+
+    <servlet>
+        <servlet-name>cxf</servlet-name>
+        <display-name>cxf</display-name>
+        <description>Apache CXF Endpoint</description>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>cxf</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
+</web-app>
+

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml Wed Aug 15 16:47:57 2012
@@ -40,7 +40,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1</version>
                 <configuration>
-                    <webXml>${cxf.release.base}/etc/web.xml</webXml>
+                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
                 </configuration>
             </plugin>
         </plugins>

Added: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml?rev=1373526&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml (added)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/webapp/WEB-INF/web.xml Wed Aug 15 16:47:57 2012
@@ -0,0 +1,44 @@
+<?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.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>cxf</display-name>
+
+    <servlet>
+        <servlet-name>cxf</servlet-name>
+        <display-name>cxf</display-name>
+        <description>Apache CXF Endpoint</description>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>cxf</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
+</web-app>
+

Modified: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml Wed Aug 15 16:47:57 2012
@@ -51,7 +51,7 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.1</version>
                     <configuration>
-                        <webXml>${cxf.release.base}/etc/web.xml</webXml>
+                        <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
                         <webResources>
                             <resource>
                                 <directory>wsdl</directory>

Added: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/WEB-INF/web.xml?rev=1373526&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/WEB-INF/web.xml (added)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/webapp/WEB-INF/web.xml Wed Aug 15 16:47:57 2012
@@ -0,0 +1,44 @@
+<?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.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>cxf</display-name>
+
+    <servlet>
+        <servlet-name>cxf</servlet-name>
+        <display-name>cxf</display-name>
+        <description>Apache CXF Endpoint</description>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>cxf</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
+</web-app>
+

Modified: cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml?rev=1373526&r1=1373525&r2=1373526&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/pom.xml Wed Aug 15 16:47:57 2012
@@ -42,7 +42,7 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.1</version>
                     <configuration>
-                        <webXml>${cxf.release.base}/etc/web.xml</webXml>
+                        <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
                     </configuration>
                 </plugin>
             </plugins>

Added: cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml?rev=1373526&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml (added)
+++ cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/webapp/WEB-INF/web.xml Wed Aug 15 16:47:57 2012
@@ -0,0 +1,44 @@
+<?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.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <display-name>cxf</display-name>
+
+    <servlet>
+        <servlet-name>cxf</servlet-name>
+        <display-name>cxf</display-name>
+        <description>Apache CXF Endpoint</description>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>cxf</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
+</web-app>
+