cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r636943 - in /incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src: corba/client/ corba/server/ yoko/client/ yoko/server/
Date Fri, 14 Mar 2008 00:59:16 GMT
Author: dkulp
Date: Thu Mar 13 17:59:14 2008
New Revision: 636943

URL: http://svn.apache.org/viewvc?rev=636943&view=rev
Log:
Fix the checkstyle stuff

Added:
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java
      - copied, changed from r636942, incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java
      - copied, changed from r636942, incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java
Removed:
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java
Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java?rev=636943&r1=636942&r2=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java
Thu Mar 13 17:59:14 2008
@@ -21,15 +21,19 @@
 
 import java.util.Properties;
 
+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;
 
-import corba.common.Bank;
-import corba.common.BankHelper;
-import corba.common.Account;
-import corba.common.AccountHelper;
 
-public class Client {
+public final class Client {
+    private Client() {
+        //not constructed
+    }
     static int run(ORB orb, String[] args) throws UserException {
         
         // Get the Bank object
@@ -100,17 +104,15 @@
         try {
             orb = ORB.init(args, props);
             status = run(orb, args);
-        }
-        catch(Exception ex) {
+        } catch (Exception ex) {
             ex.printStackTrace();
             status = 1;
         }
 
-        if(orb != null) {
+        if (orb != null) {
             try {
                 orb.destroy();
-            }
-            catch(Exception ex) {
+            } catch (Exception ex) {
                 ex.printStackTrace();
                 status = 1;
             }

Copied: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java
(from r636942, incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java&r1=636942&r2=636943&rev=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/AccountImpl.java
Thu Mar 13 17:59:14 2008
@@ -19,19 +19,20 @@
 
 package corba.server;
 
+import corba.common.AccountPOA;
+
 import org.omg.PortableServer.POA;
 
-import corba.common.AccountPOA;
 
 
-public class Account_impl extends AccountPOA {
+public class AccountImpl extends AccountPOA {
     
     // The servants default POA
     private POA poa_;
 
     private float balance;
     
-    public Account_impl(POA poa) {
+    public AccountImpl(POA poa) {
         poa_ = poa;
         
         balance = 0.0f;

Copied: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java
(from r636942, incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java?p2=incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java&p1=incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java&r1=636942&r2=636943&rev=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/BankImpl.java
Thu Mar 13 17:59:14 2008
@@ -22,33 +22,33 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.omg.CORBA.ORB;
-import org.omg.PortableServer.POA;
-
 import corba.common.Account;
 import corba.common.AccountHelper;
 import corba.common.BankPOA;
-public class Bank_impl extends BankPOA {
+
+import org.omg.PortableServer.POA;
+
+public class BankImpl extends BankPOA {
     
     private POA poa_;
 
     private Map<String, Account> accountList;
     
-    Bank_impl(POA poa) {
+    BankImpl(POA poa) {
         poa_ = poa;
 
         accountList = new HashMap<String, Account>();
     }
 
-    public Account create_account(String account_name) {
-        if (accountList.containsKey(account_name)) {
-            return accountList.get(account_name);
+    public Account create_account(String accountName) {
+        if (accountList.containsKey(accountName)) {
+            return accountList.get(accountName);
         }
         
-        System.out.println("[Bank] Called create_account( " + account_name + " )...");
+        System.out.println("[Bank] Called create_account( " + accountName + " )...");
         System.out.println();        
-        Account_impl accountImpl = new Account_impl(poa_);
-        String name = "Account-" + account_name;
+        AccountImpl accountImpl = new AccountImpl(poa_);
+        String name = "Account-" + accountName;
         byte[] oid = name.getBytes();       
         try {
             poa_.activate_object_with_id(oid, accountImpl);
@@ -59,19 +59,19 @@
         org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
         Account account = AccountHelper.narrow(obj);
 
-        accountList.put(account_name, account);
+        accountList.put(accountName, account);
         return account;
     }
 
-    public org.omg.CORBA.Object create_epr_account(String account_name) {
-        System.out.println("[Bank] Called create_epr_account( " + account_name + ")...");
+    public org.omg.CORBA.Object create_epr_account(String accountName) {
+        System.out.println("[Bank] Called create_epr_account( " + accountName + ")...");
         System.out.println();
         /*Account_impl accountImpl = new Account_impl(poa_);
         Account account = accountImpl._this(orb_);
         accountList.put(account_name, account);*/
 
-        Account_impl accountImpl = new Account_impl(poa_);
-        String name = "Account-" + account_name;
+        AccountImpl accountImpl = new AccountImpl(poa_);
+        String name = "Account-" + accountName;
         byte[] oid = name.getBytes();       
         try {
             poa_.activate_object_with_id(oid, accountImpl);
@@ -82,39 +82,39 @@
         org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
         Account account = AccountHelper.narrow(obj);
 
-        accountList.put(account_name, account);
+        accountList.put(accountName, account);
         return account;
     }
 
-    public Account get_account(String account_name) {
-        System.out.println("[Bank] Called get_account( " + account_name + ")...");
+    public Account get_account(String accountName) {
+        System.out.println("[Bank] Called get_account( " + accountName + ")...");
         System.out.println();
-        return accountList.get(account_name);
+        return accountList.get(accountName);
     }
 
-    public org.omg.CORBA.Object get_epr_account(String account_name) {
-        System.out.println("[Bank] Called get_epr_account( " + account_name + ")...");
+    public org.omg.CORBA.Object get_epr_account(String accountName) {
+        System.out.println("[Bank] Called get_epr_account( " + accountName + ")...");
         System.out.println();
-        return accountList.get(account_name);
+        return accountList.get(accountName);
     }
 
     // TODO: What is the correct implementation for this operation?
-    public org.omg.CORBA.Object get_account_epr_with_no_use_attribute(String account_name)
{
-        System.out.println("[Bank] Called get_epr_with_no_use_attribute( " + account_name
+ " )...");
+    public org.omg.CORBA.Object get_account_epr_with_no_use_attribute(String accountName)
{
+        System.out.println("[Bank] Called get_epr_with_no_use_attribute( " + accountName
+ " )...");
         System.out.println();
         return null;
     }
 
     // TODO: What is the correct implementation for this operation?
-    public void find_account(org.omg.CORBA.AnyHolder account_details) {
+    public void find_account(org.omg.CORBA.AnyHolder accountDetails) {
         System.out.println("[Bank] Called find_account (account_details)...");
         System.out.println();
     }
 
-    public void remove_account(String account_name) {
-        System.out.println("[Bank] Called remove_account ( " + account_name + ")...");
+    public void remove_account(String accountName) {
+        System.out.println("[Bank] Called remove_account ( " + accountName + ")...");
         System.out.println();
-        accountList.remove(account_name);
+        accountList.remove(accountName);
     }
     
     public POA _default_POA() {

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java?rev=636943&r1=636942&r2=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java
Thu Mar 13 17:59:14 2008
@@ -21,6 +21,8 @@
 
 import java.util.Properties;
 
+import corba.common.BankHelper;
+
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.UserException;
 import org.omg.CosNaming.NameComponent;
@@ -30,13 +32,13 @@
 import org.omg.PortableServer.POAHelper;
 import org.omg.PortableServer.POAManager;
 
-import corba.common.BankHelper;
-
-public class Server
-{
-    static int
-    run(ORB orb, String[] args) throws UserException
-    {
+public final class Server {
+    private Server() {
+        //not created
+    }
+    
+    
+    static int run(ORB orb, String[] args) throws UserException {
         //
         // Resolve Root POA
         //
@@ -50,7 +52,7 @@
         //
         // Create implementation object
         //
-        Bank_impl bankImpl = new Bank_impl(poa);
+        BankImpl bankImpl = new BankImpl(poa);
 
         byte[] oid = "Bank".getBytes();
         poa.activate_object_with_id(oid, bankImpl);
@@ -73,34 +75,25 @@
         return 0;
     }
 
-    public static void
-    main(String args[])
-    {
+    public static void main(String args[]) {
         Properties props = System.getProperties();
         props.put("org.omg.CORBA.ORBInitialHost", "localhost");
         props.put("org.omg.CORBA.ORBInitialPort", "1050");                
 
         int status = 0;
         ORB orb = null;
-        try
-        {
+        try         {
             orb = ORB.init(args, props);
             status = run(orb, args);
-        }
-        catch(Exception ex)
-        {
+        } catch (Exception ex) {
             ex.printStackTrace();
             status = 1;
         }
 
-        if(orb != null)
-        {
-            try
-            {
+        if (orb != null) {
+            try {
                 orb.destroy();
-            }
-            catch(Exception ex)
-            {
+            } catch (Exception ex) {
                 ex.printStackTrace();
                 status = 1;
             }

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java?rev=636943&r1=636942&r2=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java
Thu Mar 13 17:59:14 2008
@@ -19,15 +19,9 @@
 
 package yoko.client;
 
-import java.io.File;
-import java.net.URL;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
 import yoko.common.Account;

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java?rev=636943&r1=636942&r2=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java
Thu Mar 13 17:59:14 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 
 package yoko.server;
 
@@ -24,8 +24,7 @@
 @javax.jws.WebService(portName = "AccountCORBAPort",
                       serviceName = "AccountCORBAService",
                       targetNamespace = "http://schemas.apache.org/yoko/idl/Bank",
-                      //wsdlLocation = "file:./BankWS-corba.wsdl",
-                      wsdlLocation = "file:/home/dkulp/working/cxf/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl",
+                      wsdlLocation = "file:./BankWS-corba.wsdl",
                       endpointInterface = "yoko.common.Account")
 
 public class AccountImpl implements Account {

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java?rev=636943&r1=636942&r2=636943&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java
Thu Mar 13 17:59:14 2008
@@ -15,30 +15,22 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 
 package yoko.server;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
 import javax.xml.ws.Endpoint;
-import javax.xml.ws.Service;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
 import yoko.common.Bank;
-import yoko.common.Account;
 
 @javax.jws.WebService(portName = "BankCORBAPort", 
                       serviceName = "BankCORBAService",
                       targetNamespace = "http://schemas.apache.org/yoko/idl/Bank",
-                      //wsdlLocation = "file:./BankWS-corba.wsdl",
-                      wsdlLocation = "file:/home/dkulp/working/cxf/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl",
+                      wsdlLocation = "file:./BankWS-corba.wsdl",
                       endpointInterface = "yoko.common.Bank")
 
 public class BankImpl implements Bank {



Mime
View raw message