Return-Path: 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 A5BFBD087 for ; Thu, 16 Aug 2012 20:57:02 +0000 (UTC) Received: (qmail 13982 invoked by uid 500); 16 Aug 2012 20:57:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 13755 invoked by uid 500); 16 Aug 2012 20:57:02 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 13678 invoked by uid 99); 16 Aug 2012 20:57:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2012 20:57:01 +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; Thu, 16 Aug 2012 20:56:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0293B23889C5; Thu, 16 Aug 2012 20:56:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374051 - in /cxf/fediz/trunk/examples: ./ simpleWebapp/ wsclientWebapp/ wsclientWebapp/webapp/ wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ wsclientWebapp/webservice/ wsclientWebapp/webservice/common/ wsclientWebapp/w... Date: Thu, 16 Aug 2012 20:56:10 -0000 To: commits@cxf.apache.org From: gmazza@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120816205611.0293B23889C5@eris.apache.org> Author: gmazza Date: Thu Aug 16 20:56:10 2012 New Revision: 1374051 URL: http://svn.apache.org/viewvc?rev=1374051&view=rev Log: POM refactoring to make Fediz examples unique in Eclipse Modified: cxf/fediz/trunk/examples/pom.xml cxf/fediz/trunk/examples/simpleWebapp/pom.xml cxf/fediz/trunk/examples/wsclientWebapp/pom.xml cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml Modified: cxf/fediz/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/pom.xml (original) +++ cxf/fediz/trunk/examples/pom.xml Thu Aug 16 20:56:10 2012 @@ -16,22 +16,23 @@ specific language governing permissions and limitations under the License. --> - + - 4.0.0 - - org.apache.cxf.fediz - fediz - 1.0.1-SNAPSHOT - ../pom.xml - - org.apache.cxf.fediz.examples - examples - Apache Fediz examples - pom + 4.0.0 + + org.apache.cxf.fediz + fediz + 1.0.1-SNAPSHOT + ../pom.xml + + org.apache.cxf.fediz + examples + Apache CXF Fediz Examples + pom - - simpleWebapp - wsclientWebapp - + + simpleWebapp + wsclientWebapp + Modified: cxf/fediz/trunk/examples/simpleWebapp/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/simpleWebapp/pom.xml (original) +++ cxf/fediz/trunk/examples/simpleWebapp/pom.xml Thu Aug 16 20:56:10 2012 @@ -17,33 +17,26 @@ specific language governing permissions and limitations under the License. --> - + - 4.0.0 - - org.apache.cxf.fediz.examples - examples - 1.0.1-SNAPSHOT - - - org.apache.cxf.fediz.examples - simpleWebapp - Apache Fediz Examples - Webapp Simple - war - - - UTF-8 - - - - + 4.0.0 + + org.apache.cxf.fediz + examples + 1.0.1-SNAPSHOT + + + org.apache.cxf.fediz.examples.simpleWebapp + simpleWebapp + Fediz Example: SimpleWebapp + war + + + UTF-8 + + + javax.servlet servlet-api @@ -52,42 +45,30 @@ - org.apache.cxf.fediz - fediz-core - ${project.version} - provided + org.apache.cxf.fediz + fediz-core + ${project.version} + provided - org.apache.commons - commons-lang3 - 3.0.1 + org.apache.commons + commons-lang3 + 3.0.1 - + org.codehaus.mojo tomcat-maven-plugin - 2.0-SNAPSHOT + 1.1 - myTomcat - http://localhost:8080/manager/text - ${project.build.finalName}.war + myTomcat + http://localhost:8080/manager/text + /${project.build.finalName} - --> - - org.codehaus.mojo - tomcat-maven-plugin - 1.1 - - myTomcat - http://localhost:8080/manager/text - /${project.build.finalName} - - fedizhelloworld Modified: cxf/fediz/trunk/examples/wsclientWebapp/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/wsclientWebapp/pom.xml (original) +++ cxf/fediz/trunk/examples/wsclientWebapp/pom.xml Thu Aug 16 20:56:10 2012 @@ -16,22 +16,23 @@ specific language governing permissions and limitations under the License. --> - + - 4.0.0 - - org.apache.cxf.fediz.examples - examples - 1.0.1-SNAPSHOT - - org.apache.cxf.fediz.examples + 4.0.0 + + org.apache.cxf.fediz + examples + 1.0.1-SNAPSHOT + + org.apache.cxf.fediz.examples.wsclientWebapp wsclientWebapp - Apache Fediz Examples - Webapp WS Client - pom + Fediz Example: WSClientWebapp + pom - - webservice - webapp - + + webservice + webapp + Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original) +++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Thu Aug 16 20:56:10 2012 @@ -17,132 +17,121 @@ specific language governing permissions and limitations under the License. --> - + - 4.0.0 - - org.apache.cxf.fediz.examples - wsclientWebapp - 1.0.1-SNAPSHOT - - webapp - Apache Fediz Examples - Webapp WS Client - Webapp - war + 4.0.0 + + org.apache.cxf.fediz.examples.wsclientWebapp + wsclientWebapp + 1.0.1-SNAPSHOT + + wsclientWebapp-webapp + Fediz Example: WSClientWebapp (webapp) + war - - UTF-8 - + + UTF-8 + - - - org.apache.cxf.fediz.examples.webservice - service-common - ${project.version} - - - javax.servlet - servlet-api - 2.5 - provided - - - org.apache.tomcat - tomcat-catalina - ${tomcat.version} - provided - - - - org.apache.cxf.fediz - fediz-core - ${project.version} - provided - - - org.apache.commons - commons-lang3 - 3.0.1 - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-policy - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-security - ${cxf.version} - - - xmlsec - org.apache.santuario - - - wss4j - org.apache.ws.security - - - ehcache-core - net.sf.ehcache - - - - - org.apache.cxf - cxf-rt-transports-http-jetty - ${cxf.version} - - - org.springframework - spring-context - ${spring.version} - jar - compile - - - org.springframework - spring-web - ${spring.version} - jar - compile - - - org.slf4j - slf4j-api - ${slf4j.version} - compile - - + + + org.apache.cxf.fediz.examples.wsclientWebapp + wsclientWebapp-webservice-common + ${project.version} + + + javax.servlet + servlet-api + 2.5 + provided + + + org.apache.tomcat + tomcat-catalina + ${tomcat.version} + provided + + + + org.apache.cxf.fediz + fediz-core + ${project.version} + provided + + + org.apache.commons + commons-lang3 + 3.0.1 + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-policy + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-security + ${cxf.version} + + + xmlsec + org.apache.santuario + + + wss4j + org.apache.ws.security + + + ehcache-core + net.sf.ehcache + + + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf.version} + + + org.springframework + spring-context + ${spring.version} + jar + compile + + + org.springframework + spring-web + ${spring.version} + jar + compile + + + org.slf4j + slf4j-api + ${slf4j.version} + compile + + - + org.codehaus.mojo tomcat-maven-plugin - 2.0-SNAPSHOT + 1.1 - myTomcat - http://localhost:8080/manager/text - ${project.build.finalName}.war + myTomcat + http://localhost:8080/manager/text + /${project.build.finalName} - --> - - org.codehaus.mojo - tomcat-maven-plugin - 1.1 - - myTomcat - http://localhost:8080/manager/text - /${project.build.finalName} - - fedizhelloworld Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original) +++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Aug 16 20:56:10 2012 @@ -66,7 +66,6 @@ public class FederationServlet extends H out.println("Request url: " + request.getRequestURL().toString() + "

"); - out.println("
User

"); Principal p = request.getUserPrincipal(); if (p != null) { @@ -101,7 +100,7 @@ public class FederationServlet extends H StringWriter buffer = new StringWriter(); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.transform(new DOMSource(el), - new StreamResult(buffer)); + new StreamResult(buffer)); token = buffer.toString(); out.println("

" + StringEscapeUtils.escapeXml(token)); } catch (Exception ex) { Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml (original) +++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml Thu Aug 16 20:56:10 2012 @@ -16,17 +16,17 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 - org.apache.cxf.fediz.examples - webservice - 1.0.1-SNAPSHOT + org.apache.cxf.fediz.examples.wsclientWebapp + wsclientWebapp-webservice + 1.0.1-SNAPSHOT - org.apache.cxf.fediz.examples.webservice - service-common - Apache Fediz Examples - Webapp WS Client - Web Service Common + wsclientWebapp-webservice-common + Fediz Example: WSClientWebapp (web service common) jar Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml (original) +++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/pom.xml Thu Aug 16 20:56:10 2012 @@ -16,16 +16,17 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 - org.apache.cxf.fediz.examples - wsclientWebapp - 1.0.1-SNAPSHOT + org.apache.cxf.fediz.examples.wsclientWebapp + wsclientWebapp + 1.0.1-SNAPSHOT - webservice - Apache Fediz Examples - Webapp WS Client - Web Service + wsclientWebapp-webservice + Fediz Example: WSClientWebapp (web service) pom Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml?rev=1374051&r1=1374050&r2=1374051&view=diff ============================================================================== --- cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml (original) +++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml Thu Aug 16 20:56:10 2012 @@ -16,97 +16,97 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 - - org.apache.cxf.fediz.examples - webservice - 1.0.1-SNAPSHOT - - org.apache.cxf.fediz.examples.webservice - service-war - Apache Fediz Examples - Webapp WS Client - Web Service Implementation - war + + org.apache.cxf.fediz.examples.wsclientWebapp + wsclientWebapp-webservice + 1.0.1-SNAPSHOT + + wsclientWebapp-webservice-war + Fediz Example: WSClientWebapp (web service WAR) + war - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - - src/main/webapp - - - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.1 - - myTomcat - http://localhost:10080/manager/text - /${project.build.finalName} - - - - fedizservice - - - - org.apache.cxf.fediz.examples.webservice - service-common - ${project.version} - + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + + src/main/webapp + + + + + + org.codehaus.mojo + tomcat-maven-plugin + 1.1 + + myTomcat + http://localhost:10080/manager/text + /${project.build.finalName} + + + + fedizservice + + + + org.apache.cxf.fediz.examples.wsclientWebapp + wsclientWebapp-webservice-common + ${project.version} + - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http-jetty - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-addr - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-policy - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-security - ${cxf.version} - - - org.slf4j - slf4j-jdk14 - ${slf4j.version} - runtime - - - org.springframework - spring-context - ${spring.version} - jar - compile - - - org.springframework - spring-web - ${spring.version} - jar - compile - - + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-addr + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-policy + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-security + ${cxf.version} + + + org.slf4j + slf4j-jdk14 + ${slf4j.version} + runtime + + + org.springframework + spring-context + ${spring.version} + jar + compile + + + org.springframework + spring-web + ${spring.version} + jar + compile + +