Author: dkulp Date: Tue Jun 16 17:17:35 2009 New Revision: 785305 URL: http://svn.apache.org/viewvc?rev=785305&view=rev Log: Merged revisions 785293 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r785293 | dkulp | 2009-06-16 13:02:54 -0400 (Tue, 16 Jun 2009) | 9 lines Merged revisions 784895 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r784895 | dkulp | 2009-06-15 14:11:32 -0400 (Mon, 15 Jun 2009) | 1 line Fix PMD/checkstyle errors on all the samples ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/demo/handlers/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/README.txt cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/apache/cxf/demo/complex/ComplexImpl.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 16 17:17:35 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java Tue Jun 16 17:17:35 2009 @@ -19,10 +19,11 @@ package demo.hw.client; -import demo.hw.server.HelloWorld; import org.apache.cxf.aegis.databinding.AegisDatabinding; import org.apache.cxf.frontend.ClientProxyFactoryBean; +import demo.hw.server.HelloWorld; + public final class Client { private Client() { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java Tue Jun 16 17:17:35 2009 @@ -29,7 +29,6 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; -import javanet.staxutils.IndentingXMLStreamWriter; import org.apache.cxf.aegis.AegisContext; import org.apache.cxf.aegis.AegisWriter; @@ -37,6 +36,8 @@ import org.apache.cxf.demo.aegis.types.Animal; import org.apache.cxf.demo.aegis.types.Zoo; +import javanet.staxutils.IndentingXMLStreamWriter; + /** * */ Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java Tue Jun 16 17:17:35 2009 @@ -21,14 +21,15 @@ import java.util.Properties; +import org.omg.CORBA.ORB; +import org.omg.CORBA.UserException; + + import corba.common.Account; import corba.common.AccountHelper; import corba.common.Bank; import corba.common.BankHelper; -import org.omg.CORBA.ORB; -import org.omg.CORBA.UserException; - public final class Client { private Client() { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java Tue Jun 16 17:17:35 2009 @@ -19,9 +19,10 @@ package corba.server; +import org.omg.PortableServer.POA; + import corba.common.AccountPOA; -import org.omg.PortableServer.POA; Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java Tue Jun 16 17:17:35 2009 @@ -22,11 +22,12 @@ import java.util.HashMap; import java.util.Map; +import org.omg.PortableServer.POA; + import corba.common.Account; import corba.common.AccountHelper; import corba.common.BankPOA; -import org.omg.PortableServer.POA; public class BankImpl extends BankPOA { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java Tue Jun 16 17:17:35 2009 @@ -21,8 +21,6 @@ import java.util.Properties; -import corba.common.BankHelper; - import org.omg.CORBA.ORB; import org.omg.CORBA.UserException; import org.omg.CosNaming.NameComponent; @@ -32,6 +30,8 @@ import org.omg.PortableServer.POAHelper; import org.omg.PortableServer.POAManager; +import corba.common.BankHelper; + public final class Server { private Server() { //not created Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/client/Client.java Tue Jun 16 17:17:35 2009 @@ -18,10 +18,10 @@ */ package demo.spring.client; +import org.springframework.context.support.ClassPathXmlApplicationContext; -import demo.spring.HelloWorld; -import org.springframework.context.support.ClassPathXmlApplicationContext; +import demo.spring.HelloWorld; public final class Client { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/Client.java Tue Jun 16 17:17:35 2009 @@ -22,12 +22,14 @@ import java.io.File; import java.net.URL; import javax.xml.namespace.QName; -import demo.colocated.server.Server; + import org.apache.hello_world_soap_http.Greeter; import org.apache.hello_world_soap_http.PingMeFault; import org.apache.hello_world_soap_http.SOAPService; import org.apache.hello_world_soap_http.types.FaultDetail; +import demo.colocated.server.Server; + public final class Client { private static final QName SERVICE_NAME Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_pojo/src/demo/hw/client/Client.java Tue Jun 16 17:17:35 2009 @@ -19,9 +19,8 @@ package demo.hw.client; -import demo.hw.server.HelloWorld; -//import org.apache.cxf.aegis.databinding.AegisDatabinding; import org.apache.cxf.frontend.ClientProxyFactoryBean; +import demo.hw.server.HelloWorld; public final class Client { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/client/Client.java Tue Jun 16 17:17:35 2009 @@ -18,10 +18,10 @@ */ package demo.spring.client; +import org.springframework.context.support.ClassPathXmlApplicationContext; -import demo.spring.HelloWorld; -import org.springframework.context.support.ClassPathXmlApplicationContext; +import demo.spring.HelloWorld; public final class Client { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/demo/handlers/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/demo/handlers/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/demo/handlers/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/demo/handlers/client/Client.java Tue Jun 16 17:17:35 2009 @@ -28,11 +28,12 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.handler.Handler; -import demo.handlers.common.SmallNumberHandler; import org.apache.handlers.AddNumbers; import org.apache.handlers.AddNumbersFault; import org.apache.handlers.AddNumbersService; +import demo.handlers.common.SmallNumberHandler; + public final class Client { static QName serviceName = new QName("http://apache.org/handlers";, Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/client/Client.java Tue Jun 16 17:17:35 2009 @@ -19,10 +19,10 @@ package demo.spring.client; -import demo.spring.HelloWorld; - import org.springframework.context.support.ClassPathXmlApplicationContext; +import demo.spring.HelloWorld; + public final class Client { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/README.txt URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/README.txt?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/README.txt (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/README.txt Tue Jun 16 17:17:35 2009 @@ -131,13 +131,13 @@ For UNIX: - export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/celtix.jar:./build/classes + export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf-manifest.jar:./build/classes javac -d build/classes src/demo/ws_rm/common/*.java javac -d build/classes src/demo/ws_rm/client/*.java javac -d build/classes src/demo/ws_rm/server/*.java For Windows: - set classpath=%classpath%;%CXF_HOME%\lib\celtix.jar;.\build\classes + set classpath=%classpath%;%CXF_HOME%\lib\cxf-manifest.jar;.\build\classes javac -d build\classes src\demo\ws_rm\common\*.java javac -d build\classes src\demo\ws_rm\client\*.java javac -d build\classes src\demo\ws_rm\server\*.java Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/ws_rm/src/demo/ws_rm/client/Client.java Tue Jun 16 17:17:35 2009 @@ -22,13 +22,13 @@ import java.lang.reflect.UndeclaredThrowableException; import java.net.URL; -import demo.ws_rm.common.MessageLossSimulator; - import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.hello_world_soap_http.Greeter; import org.apache.cxf.hello_world_soap_http.GreeterService; +import demo.ws_rm.common.MessageLossSimulator; + public final class Client { Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/apache/cxf/demo/complex/ComplexImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/apache/cxf/demo/complex/ComplexImpl.java?rev=785305&r1=785304&r2=785305&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/apache/cxf/demo/complex/ComplexImpl.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/apache/cxf/demo/complex/ComplexImpl.java Tue Jun 16 17:17:35 2009 @@ -19,12 +19,13 @@ package org.apache.cxf.demo.complex; -import agentwsresponse.agent.legacysystemservices.schemas.hitum.esb.company.AgentWSResponse; import com.company.application.CompanyESBApplicationBiztalkAgentDetails4405AgentDetailsPrtSoap; import com.company.application.GetAgentDetails; import com.company.application.GetAgentDetailsResponse; +import agentwsresponse.agent.legacysystemservices.schemas.hitum.esb.company.AgentWSResponse; + /** * This is a trivial implementation of a service contributed in a bug report. It's useful * as an example of a hard case of using dynamic client.
