Author: dkulp Date: Wed Dec 1 21:20:24 2010 New Revision: 1041174 URL: http://svn.apache.org/viewvc?rev=1041174&view=rev Log: Merged revisions 1041122 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1041122 | dkulp | 2010-12-01 13:39:37 -0500 (Wed, 01 Dec 2010) | 11 lines Merged revisions 1041119 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1041119 | dkulp | 2010-12-01 13:30:58 -0500 (Wed, 01 Dec 2010) | 3 lines Fix builds with latest eclipse checkstyle plugin ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml cxf/branches/2.2.x-fixes/parent/pom.xml cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml (original) +++ cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml Wed Dec 1 21:20:24 2010 @@ -86,7 +86,7 @@ <module name="UnusedImports" /> <module name="ImportOrder"> <property name="groups" - value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,org.junit,*" /> + value="java,javax,org.w3c,org.xml,junit,antlr,com,net,org,*" /> <property name="ordered" value="true" /> </module> <!-- Modified: cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml (original) +++ cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml Wed Dec 1 21:20:24 2010 @@ -81,7 +81,7 @@ <module name="UnusedImports" /> <module name="ImportOrder"> <property name="groups" - value="java,javax,org.w3c,org.xml,junit,antlr,com.,net,org,org.junit,*" /> + value="java,javax,org.w3c,org.xml,junit,antlr,com.,net,org,*" /> <property name="ordered" value="true" /> </module> <!-- Modified: cxf/branches/2.2.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.2.x-fixes/parent/pom.xml Wed Dec 1 21:20:24 2010 @@ -164,6 +164,11 @@ <version>2.6</version> <dependencies> <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>5.2</version> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-buildtools</artifactId> <version>${project.version}</version> Modified: cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java Wed Dec 1 21:20:24 2010 @@ -26,21 +26,23 @@ import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; import javax.xml.ws.WebServiceFeature; -//CHECKSTYLE:OFF @WebServiceClient(name = "AddNumbersService", wsdlLocation = "/wsdl/addNumbers.wsdl", targetNamespace = "http://apache.org/handlers";) public class AddNumbersServiceUnwrap extends Service { - public final static URL WSDL_LOCATION; - public final static QName SERVICE = new QName("http://apache.org/handlers";, "AddNumbersService"); - public final static QName AddNumbersPort = new QName("http://apache.org/handlers";, "AddNumbersPort"); + public static final URL WSDL_LOCATION; + public static final QName SERVICE = new QName("http://apache.org/handlers";, + "AddNumbersService"); + public static final QName ADD_NUMBERS_PORT = new QName("http://apache.org/handlers";, + "AddNumbersPort"); static { URL url = null; try { url = new URL("/wsdl/addNumbers.wsdl"); } catch (MalformedURLException e) { - System.err.println("Can not initialize the default wsdl from file:/home/sberyozkin/work/cxf/trunk/testutils/src/main/resources/wsdl/addNumbers.wsdl"); + System.err.println("Can not initialize the default wsdl " + + "from file:testutils/src/main/resources/wsdl/addNumbers.wsdl"); // e.printStackTrace(); } WSDL_LOCATION = url; @@ -66,20 +68,21 @@ public class AddNumbersServiceUnwrap ext */ @WebEndpoint(name = "AddNumbersPort") public AddNumbersUnwrap getAddNumbersPort() { - return super.getPort(AddNumbersPort, AddNumbersUnwrap.class); + return super.getPort(ADD_NUMBERS_PORT, AddNumbersUnwrap.class); } /** * * @param features - * A list of {...@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * A list of {...@link javax.xml.ws.WebServiceFeature} to configure on the + * proxy. Supported features not in the <code>features</code> parameter + * will have their default values. * @return * returns AddNumbers */ @WebEndpoint(name = "AddNumbersPort") public AddNumbersUnwrap getAddNumbersPort(WebServiceFeature... features) { - return super.getPort(AddNumbersPort, AddNumbersUnwrap.class, features); + return super.getPort(ADD_NUMBERS_PORT, AddNumbersUnwrap.class, features); } } -//CHECKSTYLE:ON \ No newline at end of file Modified: cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AddNumbersUnwrap.java Wed Dec 1 21:20:24 2010 @@ -42,4 +42,4 @@ public interface AddNumbersUnwrap { int arg1 ); } -//CHECKSTYLE:ON \ No newline at end of file +//CHECKSTYLE:ON Modified: cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbers.java Wed Dec 1 21:20:24 2010 @@ -90,4 +90,4 @@ public class AddNumbers { } } -//CHECKSTYLE:ON \ No newline at end of file +//CHECKSTYLE:ON Modified: cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/AddNumbersResponse.java Wed Dec 1 21:20:24 2010 @@ -74,4 +74,4 @@ public class AddNumbersResponse { } } -//CHECKSTYLE:ON \ No newline at end of file +//CHECKSTYLE:ON Modified: cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/types/package-info.java Wed Dec 1 21:20:24 2010 @@ -1,4 +1,21 @@ -//CHECKSTYLE:OFF [email protected](namespace = "http://apache.org/handlers/types";, elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +/** + * 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. + */ [email protected](namespace = "http://apache.org/handlers/types";, + elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.cxf.systest.handlers.types; -//CHECKSTYLE:ON \ No newline at end of file Modified: cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java (original) +++ cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customer.java Wed Dec 1 21:20:24 2010 @@ -38,4 +38,4 @@ public class Customer { this.name = name; } } -// END SNIPPET: bean \ No newline at end of file +// END SNIPPET: bean Modified: cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java?rev=1041174&r1=1041173&r2=1041174&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java (original) +++ cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/customer/Customers.java Wed Dec 1 21:20:24 2010 @@ -36,4 +36,5 @@ public class Customers { this.customers = c; } } -// END SNIPPET: bean \ No newline at end of file +// END SNIPPET: bean +
