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 7E3A6990F for ; Fri, 23 Mar 2012 15:15:23 +0000 (UTC) Received: (qmail 83787 invoked by uid 500); 23 Mar 2012 15:15:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 83737 invoked by uid 500); 23 Mar 2012 15:15:23 -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 83729 invoked by uid 99); 23 Mar 2012 15:15:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 15:15:23 +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; Fri, 23 Mar 2012 15:15:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6D53F238899C; Fri, 23 Mar 2012 15:15:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1304411 - in /cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank: ./ src/cxf/client/ src/cxf/server/ src/main/ src/main/java/ src/main/java/cxf/ src/main/java/cxf/client/ src/main/java/cxf/server/ src/main/resources/... Date: Fri, 23 Mar 2012 15:15:00 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120323151500.6D53F238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Mar 23 15:14:59 2012 New Revision: 1304411 URL: http://svn.apache.org/viewvc?rev=1304411&view=rev Log: Merged revisions 1303123 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1303123 | dkulp | 2012-03-20 16:09:09 -0400 (Tue, 20 Mar 2012) | 3 lines Update corba/bank sample to use maven. README update will follow later. ........ Added: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml (with props) cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java (contents, props changed) - copied, changed from r1304287, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/client/Client.java cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java (contents, props changed) - copied, changed from r1304287, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/BankImpl.java cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java (contents, props changed) - copied, changed from r1304287, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/Server.java cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl (with props) Removed: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/build.xml cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/client/Client.java cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/BankImpl.java cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/Server.java Added: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml?rev=1304411&view=auto ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml (added) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml Fri Mar 23 15:14:59 2012 @@ -0,0 +1,159 @@ + + + 4.0.0 + org.apache.cxf.samples + corba-bank + jar + + Bank sample using JAX-WS API's to talk via CORBA/IIOP + Bank sample using JAX-WS API's to talk via CORBA/IIOP + 2.6.0-SNAPSHOT + + + org.apache.cxf.samples + cxf-samples + 2.6.0-SNAPSHOT + ../.. + + + ${project.version} + ${basedir}/../../.. + + + install + + + + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + org.apache.cxf + cxf-codegen-plugin + ${project.version} + + + generate-sources + generate-sources + + + + src/main/resources/wsdl/bank.wsdl + + bank.common + + + + + + wsdl2java + + + + + + + + + server + + test + + + org.codehaus.mojo + exec-maven-plugin + + + test + + java + + + cxf.server.Server + + + + + + + + + client + + test + + + org.codehaus.mojo + exec-maven-plugin + + + test + + java + + + cxf.client.Client + + src/main/resources/wsdl/bank.wsdl + + + + + + + + + + + + + org.apache.cxf + cxf-rt-frontend-jaxws + 2.6.0-SNAPSHOT + + + org.apache.cxf + cxf-rt-bindings-corba + 2.6.0-SNAPSHOT + + + org.apache.cxf + cxf-tools-common + 2.6.0-SNAPSHOT + + + org.springframework + spring-context + 3.0.6.RELEASE + + + junit + junit + 4.7 + compile + + + Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java (from r1304287, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/client/Client.java) URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/client/Client.java&r1=1304287&r2=1304411&rev=1304411&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/client/Client.java (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java Fri Mar 23 15:14:59 2012 @@ -36,7 +36,7 @@ public final class Client { } public static void main(String args[]) throws Exception { - URL wsdlUrl = new URL("file:./../resources/bank.wsdl"); + URL wsdlUrl = Client.class.getResource("/wsdl/bank.wsdl"); BankCORBAService ss = new BankCORBAService(wsdlUrl, SERVICE_NAME); Bank port = ss.getBankCORBAPort(); Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java (from r1304287, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/BankImpl.java) URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/BankImpl.java&r1=1304287&r2=1304411&rev=1304411&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/BankImpl.java (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java Fri Mar 23 15:14:59 2012 @@ -30,7 +30,7 @@ import bank.common.Bank; @javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService", targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/bank", - wsdlLocation = "file:../resources/bank.wsdl", + wsdlLocation = "classpath:/wsdl/bank.wsdl", endpointInterface = "bank.common.Bank") public class BankImpl implements Bank { Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java (from r1304287, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/Server.java) URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/Server.java&r1=1304287&r2=1304411&rev=1304411&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/cxf/server/Server.java (original) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java Fri Mar 23 15:14:59 2012 @@ -26,7 +26,7 @@ public class Server { System.out.println("Starting Server"); Object implementor = new BankImpl(); - String address = "file:./build/bank.ref"; + String address = "file:target/bank.ref"; Endpoint endpoint = Endpoint.create("http://cxf.apache.org/bindings/corba", implementor); endpoint.publish(address); Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl?rev=1304411&view=auto ============================================================================== --- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl (added) +++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl Fri Mar 23 15:14:59 2012 @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/bank/src/main/resources/wsdl/bank.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml