Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 51804 invoked from network); 15 Oct 2009 16:02:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Oct 2009 16:02:53 -0000 Received: (qmail 78800 invoked by uid 500); 15 Oct 2009 16:02:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 78731 invoked by uid 500); 15 Oct 2009 16:02:53 -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 78722 invoked by uid 99); 15 Oct 2009 16:02:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Oct 2009 16:02:53 +0000 X-ASF-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL,BAYES_00 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, 15 Oct 2009 16:02:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D9EC2388907; Thu, 15 Oct 2009 16:02:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r825538 - in /cxf/branches/2.2.x-fixes: ./ systests/ systests/wsdl_maven/ systests/wsdl_maven/codegen/ systests/wsdl_maven/java2ws/ systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/ Date: Thu, 15 Oct 2009 16:02:30 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091015160230.9D9EC2388907@eris.apache.org> Author: dkulp Date: Thu Oct 15 16:02:29 2009 New Revision: 825538 URL: http://svn.apache.org/viewvc?rev=825538&view=rev Log: Merged revisions 823260,823314,823870-823871,823940 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r823260 | cschneider | 2009-10-08 14:34:35 -0400 (Thu, 08 Oct 2009) | 1 line Activate wsdl_maven systest ........ r823314 | cschneider | 2009-10-08 16:41:00 -0400 (Thu, 08 Oct 2009) | 1 line Added parent to poms and license header to java class ........ r823870 | cschneider | 2009-10-10 11:23:38 -0400 (Sat, 10 Oct 2009) | 1 line ignore some resources ........ r823871 | cschneider | 2009-10-10 11:26:28 -0400 (Sat, 10 Oct 2009) | 1 line Added wsdldocumentation and webparam annotation ........ r823940 | cschneider | 2009-10-10 17:17:32 -0400 (Sat, 10 Oct 2009) | 1 line Corrected indentation ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/systests/pom.xml cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/ (props changed) cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/ (props changed) cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 15 16:02:29 2009 @@ -1 +1 @@ -/cxf/trunk:825284 +/cxf/trunk:823260-823314,823870-823940,825284 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/systests/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/pom.xml?rev=825538&r1=825537&r2=825538&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/pom.xml Thu Oct 15 16:02:29 2009 @@ -38,6 +38,7 @@ databinding jaxrs ws-specs + wsdl_maven Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Oct 15 16:02:29 2009 @@ -1,2 +1,12 @@ .settings target + +.project + +.classpath + +.pmd + +.checkstyle + +.ruleset Modified: cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml?rev=825538&r1=825537&r2=825538&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/wsdl_maven/codegen/pom.xml Thu Oct 15 16:02:29 2009 @@ -20,18 +20,17 @@ 4.0.0 org.apache.cxf.systests.wsdl_maven cxf-systests-codegen - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT Test for reading wsdl from repo and generating code from it + + org.apache.cxf + cxf-parent + 2.2.5-SNAPSHOT + ../../../parent/pom.xml + - maven-compiler-plugin - - 1.5 - 1.5 - - - org.apache.cxf cxf-codegen-plugin ${project.version} @@ -43,10 +42,10 @@ - org.apache.cxf.systests.wsdl_maven - cxf-systests-java2ws - ${project.version} - + org.apache.cxf.systests.wsdl_maven + cxf-systests-java2ws + ${project.version} + Propchange: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Oct 15 16:02:29 2009 @@ -2,3 +2,9 @@ .project .settings target + +.checkstyle + +.pmd + +.ruleset Modified: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml?rev=825538&r1=825537&r2=825538&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/pom.xml Thu Oct 15 16:02:29 2009 @@ -20,18 +20,16 @@ 4.0.0 org.apache.cxf.systests.wsdl_maven cxf-systests-java2ws - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT Test for writing wsdl to repo + + org.apache.cxf + cxf-parent + 2.2.5-SNAPSHOT + ../../../parent/pom.xml + - - maven-compiler-plugin - - 1.5 - 1.5 - - - org.apache.cxf cxf-java2ws-plugin Modified: cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java?rev=825538&r1=825537&r2=825538&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java (original) +++ cxf/branches/2.2.x-fixes/systests/wsdl_maven/java2ws/src/main/java/org/apache/cxf/systests/java2ws/HelloWorld.java Thu Oct 15 16:02:29 2009 @@ -1,9 +1,29 @@ +/** + * 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. + */ + package org.apache.cxf.systests.java2ws; +import javax.jws.WebParam; import javax.jws.WebService; + @WebService public interface HelloWorld { - String sayHi(String text); + String sayHi(@WebParam(name = "text") String text); } - Modified: cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml?rev=825538&r1=825537&r2=825538&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml (original) +++ cxf/branches/2.2.x-fixes/systests/wsdl_maven/pom.xml Thu Oct 15 16:02:29 2009 @@ -21,14 +21,14 @@ org.apache.cxf.systests cxf-wsdl-maven pom - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT Apache CXF System Tests for WSDL generation and retrieval http://cxf.apache.org org.apache.cxf.systests cxf-systests - 2.2.4-SNAPSHOT + 2.2.5-SNAPSHOT