http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
index f74fc9b..e2a1814 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
@@ -38,16 +38,17 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiCreatebulk {
 
-        private static UDDISecurityPortType security = null;
-        private static UDDIPublicationPortType publish = null;
-        String curretNode = null;
+        private UDDISecurityPortType security = null;
+        private UDDIPublicationPortType publish = null;
+        private String curretNode = null;
+
         public UddiCreatebulk(String node) {
                 try {
                         // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         Transport transport = clerkManager.getTransport(node);
-                        curretNode=node;
+                        curretNode = node;
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
                         publish = transport.getUDDIPublishService();
@@ -55,10 +56,10 @@ public class UddiCreatebulk {
                         e.printStackTrace();
                 }
         }
-        
+
         public UddiCreatebulk(Transport transport, boolean notused, String 
node) {
                 try {
-                       curretNode=node;
+                        curretNode = node;
                         security = transport.getUDDISecurityService();
                         publish = transport.getUDDIPublishService();
                 } catch (Exception e) {
@@ -68,6 +69,7 @@ public class UddiCreatebulk {
 
         /**
          * bulk creates businesses, services and binding templates
+         *
          * @param token if null, root/root will be used to authenticate
          * @param businesses
          * @param servicesPerBusiness
@@ -98,8 +100,8 @@ public class UddiCreatebulk {
                                 BusinessEntity myBusEntity = new 
BusinessEntity();
                                 Name myBusName = new Name();
                                 myBusName.setLang("en");
-                                myBusName.setValue(user + "'s Business " 
+curretNode +" " + i + " " + xcal.toString() + " " + textgen.getWords(5, 2) );
-                                myBusEntity.getDescription().add(new 
Description( textgen.getWords(10, 2), null));
+                                myBusName.setValue(user + "'s Business " + 
curretNode + " " + i + " " + xcal.toString() + " " + textgen.getWords(5, 2));
+                                myBusEntity.getDescription().add(new 
Description(textgen.getWords(10, 2), null));
                                 myBusEntity.getName().add(myBusName);
 
                                 // Adding the business entity to the "save" 
structure, using our publisher's authentication info and saving away.
@@ -116,10 +118,10 @@ public class UddiCreatebulk {
                                         myService.setBusinessKey(myBusKey);
                                         Name myServName = new Name();
                                         myServName.setLang("en");
-                                        myServName.setValue(user + "'s Service 
" +curretNode+" "+ i + " " + k + " " + xcal.toString()+ " " + 
textgen.getWords(5, 2) );
+                                        myServName.setValue(user + "'s Service 
" + curretNode + " " + i + " " + k + " " + xcal.toString() + " " + 
textgen.getWords(5, 2));
                                         myService.getName().add(myServName);
-                                        myService.getDescription().add(new 
Description( textgen.getWords(10, 2), null));
-                                        
+                                        myService.getDescription().add(new 
Description(textgen.getWords(10, 2), null));
+
                                         // Add binding templates, etc...
                                         BindingTemplate myBindingTemplate = 
new BindingTemplate();
                                         myBindingTemplate.setCategoryBag(new 
CategoryBag());
@@ -169,11 +171,11 @@ public class UddiCreatebulk {
                                         tii.getDescription().add(d);
                                         
tii.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
                                         tii.setInstanceDetails(new 
InstanceDetails());
-                                        
tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing 
this endpoint, up to 4KB of data"+ " " + textgen.getWords(20, 2) );
+                                        
tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing 
this endpoint, up to 4KB of data" + " " + textgen.getWords(20, 2));
                                         
tii.getInstanceDetails().getDescription().add(d);
                                         OverviewDoc od = new OverviewDoc();
                                         d = new Description();
-                                        d.setValue("ovweview doc description"+ 
" " + textgen.getWords(5, 2) );
+                                        d.setValue("ovweview doc description" 
+ " " + textgen.getWords(5, 2));
                                         od.getDescription().add(d);
                                         od.setOverviewURL(new OverviewURL());
                                         od.getOverviewURL().setUseType("www");

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
index 3d045c7..b1252a9 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
@@ -39,10 +39,10 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiCustodyTransfer {
 
-        private static UDDISecurityPortType security = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType uddiInquiryService = null;
-        private static UDDICustodyTransferPortType custodyTransferPortType = 
null;
+        private UDDISecurityPortType security = null;
+        private UDDIPublicationPortType publish = null;
+        private UDDIInquiryPortType uddiInquiryService = null;
+        private UDDICustodyTransferPortType custodyTransferPortType = null;
 
         public UddiCustodyTransfer() {
                 try {
@@ -61,7 +61,7 @@ public class UddiCustodyTransfer {
                 }
         }
 
-        public static void main(String args[]) throws Exception {
+        public void main(String args[]) throws Exception {
                 UddiCustodyTransfer sp = new UddiCustodyTransfer();
 
                 GetAuthToken getAuthTokenRoot = new GetAuthToken();

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
index 4ec5b6d..54dfd7f 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
@@ -34,10 +34,10 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiDigitalSignatureBusiness {
 
-        private static UDDISecurityPortType security = null;
-        private static UDDIInquiryPortType inquiry = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIClient clerkManager = null;
+        private UDDISecurityPortType security = null;
+        private UDDIInquiryPortType inquiry = null;
+        private UDDIPublicationPortType publish = null;
+        private UDDIClient clerkManager = null;
 
         /**
          * This sets up the ws proxies using uddi.xml in META-INF
@@ -56,10 +56,10 @@ public class UddiDigitalSignatureBusiness {
                         e.printStackTrace();
                 }
         }
-        
+
         public UddiDigitalSignatureBusiness(Transport transport) {
                 try {
-                       
+
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
                         inquiry = transport.getUDDIInquiryService();
@@ -77,10 +77,10 @@ public class UddiDigitalSignatureBusiness {
         public static void main(String args[]) {
 
                 UddiDigitalSignatureBusiness sp = new 
UddiDigitalSignatureBusiness();
-                sp.Fire(null, null);
+                sp.fire(null, null);
         }
 
-        public void Fire(String token, String key) {
+        public void fire(String token, String key) {
                 try {
 
                         DigSigUtil ds = null;
@@ -128,14 +128,12 @@ public class UddiDigitalSignatureBusiness {
                         BusinessEntity be = 
clerkManager.getClerk("default").getBusinessDetail(key);
                         //sign the copy returned from the UDDI node (it may 
have made changes)
                         DigSigUtil.JAXB_ToStdOut(be);
-                        if (!be.getSignature().isEmpty())
-                        {
+                        if (!be.getSignature().isEmpty()) {
                                 System.out.println("WARN, the entity with the 
key " + key + " is already signed! aborting");
                                 return;
                         }
 
                         //if it's already signed, remove all existing 
signatures
-                        
                         System.out.println("signing");
                         BusinessEntity signUDDI_JAXBObject = 
ds.signUddiEntity(be);
                         DigSigUtil.JAXB_ToStdOut(signUDDI_JAXBObject);

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureFile.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureFile.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureFile.java
index ac1a06f..265ab1c 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureFile.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureFile.java
@@ -18,17 +18,12 @@ package org.apache.juddi.samples;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.xml.bind.JAXB;
 
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.cryptor.DigSigUtil;
-import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.*;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
  * This class shows you how to digital sign a business and save to file
@@ -37,20 +32,11 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiDigitalSignatureFile {
 
-        private static UDDIClient clerkManager = null;
-
         /**
          * This sets up the ws proxies using uddi.xml in META-INF
          */
         public UddiDigitalSignatureFile() {
-                try {
-                        // create a manager and read the config in the 
archive; 
-                        // you can use your config file name
-                        clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
 
-                } catch (Exception e) {
-                        e.printStackTrace();
-                }
         }
 
         public enum UddiType {
@@ -58,7 +44,7 @@ public class UddiDigitalSignatureFile {
                 Business, Service, Binding, TModel, PublisherAssertion
         }
 
-        public void Fire(String fileIn, String fileOut, UddiType type) {
+        public void fire(String fileIn, String fileOut, UddiType type) {
                 try {
                         System.out.println("WARN - All previous signatures 
will be removed!");
                         if (fileIn == null || fileOut == null || type == null) 
{
@@ -113,22 +99,22 @@ public class UddiDigitalSignatureFile {
                         Object be = JAXB.unmarshal(fis, expectedType);
                         fis.close();
                         fis = null;
-                        
+
                         switch (type) {
                                 case Binding:
-                                        
((BindingTemplate)be).getSignature().clear();
+                                        ((BindingTemplate) 
be).getSignature().clear();
                                         break;
                                 case Business:
-                                        
((BusinessEntity)be).getSignature().clear();
+                                        ((BusinessEntity) 
be).getSignature().clear();
                                         break;
                                 case PublisherAssertion:
-                                        
((PublisherAssertion)be).getSignature().clear();
+                                        ((PublisherAssertion) 
be).getSignature().clear();
                                         break;
                                 case Service:
-                                        
((BusinessService)be).getSignature().clear();
+                                        ((BusinessService) 
be).getSignature().clear();
                                         break;
                                 case TModel:
-                                        ((TModel)be).getSignature().clear();
+                                        ((TModel) be).getSignature().clear();
                                         break;
                         }
 
@@ -136,7 +122,6 @@ public class UddiDigitalSignatureFile {
                         Object signUDDI_JAXBObject = ds.signUddiEntity(be);
                         System.out.println("signed");
                         DigSigUtil.JAXB_ToStdOut(signUDDI_JAXBObject);
-                        
 
                         System.out.println("verifing");
                         AtomicReference<String> msg = new 
AtomicReference<String>();
@@ -156,5 +141,4 @@ public class UddiDigitalSignatureFile {
                 }
         }
 
-       
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
index c618e15..2816bc2 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
@@ -33,94 +33,93 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiDigitalSignatureSearch {
 
-    private static UDDISecurityPortType security = null;
-    private static UDDIInquiryPortType inquiry = null;
-    private static UDDIPublicationPortType publish = null;
+        private UDDISecurityPortType security = null;
+        private UDDIInquiryPortType inquiry = null;
 
-    /**
-     * This sets up the ws proxies using uddi.xml in META-INF
-     */
-    public UddiDigitalSignatureSearch() {
-        try {
-            // create a manager and read the config in the archive; 
-            // you can use your config file name
-            UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
-            Transport transport = clerkManager.getTransport();
-            // Now you create a reference to the UDDI API
-            security = transport.getUDDISecurityService();
-            inquiry = transport.getUDDIInquiryService();
-            publish = transport.getUDDIPublishService();
-        } catch (Exception e) {
-            e.printStackTrace();
+        /**
+         * This sets up the ws proxies using uddi.xml in META-INF
+         */
+        public UddiDigitalSignatureSearch() {
+                try {
+                        // create a manager and read the config in the 
archive; 
+                        // you can use your config file name
+                        UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
+                        Transport transport = clerkManager.getTransport();
+                        // Now you create a reference to the UDDI API
+                        security = transport.getUDDISecurityService();
+                        inquiry = transport.getUDDIInquiryService();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
         }
-    }
 
-    /**
-     * Main entry point
-     *
-     * @param args
-     */
-    public static void main(String args[]) {
+        /**
+         * Main entry point
+         *
+         * @param args
+         */
+        public static void main(String args[]) {
 
-        UddiDigitalSignatureSearch sp = new UddiDigitalSignatureSearch();
-        sp.Fire(null);
-    }
+                UddiDigitalSignatureSearch sp = new 
UddiDigitalSignatureSearch();
+                sp.fire(null);
+        }
 
-    public void Fire(String token) {
-        try {
+        public void fire(String token) {
+                try {
 
-            FindService fs = new FindService();
-            //optional, usually
-            if (token==null)
-                    token=GetAuthKey("root", "root");
-            fs.setAuthInfo(token);
-            fs.setFindQualifiers(new FindQualifiers());
-            
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_DATE_ASC);
-            
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
-            
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SIGNATURE_PRESENT);
-            Name n = new Name();
-            n.setValue("%");
-            fs.getName().add(n);
-            ServiceList findService = inquiry.findService(fs);
-            for (int i = 0; i < 
findService.getServiceInfos().getServiceInfo().size(); i++) {
-                
System.out.println(ListToString(findService.getServiceInfos().getServiceInfo().get(i).getName()));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+                        FindService fs = new FindService();
+                        //optional, usually
+                        if (token == null) {
+                                token = getAuthKey("root", "root");
+                        }
+                        fs.setAuthInfo(token);
+                        fs.setFindQualifiers(new FindQualifiers());
+                        
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_DATE_ASC);
+                        
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                        
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SIGNATURE_PRESENT);
+                        Name n = new Name();
+                        n.setValue("%");
+                        fs.getName().add(n);
+                        ServiceList findService = inquiry.findService(fs);
+                        for (int i = 0; i < 
findService.getServiceInfos().getServiceInfo().size(); i++) {
+                                
System.out.println(listToString(findService.getServiceInfos().getServiceInfo().get(i).getName()));
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
         }
-    }
 
-    /**
-     * Gets a UDDI style auth token, otherwise, appends credentials to the ws
-     * proxies (not yet implemented)
-     *
-     * @param username
-     * @param password
-     * @param style
-     * @return
-     */
-    private String GetAuthKey(String username, String password) {
-        try {
+        /**
+         * Gets a UDDI style auth token, otherwise, appends credentials to the
+         * ws proxies (not yet implemented)
+         *
+         * @param username
+         * @param password
+         * @param style
+         * @return
+         */
+        private String getAuthKey(String username, String password) {
+                try {
 
-            GetAuthToken getAuthTokenRoot = new GetAuthToken();
-            getAuthTokenRoot.setUserID(username);
-            getAuthTokenRoot.setCred(password);
+                        GetAuthToken getAuthTokenRoot = new GetAuthToken();
+                        getAuthTokenRoot.setUserID(username);
+                        getAuthTokenRoot.setCred(password);
 
-            // Making API call that retrieves the authentication token for the 
'root' user.
-            AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + "dont log auth tokens!");
-            return rootAuthToken.getAuthInfo();
-        } catch (Exception ex) {
-            System.out.println("Could not authenticate with the provided 
credentials " + ex.getMessage());
+                        // Making API call that retrieves the authentication 
token for the 'root' user.
+                        AuthToken rootAuthToken = 
security.getAuthToken(getAuthTokenRoot);
+                        System.out.println("root AUTHTOKEN = " + "dont log 
auth tokens!");
+                        return rootAuthToken.getAuthInfo();
+                } catch (Exception ex) {
+                        System.out.println("Could not authenticate with the 
provided credentials " + ex.getMessage());
+                }
+                return null;
         }
-        return null;
-    }
 
-    private String ListToString(List<Name> name) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < name.size(); i++) {
-            sb.append(name.get(i).getValue()).append(" ");
+        private String listToString(List<Name> name) {
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < name.size(); i++) {
+                        sb.append(name.get(i).getValue()).append(" ");
+                }
+                return sb.toString();
         }
-        return sb.toString();
-    }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
index 238dfc2..d0e39db 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
@@ -18,7 +18,6 @@ package org.apache.juddi.samples;
 
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.cryptor.DigSigUtil;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.*;
@@ -33,17 +32,17 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiDigitalSignatureService {
 
-        private static UDDISecurityPortType security = null;
-        private static UDDIInquiryPortType inquiry = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIClient clerkManager = null;
+        private UDDISecurityPortType security = null;
+        private UDDIInquiryPortType inquiry = null;
+        private UDDIPublicationPortType publish = null;
+        private UDDIClient clerkManager = null;
 
         /**
          * This sets up the ws proxies using uddi.xml in META-INF
          */
         public UddiDigitalSignatureService() {
                 try {
-            // create a manager and read the config in the archive; 
+                        // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         Transport transport = clerkManager.getTransport();
@@ -64,10 +63,10 @@ public class UddiDigitalSignatureService {
         public static void main(String args[]) {
 
                 UddiDigitalSignatureService sp = new 
UddiDigitalSignatureService();
-                sp.Fire(null, null);
+                sp.fire(null, null);
         }
 
-        public void Fire(String token, String key) {
+        public void fire(String token, String key) {
                 try {
 
                         DigSigUtil ds = null;
@@ -86,13 +85,12 @@ public class UddiDigitalSignatureService {
                         ds.put(DigSigUtil.TRUSTSTORE_FILETYPE, "JKS");
                         ds.put(DigSigUtil.TRUSTSTORE_FILE_PASSWORD, "Test");
 
-
-            //option 2), load it from the juddi config file
+                        //option 2), load it from the juddi config file
                         //ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
                         //login
                         if (token == null) //option, load from juddi config
                         {
-                                token = 
GetAuthKey(clerkManager.getClerk("default").getPublisher(),
+                                token = 
getAuthKey(clerkManager.getClerk("default").getPublisher(),
                                         
clerkManager.getClerk("default").getPassword());
                         }
 
@@ -117,13 +115,12 @@ public class UddiDigitalSignatureService {
                         }
 
                         BusinessService be = null;
-                        be = GetServiceDetails(key);
-                        if (!be.getSignature().isEmpty())
-                        {
+                        be = getServiceDetails(key);
+                        if (!be.getSignature().isEmpty()) {
                                 System.out.println("WARN, the entity with the 
key " + key + " is already signed! aborting");
                                 return;
                         }
-                        
+
                         //DigSigUtil.JAXB_ToStdOut(be);
                         System.out.println("signing");
                         BusinessService signUDDI_JAXBObject = 
ds.signUddiEntity(be);
@@ -136,7 +133,7 @@ public class UddiDigitalSignatureService {
                         publish.saveService(sb);
                         System.out.println("saved, fetching");
 
-                        be = GetServiceDetails(key);
+                        be = getServiceDetails(key);
                         DigSigUtil.JAXB_ToStdOut(be);
                         System.out.println("verifing");
                         AtomicReference<String> msg = new 
AtomicReference<String>();
@@ -153,7 +150,7 @@ public class UddiDigitalSignatureService {
                 }
         }
 
-        private BusinessService GetServiceDetails(String key) throws Exception 
{
+        private BusinessService getServiceDetails(String key) throws Exception 
{
                 //   BusinessInfo get
                 GetServiceDetail r = new GetServiceDetail();
                 //GetBusinessDetail r = new GetBusinessDetail();
@@ -170,7 +167,7 @@ public class UddiDigitalSignatureService {
          * @param style
          * @return
          */
-        private String GetAuthKey(String username, String password) {
+        private String getAuthKey(String username, String password) {
                 try {
 
                         GetAuthToken getAuthTokenRoot = new GetAuthToken();

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
index 77c785d..ed0bfd1 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
@@ -18,7 +18,6 @@ package org.apache.juddi.samples;
 
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.cryptor.DigSigUtil;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.*;
@@ -33,10 +32,20 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiDigitalSignatureTmodel {
 
-        private static UDDISecurityPortType security = null;
-        private static UDDIInquiryPortType inquiry = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIClient clerkManager = null;
+        /**
+         * Main entry point
+         *
+         * @param args
+         */
+        public static void main(String args[]) {
+                UddiDigitalSignatureTmodel sp = new 
UddiDigitalSignatureTmodel();
+                sp.fire(null, null);
+        }
+
+        private UDDISecurityPortType security = null;
+        private UDDIInquiryPortType inquiry = null;
+        private UDDIPublicationPortType publish = null;
+        private UDDIClient clerkManager = null;
 
         /**
          * This sets up the ws proxies using uddi.xml in META-INF
@@ -56,17 +65,7 @@ public class UddiDigitalSignatureTmodel {
                 }
         }
 
-        /**
-         * Main entry point
-         *
-         * @param args
-         */
-        public static void main(String args[]) {
-                UddiDigitalSignatureTmodel sp = new 
UddiDigitalSignatureTmodel();
-                sp.Fire(null, null);
-        }
-
-        public void Fire(String token, String key) {
+        public void fire(String token, String key) {
                 try {
                         DigSigUtil ds = null;
 
@@ -89,10 +88,10 @@ public class UddiDigitalSignatureTmodel {
                         //login
                         if (token == null) //option, load from juddi config
                         {
-                                token = 
GetAuthKey(clerkManager.getClerk("default").getPublisher(),
+                                token = 
getAuthKey(clerkManager.getClerk("default").getPublisher(),
                                         
clerkManager.getClerk("default").getPassword());
                         }
-                        if (key==null){
+                        if (key == null) {
                                 SaveTModel stm = new SaveTModel();
                                 stm.setAuthInfo(token);
                                 TModel tm = new TModel();
@@ -102,13 +101,12 @@ public class UddiDigitalSignatureTmodel {
                                 key = 
saveTModel.getTModel().get(0).getTModelKey();
                         }
 
-                        TModel be = GetTmodelDetails(key);
-                        if (!be.getSignature().isEmpty())
-                        {
+                        TModel be = getTmodelDetails(key);
+                        if (!be.getSignature().isEmpty()) {
                                 System.out.println("WARN, the entity with the 
key " + key + " is already signed! aborting");
                                 return;
                         }
-                        
+
                         //DigSigUtil.JAXB_ToStdOut(be);
                         System.out.println("signing");
                         TModel signUDDI_JAXBObject = ds.signUddiEntity(be);
@@ -121,7 +119,7 @@ public class UddiDigitalSignatureTmodel {
                         publish.saveTModel(sb);
                         System.out.println("saved, fetching");
 
-                        be = GetTmodelDetails(key);
+                        be = getTmodelDetails(key);
                         DigSigUtil.JAXB_ToStdOut(be);
                         System.out.println("verifing");
                         AtomicReference<String> msg = new 
AtomicReference<String>();
@@ -138,7 +136,7 @@ public class UddiDigitalSignatureTmodel {
                 }
         }
 
-        private TModel GetTmodelDetails(String key) throws Exception {
+        private TModel getTmodelDetails(String key) throws Exception {
                 //   BusinessInfo get
                 GetTModelDetail r = new GetTModelDetail();
                 r.getTModelKey().add(key);
@@ -154,7 +152,7 @@ public class UddiDigitalSignatureTmodel {
          * @param style
          * @return
          */
-        private String GetAuthKey(String username, String password) {
+        private String getAuthKey(String username, String password) {
                 try {
 
                         GetAuthToken getAuthTokenRoot = new GetAuthToken();

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
index 7e80dca..08c73a6 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
@@ -18,12 +18,9 @@ package org.apache.juddi.samples;
 
 import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
 import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
@@ -34,30 +31,26 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiFindBinding {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType inquiry = null;
+        private UDDISecurityPortType security = null;
+        private UDDIInquiryPortType inquiry = null;
 
         public UddiFindBinding() {
                 try {
-            // create a manager and read the config in the archive; 
+                        // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         Transport transport = clerkManager.getTransport();
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
                         inquiry = transport.getUDDIInquiryService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-        public void Fire(String token) {
+        public void fire(String token) {
                 try {
-            // Setting up the values to get an authentication token for the 
'root' user ('root' user has admin privileges
+                        // Setting up the values to get an authentication 
token for the 'root' user ('root' user has admin privileges
                         // and can save other publishers).
                         GetAuthToken getAuthTokenRoot = new GetAuthToken();
                         getAuthTokenRoot.setUserID("root");
@@ -97,6 +90,6 @@ public class UddiFindBinding {
 
         public static void main(String args[]) {
                 UddiFindBinding sp = new UddiFindBinding();
-                sp.Fire(null);
+                sp.fire(null);
         }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
index 637b501..98f1d43 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
@@ -32,29 +32,21 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiFindEndpoints {
 
-        private static UDDISecurityPortType security = null;
-        private static UDDIInquiryPortType inquiry = null;
-        static UDDIClerk clerk = null;
+        private UDDIClerk clerk = null;
 
         public UddiFindEndpoints() {
                 try {
-            // create a manager and read the config in the archive; 
+                        // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         clerk = clerkManager.getClerk("default");
-            // a ClerkManager can be a client to multiple UDDI nodes, so 
-                        // supply the nodeName (defined in your uddi.xml.
-                        // The transport can be WS, inVM, RMI etc which is 
defined in the uddi.xml
-                        Transport transport = clerkManager.getTransport();
-                        // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        inquiry = transport.getUDDIInquiryService();
+
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-        public void Fire(String authtoken, String key) {
+        public void fire(String authtoken, String key) {
                 try {
                         if (key == null) {
                                 key = "uddi:juddi.apache.org:services-inquiry";
@@ -73,6 +65,6 @@ public class UddiFindEndpoints {
 
         public static void main(String args[]) {
                 UddiFindEndpoints sp = new UddiFindEndpoints();
-                sp.Fire(null, null);
+                sp.fire(null, null);
         }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
index ffa345e..89d5186 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
@@ -18,12 +18,9 @@ package org.apache.juddi.samples;
 
 import javax.xml.bind.JAXB;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
 import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
@@ -34,10 +31,8 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiGetServiceDetails {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType inquiry = null;
+        private UDDISecurityPortType security = null;
+        private UDDIInquiryPortType inquiry = null;
 
         public UddiGetServiceDetails() {
                 try {
@@ -47,15 +42,13 @@ public class UddiGetServiceDetails {
                         Transport transport = clerkManager.getTransport();
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
                         inquiry = transport.getUDDIInquiryService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-        public void Fire(String token, String key) {
+        public void fire(String token, String key) {
                 if (key == null) {
                         System.out.println("No key provided!");
                         return;
@@ -90,6 +83,6 @@ public class UddiGetServiceDetails {
 
         public static void main(String args[]) {
                 UddiGetServiceDetails sp = new UddiGetServiceDetails();
-                sp.Fire(null, "uddi:juddi.apache.org:services-inquiry");
+                sp.fire(null, "uddi:juddi.apache.org:services-inquiry");
         }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
index 9073617..fa427d2 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
@@ -18,11 +18,8 @@ package org.apache.juddi.samples;
 
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
-import org.uddi.v3_service.UDDIInquiryPortType;
 import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
 
@@ -34,30 +31,26 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiKeyGenerator {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType inquiry = null;
+        private UDDISecurityPortType security = null;
+        private UDDIPublicationPortType publish = null;
 
         public UddiKeyGenerator() {
                 try {
-            // create a manager and read the config in the archive; 
+                        // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         Transport transport = clerkManager.getTransport();
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
                         publish = transport.getUDDIPublishService();
-                        inquiry = transport.getUDDIInquiryService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-        public void Fire(String token, String domain) {
+        public void fire(String token, String domain) {
                 try {
-            // Setting up the values to get an authentication token for the 
'root' user ('root' user has admin privileges
+                        // Setting up the values to get an authentication 
token for the 'root' user ('root' user has admin privileges
                         // and can save other publishers).
                         if (token == null) {
                                 GetAuthToken getAuthTokenRoot = new 
GetAuthToken();
@@ -91,7 +84,7 @@ public class UddiKeyGenerator {
                         st.getTModel().add(m);
                         publish.saveTModel(st);
 
-                                */
+                         */
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
@@ -99,6 +92,6 @@ public class UddiKeyGenerator {
 
         public static void main(String args[]) {
                 UddiKeyGenerator sp = new UddiKeyGenerator();
-                sp.Fire(null, "www.juddi.is.cool.org");
+                sp.fire(null, "www.juddi.is.cool.org");
         }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
index ff9d2e8..ca91559 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
@@ -24,7 +24,6 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.ws.Holder;
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
 import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
@@ -37,9 +36,8 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class UddiRelatedBusinesses {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
+        private UDDISecurityPortType security = null;
+        private UDDIPublicationPortType publish = null;
 
         public UddiRelatedBusinesses() {
                 try {
@@ -49,22 +47,21 @@ public class UddiRelatedBusinesses {
                         Transport transport = clerkManager.getTransport();
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
                         publish = transport.getUDDIPublishService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-        public void Fire(String businessKey, String authInfo, String 
businessKey1, String authInfo1, String relationship) throws Exception {
+        public void fire(String businessKey, String authInfo, String 
businessKey1, String authInfo1, String relationship) throws Exception {
                 try {
 
-                        DatatypeFactory df = DatatypeFactory.newInstance();
+                        
                         GregorianCalendar gcal = new GregorianCalendar();
                         gcal.setTimeInMillis(System.currentTimeMillis());
-                        XMLGregorianCalendar xcal = 
df.newXMLGregorianCalendar(gcal);
+                        
 
-                                //ROOT creates half of the relationship
+                        //ROOT creates half of the relationship
                         //create a business relationship (publisher assertion)
                         Holder<List<PublisherAssertion>> x = new 
Holder<List<PublisherAssertion>>();
                         PublisherAssertion pa = new PublisherAssertion();
@@ -116,36 +113,36 @@ public class UddiRelatedBusinesses {
                 getAuthTokenRoot.setCred("root");
 
                 // Making API call that retrieves the authentication token for 
the 'root' user.
-                AuthToken rootAuthToken = 
security.getAuthToken(getAuthTokenRoot);
+                AuthToken rootAuthToken = 
sp.security.getAuthToken(getAuthTokenRoot);
                 System.out.println("root AUTHTOKEN = " + "don't log auth 
tokens!");
-                BusinessEntity rootbiz = sp.CreateBusiness("root");
+                BusinessEntity rootbiz = sp.createBusiness("root");
 
                 getAuthTokenRoot = new GetAuthToken();
                 getAuthTokenRoot.setUserID("uddi");
                 getAuthTokenRoot.setCred("uddi");
 
                 // Making API call that retrieves the authentication token for 
the 'root' user.
-                AuthToken uddiAuthToken = 
security.getAuthToken(getAuthTokenRoot);
+                AuthToken uddiAuthToken = 
sp.security.getAuthToken(getAuthTokenRoot);
                 System.out.println("uddi AUTHTOKEN = " + "don't log auth 
tokens!");
-                BusinessEntity uddibiz = sp.CreateBusiness("uddi");
+                BusinessEntity uddibiz = sp.createBusiness("uddi");
 
                 //save user uddi's business
                 SaveBusiness sb = new SaveBusiness();
                 sb.setAuthInfo(uddiAuthToken.getAuthInfo());
                 sb.getBusinessEntity().add(uddibiz);
-                BusinessDetail uddibize = publish.saveBusiness(sb);
+                BusinessDetail uddibize = sp.publish.saveBusiness(sb);
 
                 sb = new SaveBusiness();
                 sb.setAuthInfo(rootAuthToken.getAuthInfo());
                 sb.getBusinessEntity().add(rootbiz);
-                BusinessDetail rootbize = publish.saveBusiness(sb);
+                BusinessDetail rootbize = sp.publish.saveBusiness(sb);
 
-                sp.Fire(rootbize.getBusinessEntity().get(0).getBusinessKey(), 
rootAuthToken.getAuthInfo(),
+                sp.fire(rootbize.getBusinessEntity().get(0).getBusinessKey(), 
rootAuthToken.getAuthInfo(),
                         uddibize.getBusinessEntity().get(0).getBusinessKey(), 
uddiAuthToken.getAuthInfo(),
                         "parent-child");
         }
 
-        private BusinessEntity CreateBusiness(String user) {
+        private BusinessEntity createBusiness(String user) {
                 BusinessEntity be = new BusinessEntity();
                 be.getName().add(new Name(user + "'s business", null));
                 return be;

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
index 4448df5..63fb6c4 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
@@ -40,13 +40,13 @@ class UddiReplication {
 
         public UddiReplication(UDDIClient client, String nodename) throws 
ConfigurationException {
 
-                 uddiReplicationPort = new 
UDDIService().getUDDIReplicationPort();
+                uddiReplicationPort = new 
UDDIService().getUDDIReplicationPort();
                 ((BindingProvider) 
uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
 client.getClientConfig().getUDDINode(nodename).getReplicationUrl());
         }
 
-        UDDIReplicationPortType uddiReplicationPort = null;
+        private UDDIReplicationPortType uddiReplicationPort = null;
 
-        String DoPing() {
+        public String doPing() {
                 try {
                         String doPing = uddiReplicationPort.doPing(new 
DoPing());
                         System.out.println("Ping Success, remote node's id is 
" + doPing);
@@ -57,9 +57,9 @@ class UddiReplication {
                 return null;
         }
 
-        void GetHighWatermarks() {
+        public void getHighWatermarks() {
                 try {
-                           List<ChangeRecordIDType> highWaterMarks = 
uddiReplicationPort.getHighWaterMarks();
+                        List<ChangeRecordIDType> highWaterMarks = 
uddiReplicationPort.getHighWaterMarks();
                         System.out.println("Success....");
                         System.out.println("Node, USN");
                         for (int i = 0; i < highWaterMarks.size(); i++) {
@@ -72,11 +72,11 @@ class UddiReplication {
                 }
         }
 
-        void GetChangeRecords(Long record, String sourcenode) {
+        public void getChangeRecords(Long record, String sourcenode) {
                 try {
                         HighWaterMarkVectorType highWaterMarkVectorType = new 
HighWaterMarkVectorType();
 
-                        highWaterMarkVectorType.getHighWaterMark().add(new 
ChangeRecordIDType(DoPing(), record));
+                        highWaterMarkVectorType.getHighWaterMark().add(new 
ChangeRecordIDType(doPing(), record));
                         GetChangeRecords req = new GetChangeRecords();
                         req.setRequestingNode(sourcenode);
                         req.setChangesAlreadySeen(highWaterMarkVectorType);
@@ -89,7 +89,7 @@ class UddiReplication {
                                 System.out.println(
                                         
changeRecords.get(i).getChangeID().getNodeID() + ", "
                                         + 
changeRecords.get(i).getChangeID().getOriginatingUSN() + ": "
-                                        + GetChangeType(changeRecords.get(i)));
+                                        + getChangeType(changeRecords.get(i)));
                                 JAXB.marshal(changeRecords.get(i), System.out);
                         }
                 } catch (Exception ex) {
@@ -97,7 +97,7 @@ class UddiReplication {
                 }
         }
 
-        private String GetChangeType(ChangeRecord get) {
+        private String getChangeType(ChangeRecord get) {
                 if (get.getChangeRecordAcknowledgement() != null) {
                         return "ACK";
                 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
index 093a759..33d6c64 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
@@ -24,15 +24,10 @@ import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.subscription.ISubscriptionCallback;
 import org.apache.juddi.v3.client.subscription.SubscriptionCallbackListener;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
 import org.uddi.sub_v3.Subscription;
 import org.uddi.sub_v3.SubscriptionFilter;
 import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
-import org.uddi.v3_service.UDDISubscriptionPortType;
 
 /**
  * Thie class shows you how to create a business and a subscription using UDDI
@@ -40,13 +35,8 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
  *
  * @author <a href="mailto:[email protected]";>Alex O'Ree</a>
  */
-public class UddiSubscribe implements ISubscriptionCallback, Runnable {
+public class UddiSubscribe implements ISubscriptionCallback {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType uddiInquiryService = null;
-        private static UDDISubscriptionPortType uddiSubscriptionService = null;
         boolean callbackRecieved = false;
         private UDDIClerk clerk = null;
         private UDDIClient client = null;
@@ -57,18 +47,14 @@ public class UddiSubscribe implements 
ISubscriptionCallback, Runnable {
                         // you can use your config file name
                         client = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         clerk = client.getClerk("default");
-                        Transport transport = client.getTransport();
                         // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
-                        uddiSubscriptionService = 
transport.getUDDISubscriptionService();
+
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
         String nodename = "default";
+
         public UddiSubscribe(UDDIClient client, String nodename, Transport 
transport) {
                 try {
                         // create a manager and read the config in the 
archive; 
@@ -77,11 +63,7 @@ public class UddiSubscribe implements ISubscriptionCallback, 
Runnable {
                         clerk = client.getClerk(nodename);
                         this.nodename = nodename;
                         // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
-                        uddiSubscriptionService = 
transport.getUDDISubscriptionService();
+
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
@@ -89,10 +71,10 @@ public class UddiSubscribe implements 
ISubscriptionCallback, Runnable {
 
         public static void main(String args[]) throws Exception {
                 UddiSubscribe sp = new UddiSubscribe();
-                sp.Fire();
+                sp.fire();
         }
 
-        public void Fire() throws Exception {
+        public void fire() throws Exception {
 
                 TModel createKeyGenator = 
UDDIClerk.createKeyGenator("somebusiness", "A test key domain 
SubscriptionCallbackTest1", "SubscriptionCallbackTest1");
 
@@ -223,22 +205,19 @@ public class UddiSubscribe implements 
ISubscriptionCallback, Runnable {
                 //Runtime.getRuntime().removeShutdownHook(hook);
         }
 
-        private boolean running = true;
-        PrintUDDI<SubscriptionResultsList> p = new 
PrintUDDI<SubscriptionResultsList>();
+        
+        private PrintUDDI<SubscriptionResultsList> p = new 
PrintUDDI<SubscriptionResultsList>();
 
         @Override
-        public void HandleCallback(SubscriptionResultsList body) {
+        public void handleCallback(SubscriptionResultsList body) {
                 System.out.println("Callback received!");
                 System.out.println(p.print(body));
         }
 
         @Override
-        public void NotifyEndpointStopped() {
+        public void notifyEndpointStopped() {
                 System.out.println("The endpoint was stopped!");
         }
 
-        @Override
-        public void run() {
-                running = false;
-        }
+        
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeAssertionStatus.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeAssertionStatus.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeAssertionStatus.java
index 0c14e5d..66b41cf 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeAssertionStatus.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeAssertionStatus.java
@@ -18,21 +18,15 @@ package org.apache.juddi.samples;
 
 import javax.xml.datatype.DatatypeFactory;
 import org.apache.juddi.jaxb.PrintUDDI;
-import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.subscription.ISubscriptionCallback;
 import org.apache.juddi.v3.client.subscription.SubscriptionCallbackListener;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
 import org.uddi.sub_v3.Subscription;
 import org.uddi.sub_v3.SubscriptionFilter;
 import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
-import org.uddi.v3_service.UDDISubscriptionPortType;
 
 /**
  * Thie class shows you how to create a business and a subscription using UDDI
@@ -40,13 +34,8 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
  *
  * @author <a href="mailto:[email protected]";>Alex O'Ree</a>
  */
-public class UddiSubscribeAssertionStatus implements ISubscriptionCallback, 
Runnable {
+public class UddiSubscribeAssertionStatus implements ISubscriptionCallback {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType uddiInquiryService = null;
-        private static UDDISubscriptionPortType uddiSubscriptionService = null;
         boolean callbackRecieved = false;
         private UDDIClerk clerk = null;
         private UDDIClient client = null;
@@ -57,38 +46,19 @@ public class UddiSubscribeAssertionStatus implements 
ISubscriptionCallback, Runn
                         // you can use your config file name
                         client = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         clerk = client.getClerk("default");
-                        Transport transport = client.getTransport();
-                        // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
-                        uddiSubscriptionService = 
transport.getUDDISubscriptionService();
-                } catch (Exception e) {
-                        e.printStackTrace();
-                }
-        }
 
-         public UddiSubscribeAssertionStatus(Transport transport) {
-                try {
-                        // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
-                        uddiSubscriptionService = 
transport.getUDDISubscriptionService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-         
+
         public static void main(String args[]) throws Exception {
                 UddiSubscribeAssertionStatus sp = new 
UddiSubscribeAssertionStatus();
-                sp.Fire("default");
+                sp.fire("default");
         }
 
-        public void Fire(String nodename) throws Exception {
+        public void fire(String nodename) throws Exception {
 
                 TModel createKeyGenator = 
UDDIClerk.createKeyGenator("somebusiness", "A test key domain 
SubscriptionCallbackTest1", "SubscriptionCallbackTest1");
 
@@ -120,18 +90,16 @@ public class UddiSubscribeAssertionStatus implements 
ISubscriptionCallback, Runn
                 sub.setSubscriptionFilter(new SubscriptionFilter());
                 sub.getSubscriptionFilter().setGetAssertionStatusReport(new 
GetAssertionStatusReport());
                 //it's optional
-                
+
                 
//sub.getSubscriptionFilter().getGetAssertionStatusReport().setCompletionStatus(CompletionStatus.STATUS_COMPLETE);
                 Subscription subscriptionBiz = clerk.register(sub, 
clerk.getUDDINode().getApiNode());
 
                 System.out.println("Registered GetAssertionStatus subscription 
key: " + (subscriptionBiz.getSubscriptionKey()) + " bindingkey: " + 
subscriptionBiz.getBindingKey());
 
                 System.out.println("Waiting for callbacks. Now would be a good 
time to launch either another program or juddi-gui to make some changes. Press 
any key to stop!");
-                //Thread hook = new Thread(this);
-              //  Runtime.getRuntime().addShutdownHook(hook);
-                
-                        System.in.read();
-                
+
+                System.in.read();
+
                 SubscriptionCallbackListener.stop(client, nodename, 
start.getBindingKey());
                 
clerk.unRegisterSubscription(subscriptionBiz.getSubscriptionKey());
 
@@ -139,25 +107,19 @@ public class UddiSubscribeAssertionStatus implements 
ISubscriptionCallback, Runn
 
                 clerk.unRegisterBusiness("uddi:somebusiness:somebusinesskey");
 
-                //Runtime.getRuntime().removeShutdownHook(hook);
         }
 
-        private boolean running = true;
-        PrintUDDI<SubscriptionResultsList> p = new 
PrintUDDI<SubscriptionResultsList>();
+        private PrintUDDI<SubscriptionResultsList> printer = new 
PrintUDDI<SubscriptionResultsList>();
 
         @Override
-        public void HandleCallback(SubscriptionResultsList body) {
+        public void handleCallback(SubscriptionResultsList body) {
                 System.out.println("Callback received!");
-                System.out.println(p.print(body));
+                System.out.println(printer.print(body));
         }
 
         @Override
-        public void NotifyEndpointStopped() {
+        public void notifyEndpointStopped() {
                 System.out.println("The endpoint was stopped!");
         }
 
-        @Override
-        public void run() {
-                running = false;
-        }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
index 2d7a83f..7a59bb0 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
@@ -22,15 +22,11 @@ import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.*;
 import org.uddi.sub_v3.CoveragePeriod;
 import org.uddi.sub_v3.GetSubscriptionResults;
 import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
-import org.uddi.v3_service.UDDISubscriptionListenerPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
 
 /**
@@ -41,12 +37,9 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
  */
 public class UddiSubscribeValidate {
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType uddiInquiryService = null;
-        private static UDDISubscriptionPortType uddiSubscriptionService = null;
-        private static UDDISubscriptionListenerPortType 
uddiSubscriptionListenerService = null;
+        private UDDISecurityPortType security = null;
+        private UDDISubscriptionPortType uddiSubscriptionService = null;
+        
 
         public UddiSubscribeValidate() {
                 try {
@@ -56,25 +49,17 @@ public class UddiSubscribeValidate {
                         Transport transport = clerkManager.getTransport();
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
                         uddiSubscriptionService = 
transport.getUDDISubscriptionService();
-                        uddiSubscriptionListenerService = 
transport.getUDDISubscriptionListenerService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
-        
-          public UddiSubscribeValidate(Transport transport) {
+
+        public UddiSubscribeValidate(Transport transport) {
                 try {
                         // Now you create a reference to the UDDI API
                         security = transport.getUDDISecurityService();
-                        juddiApi = transport.getJUDDIApiService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
                         uddiSubscriptionService = 
transport.getUDDISubscriptionService();
-                        uddiSubscriptionListenerService = 
transport.getUDDISubscriptionListenerService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscriptionManagement.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscriptionManagement.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscriptionManagement.java
index 27c3c5a..669267f 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscriptionManagement.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscriptionManagement.java
@@ -16,31 +16,12 @@
 package org.apache.juddi.samples;
 
 import java.util.List;
-import javax.xml.datatype.DatatypeFactory;
 import org.apache.juddi.jaxb.PrintUDDI;
-import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.subscription.SubscriptionCallbackListener;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.uddi.api_v3.BindingTemplate;
-import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.BusinessServices;
-import org.uddi.api_v3.FindBusiness;
-import org.uddi.api_v3.FindQualifiers;
-import org.uddi.api_v3.FindService;
-import org.uddi.api_v3.FindTModel;
-import org.uddi.api_v3.Name;
-import org.uddi.api_v3.TModel;
 import org.uddi.sub_v3.DeleteSubscription;
 import org.uddi.sub_v3.Subscription;
-import org.uddi.sub_v3.SubscriptionFilter;
-import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.UDDIInquiryPortType;
-import org.uddi.v3_service.UDDIPublicationPortType;
-import org.uddi.v3_service.UDDISecurityPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
 
 /**
@@ -48,15 +29,16 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
  * @author Alex O'Ree
  */
 public class UddiSubscriptionManagement {
+        public static void main(String args[]) throws Exception {
+                UddiSubscriptionManagement sp = new 
UddiSubscriptionManagement();
+                sp.printSubscriptions(null);
+        }
 
-        private static UDDISecurityPortType security = null;
-
-        private static UDDIPublicationPortType publish = null;
-        private static UDDIInquiryPortType uddiInquiryService = null;
-        private static UDDISubscriptionPortType uddiSubscriptionService = null;
+        private UDDISubscriptionPortType uddiSubscriptionService = null;
 
         private UDDIClerk clerk = null;
         private UDDIClient client = null;
+        private PrintUDDI<Subscription> printer = new 
PrintUDDI<Subscription>();
 
         public UddiSubscriptionManagement() {
                 try {
@@ -66,34 +48,24 @@ public class UddiSubscriptionManagement {
                         clerk = client.getClerk("default");
                         Transport transport = client.getTransport();
                         // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
                         uddiSubscriptionService = 
transport.getUDDISubscriptionService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
-        
-         public UddiSubscriptionManagement(Transport transport) {
+
+        public UddiSubscriptionManagement(Transport transport) {
                 try {
-                       
+
                         // Now you create a reference to the UDDI API
-                        security = transport.getUDDISecurityService();
-                        publish = transport.getUDDIPublishService();
-                        uddiInquiryService = transport.getUDDIInquiryService();
                         uddiSubscriptionService = 
transport.getUDDISubscriptionService();
                 } catch (Exception e) {
                         e.printStackTrace();
                 }
         }
 
-        public static void main(String args[]) throws Exception {
-                UddiSubscriptionManagement sp = new 
UddiSubscriptionManagement();
-                sp.PrintSubscriptions(null);
-        }
 
-        public void PrintSubscriptions(String authtoken) throws Exception {
+        public void printSubscriptions(String authtoken) throws Exception {
 
                 if (authtoken == null) {
                         authtoken = clerk.getAuthToken();
@@ -102,12 +74,12 @@ public class UddiSubscriptionManagement {
                 System.out.println(subscriptions.size() + " subscriptions 
found");
                 for (int i = 0; i < subscriptions.size(); i++) {
                         
System.out.println("_____________________________________");
-                        
-                        System.out.println(p.print(subscriptions.get(i)));
+
+                        
System.out.println(printer.print(subscriptions.get(i)));
                 }
         }
 
-        public void DeleteSubscription(String authtoken, String key) throws 
Exception {
+        public void deleteSubscription(String authtoken, String key) throws 
Exception {
 
                 if (authtoken == null) {
                         authtoken = clerk.getAuthToken();
@@ -124,7 +96,7 @@ public class UddiSubscriptionManagement {
 
         }
 
-        public void DeleteAllSubscriptions(String authtoken) throws Exception {
+        public void deleteAllSubscriptions(String authtoken) throws Exception {
 
                 if (authtoken == null) {
                         authtoken = clerk.getAuthToken();
@@ -143,7 +115,5 @@ public class UddiSubscriptionManagement {
 
         }
 
-        private boolean running = true;
-        PrintUDDI<Subscription> p = new PrintUDDI<Subscription>();
 
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
index c53d45c..0d08512 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
@@ -27,7 +27,6 @@ import javax.xml.namespace.QName;
 import org.apache.juddi.jaxb.PrintUDDI;
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
 import org.apache.juddi.v3.client.mapping.wadl.Application;
 import org.apache.juddi.v3.client.mapping.wadl.WADL2UDDI;
@@ -55,17 +54,16 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class WadlImport {
 
-        static PrintUDDI<TModel> pTModel = new PrintUDDI<TModel>();
-        static Properties properties = new Properties();
+        
+        private Properties properties = new Properties();
 
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
+        private UDDISecurityPortType security = null;
+        private UDDIPublicationPortType publish = null;
 
-        public void Fire(String pathOrURL, String businessKey, String token, 
Transport transport) throws Exception {
+        public void fire(String pathOrURL, String businessKey, String token, 
Transport transport) throws Exception {
 
                 if (transport == null) {
-                // create a manager and read the config in the archive; 
+                        // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         transport = clerkManager.getTransport();
@@ -191,7 +189,7 @@ public class WadlImport {
 
         public static void main(String[] args) throws Exception {
 
-                new 
WadlImport().Fire("http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl";,
 null, null, null);
+                new 
WadlImport().fire("http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl";,
 null, null, null);
 
         }
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/de1de4c4/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
----------------------------------------------------------------------
diff --git 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
index 2e21f33..2f8a0a7 100644
--- 
a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
+++ 
b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
@@ -28,16 +28,13 @@ import javax.xml.namespace.QName;
 import org.apache.juddi.jaxb.PrintUDDI;
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
 import org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL;
 import org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.api_v3.AuthToken;
 import org.uddi.api_v3.BusinessDetail;
 import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.BusinessService;
 import org.uddi.api_v3.BusinessServices;
 import org.uddi.api_v3.GetAuthToken;
 import org.uddi.api_v3.Name;
@@ -56,21 +53,20 @@ import org.uddi.v3_service.UDDISecurityPortType;
  */
 public class WsdlImport {
 
-        static PrintUDDI<TModel> pTModel = new PrintUDDI<TModel>();
-        static Properties properties = new Properties();
-        static String wsdlURL = null;
-        private static UDDISecurityPortType security = null;
-        private static JUDDIApiPortType juddiApi = null;
-        private static UDDIPublicationPortType publish = null;
+        
+        private Properties properties = new Properties();
+        private String wsdlURL = null;
+        private UDDISecurityPortType security = null;
+        private UDDIPublicationPortType publish = null;
 
         public static void main(String[] args) throws Exception {
-                new 
WsdlImport().Fire("http://svn.apache.org/repos/asf/juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl";,
 null, null, null);
+                new 
WsdlImport().fire("http://svn.apache.org/repos/asf/juddi/trunk/uddi-ws/src/main/resources/juddi_api_v1.wsdl";,
 null, null, null);
         }
 
-        public void Fire(String pathOrURL, String businessKey, String token, 
Transport transport) throws Exception {
+        public void fire(String pathOrURL, String businessKey, String token, 
Transport transport) throws Exception {
 
                 if (transport == null) {
-                // create a manager and read the config in the archive; 
+                        // create a manager and read the config in the 
archive; 
                         // you can use your config file name
                         UDDIClient clerkManager = new 
UDDIClient("META-INF/simple-publish-uddi.xml");
                         transport = clerkManager.getTransport();
@@ -154,7 +150,7 @@ public class WsdlImport {
                 Set<TModel> portTypeTModels = 
wsdl2UDDI.createWSDLPortTypeTModels(wsdlURL, portTypes);
                 Map allBindings = wsdlDefinition.getAllBindings();
                 Set<TModel> createWSDLBindingTModels = 
wsdl2UDDI.createWSDLBindingTModels(wsdlURL, allBindings);
-        //When parsing a WSDL, there's really two things going on
+                //When parsing a WSDL, there's really two things going on
                 //1) convert a bunch of stuff (the portTypes) to tModels
                 //2) convert the service definition to a BusinessService
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to