You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2011/11/22 15:45:23 UTC
svn commit: r1205025 - in /cxf/branches/2.4.x-fixes: ./
distribution/src/main/release/samples/logbrowser/README.txt
distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
Author: gmazza
Date: Tue Nov 22 14:45:22 2011
New Revision: 1205025
URL: http://svn.apache.org/viewvc?rev=1205025&view=rev
Log:
Merged revisions 1205019 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1205019 | gmazza | 2011-11-22 09:38:14 -0500 (Tue, 22 Nov 2011) | 1 line
Switched LogBrowser sample app to 2.5 version of web.xml [CXF-1111]
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/README.txt
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/README.txt?rev=1205025&r1=1205024&r2=1205025&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/README.txt (original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/README.txt Tue Nov 22 14:45:22 2011
@@ -1,16 +1,5 @@
-Prerequisite
-------------
-
-If your environment already includes cxf-manifest.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to set the environment as described in
-the samples directory README. If your environment is not
-properly configured, or if you are planning on using wsdl2java,
-javac, and java to build and run the demos, you must set the
-environment.
-
Building and running the demo using Maven
----------------------------------------
+-----------------------------------------
From the base directory of this sample (i.e., where this README file is
located), the pom.xml file is used to build and run the demo.
@@ -18,7 +7,7 @@ located), the pom.xml file is used to bu
Using either UNIX or Windows:
1) Build the project by typing:
- mvn install
+ mvn clean install
1) Start the server:
mvn -Pserver
2) Open browser and go to:
Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml?rev=1205025&r1=1205024&r2=1205025&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml (original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/webapp/WEB-INF/web.xml Tue Nov 22 14:45:22 2011
@@ -1,41 +1,34 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
<!--
- 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.
+ 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.
-->
-<!-- START SNIPPET: webxml -->
-<web-app>
+<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">
<servlet>
<servlet-name>CustomerService</servlet-name>
<display-name>CustomerService</display-name>
- <servlet-class>
- org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
- </servlet-class>
+ <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>
- demo.service.App
- </param-value>
+ <param-value>demo.service.App</param-value>
</init-param>
<init-param>
<param-name>jaxrs.inInterceptors</param-name>
@@ -43,42 +36,34 @@
org.apache.cxf.interceptor.LoggingInInterceptor
</param-value>
</init-param>
-
<init-param>
<param-name>jaxrs.outInterceptors</param-name>
<param-value>
org.apache.cxf.interceptor.LoggingOutInterceptor
</param-value>
</init-param>
-
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>BrowserServlet</servlet-name>
- <display-name>BrowserServlet</display-name>
- <servlet-class>
- org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
- </servlet-class>
- <init-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>
- demo.logbrowser.App
- </param-value>
- </init-param>
-
- <load-on-startup>2</load-on-startup>
- </servlet>
-
+ <servlet>
+ <servlet-name>BrowserServlet</servlet-name>
+ <display-name>BrowserServlet</display-name>
+ <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
+ <init-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>demo.logbrowser.App</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>BrowserServlet</servlet-name>
- <url-pattern>/log/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>BrowserServlet</servlet-name>
+ <url-pattern>/log/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>CustomerService</servlet-name>
- <url-pattern>/service/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CustomerService</servlet-name>
+ <url-pattern>/service/*</url-pattern>
+ </servlet-mapping>
</web-app>
<!-- END SNIPPET: webxml -->