JUDDI-973 more code clean up
JUDDI-977 find bugs
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
index 2d4d72f..492dd9c 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribe.java
@@ -210,13 +210,13 @@
@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!");
}
diff --git a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribeAssertionStatus.java b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribeAssertionStatus.java
index d22704e..882a4bc 100644
--- a/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribeAssertionStatus.java
+++ b/juddi-client-cli/src/main/java/org/apache/juddi/v3/client/cli/UddiSubscribeAssertionStatus.java
@@ -126,13 +126,13 @@
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!");
}
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/ISubscriptionCallback.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/ISubscriptionCallback.java
index f334fc1..b0572e9 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/ISubscriptionCallback.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/ISubscriptionCallback.java
@@ -18,8 +18,10 @@
import org.uddi.sub_v3.SubscriptionResultsList;
/**
- * This is an interface for creating asynchronous callback clientsfor the
+ * This is an interface for creating asynchronous callback clients for the
* UDDI Subscription API.
+ *
+ * Change notice, since 3.3.5, methods were renamed for the most standard convention (lowercase)
* @since 3.2
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
* @see SubscriptionCallbackListener
@@ -31,10 +33,10 @@
* Implementations should never block.
* @param body
*/
- public void HandleCallback(SubscriptionResultsList body);
+ public void handleCallback(SubscriptionResultsList body);
/**
* Called when the callback endpoint is stopped
*/
- public void NotifyEndpointStopped();
+ public void notifyEndpointStopped();
}
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
index a424e19..87bf3dc 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
@@ -543,7 +543,7 @@
for (int i = 0; i < callbacks.size(); i++) {
if (callbacks.get(i) != null) {
try {
- callbacks.get(i).NotifyEndpointStopped();
+ callbacks.get(i).notifyEndpointStopped();
} catch (Exception ex) {
log.warn("Your implementation on ISubscriptionCallback is faulty and threw an error, contact the developer", ex);
}
@@ -614,7 +614,7 @@
public DispositionReport notifySubscriptionListener(NotifySubscriptionListener body) throws DispositionReportFaultMessage, RemoteException {
for (int i = 0; i < callbacks.size(); i++) {
try {
- callbacks.get(i).HandleCallback(body.getSubscriptionResultsList());
+ callbacks.get(i).handleCallback(body.getSubscriptionResultsList());
} catch (Exception ex) {
log.warn("Your implementation on ISubscriptionCallback is faulty and threw an error, contact the developer", ex);
}
diff --git a/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java b/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java
index d4c5b05..c05d30e 100644
--- a/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java
+++ b/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java
@@ -138,11 +138,11 @@
SubscriptionCallbackListener.unRegisterCallback(new ISubscriptionCallback() {
@Override
- public void HandleCallback(SubscriptionResultsList body) {
+ public void handleCallback(SubscriptionResultsList body) {
}
@Override
- public void NotifyEndpointStopped() {
+ public void notifyEndpointStopped() {
}
});
@@ -197,12 +197,12 @@
SubscriptionCallbackListener.registerCallback(new ISubscriptionCallback() {
@Override
- public void HandleCallback(SubscriptionResultsList body) {
+ public void handleCallback(SubscriptionResultsList body) {
log.info("bogus callback received");
}
@Override
- public void NotifyEndpointStopped() {
+ public void notifyEndpointStopped() {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
});
@@ -226,12 +226,12 @@
SubscriptionCallbackListener.registerCallback(new ISubscriptionCallback() {
@Override
- public void HandleCallback(SubscriptionResultsList body) {
+ public void handleCallback(SubscriptionResultsList body) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
- public void NotifyEndpointStopped() {
+ public void notifyEndpointStopped() {
log.info("bogus callback received");
}
@@ -262,13 +262,13 @@
}
@Override
- public void HandleCallback(SubscriptionResultsList body) {
+ public void handleCallback(SubscriptionResultsList body) {
log.info("HandleCallback received");
Test2_NoAutoRegisterAndShortCircuitReceive_ = true;
}
@Override
- public void NotifyEndpointStopped() {
+ public void notifyEndpointStopped() {
log.info("NotifyEndpointStopped received");
Test4_NotifyEndpointStopped_ = true;
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/AES.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/AES.java
index 3a5864f..1c95338 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/AES.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/AES.java
@@ -29,77 +29,77 @@
*/
public class AES {
- public static String GEN(int keysize) {
- KeyGenerator kgen;
- try {
- kgen = KeyGenerator.getInstance("AES");
- kgen.init(keysize);
- SecretKey skey = kgen.generateKey();
- byte[] raw = skey.getEncoded();
- return asHex(raw);
- } catch (Exception ex) {
- }
- return null;
- }
-
- private static String asHex(byte buf[]) {
- //return new String(buf);
- StringBuilder strbuf = new StringBuilder(buf.length * 2);
- int i;
-
- for (i = 0; i < buf.length; i++) {
- if (((int) buf[i] & 0xff) < 0x10) {
- strbuf.append("0");
- }
- strbuf.append(Long.toString((int) buf[i] & 0xff, 16));
+ public static String GEN(int keysize) {
+ KeyGenerator kgen;
+ try {
+ kgen = KeyGenerator.getInstance("AES");
+ kgen.init(keysize);
+ SecretKey skey = kgen.generateKey();
+ byte[] raw = skey.getEncoded();
+ return asHex(raw);
+ } catch (Exception ex) {
+ }
+ return null;
}
- return strbuf.toString();
- }
+ private static String asHex(byte buf[]) {
+ //return new String(buf);
+ StringBuilder strbuf = new StringBuilder(buf.length * 2);
+ int i;
- private static byte[] hexToBytes(String s) {
- //return s.getBytes();
- return hexToBytes(s.toCharArray());
- }
- private static final char[] kDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a',
- 'b', 'c', 'd', 'e', 'f'};
+ for (i = 0; i < buf.length; i++) {
+ if (((int) buf[i] & 0xff) < 0x10) {
+ strbuf.append("0");
+ }
+ strbuf.append(Long.toString((int) buf[i] & 0xff, 16));
+ }
- private static byte[] hexToBytes(char[] hex) {
- int length = hex.length / 2;
- byte[] raw = new byte[length];
- for (int i = 0; i < length; i++) {
- int high = Character.digit(hex[i * 2], 16);
- int low = Character.digit(hex[i * 2 + 1], 16);
- int value = (high << 4) | low;
- if (value > 127) {
- value -= 256;
- }
- raw[i] = (byte) value;
+ return strbuf.toString();
}
- return raw;
- }
- //default key
- // private final static String something2 = "dde284c781d60ca0b56c4b23eec85217951dc99869402abd42c7dcc9080d60aa";
- public static void main(String[] args) throws Exception {
- //ee4bd3eefe38c3d996a89589de5b9698
- String key = GEN(128);
- System.out.println(key);
+ private static byte[] hexToBytes(String s) {
+ //return s.getBytes();
+ return hexToBytes(s.toCharArray());
+ }
+ private static final char[] kDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a',
+ 'b', 'c', 'd', 'e', 'f'};
- byte[] raw = hexToBytes(key); //
- SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
- // Instantiate the cipher
- Cipher cipher = Cipher.getInstance("AES");
- cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
- byte[] encrypted = cipher.doFinal("password".getBytes());
- String enc = (asHex(encrypted));
- System.out.println(enc);
+ private static byte[] hexToBytes(char[] hex) {
+ int length = hex.length / 2;
+ byte[] raw = new byte[length];
+ for (int i = 0; i < length; i++) {
+ int high = Character.digit(hex[i * 2], 16);
+ int low = Character.digit(hex[i * 2 + 1], 16);
+ int value = (high << 4) | low;
+ if (value > 127) {
+ value -= 256;
+ }
+ raw[i] = (byte) value;
+ }
+ return raw;
+ }
+ //default key
+ // private final static String something2 = "dde284c781d60ca0b56c4b23eec85217951dc99869402abd42c7dcc9080d60aa";
- skeySpec = new SecretKeySpec(hexToBytes(key), "AES");
- cipher.init(Cipher.DECRYPT_MODE, skeySpec);
- byte[] original = cipher.doFinal(hexToBytes(enc));
+ public static void main(String[] args) throws Exception {
+ //ee4bd3eefe38c3d996a89589de5b9698
+ String key = GEN(128);
+ System.out.println(key);
- System.out.println(new String(original));
+ byte[] raw = hexToBytes(key); //
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ // Instantiate the cipher
+ Cipher cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ byte[] encrypted = cipher.doFinal("password".getBytes("UTF-8"));
+ String enc = (asHex(encrypted));
+ System.out.println(enc);
- }
+ skeySpec = new SecretKeySpec(hexToBytes(key), "AES");
+ cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+ byte[] original = cipher.doFinal(hexToBytes(enc));
+
+ System.out.println(new String(original, "UTF-8"));
+
+ }
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
index bb9feeb..ff6bea5 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
@@ -38,62 +38,61 @@
/**
* This class was created to demonstrate that UDDI entities's keys do not need
- * to be from the same key domain.
- * I.e. Business key = "uddi:1234:business"
+ * to be from the same key domain. I.e. Business key = "uddi:1234:business"
* which owns Service key "uddi:4567:service1"
*
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class BusinessServiceKeymismatch {
- private static UDDISecurityPortType security = null;
- private static JUDDIApiPortType juddiApi = null;
- private static UDDIPublicationPortType publish = null;
+ private static UDDISecurityPortType security = null;
+ private static JUDDIApiPortType juddiApi = null;
+ private static UDDIPublicationPortType publish = null;
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) throws Exception {
- // 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");
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
- Transport transport = clerkManager.getTransport("default");
- // Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- publish = transport.getUDDIPublishService();
+ // 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");
+ // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ Transport transport = clerkManager.getTransport("default");
+ // Now you create a reference to the UDDI API
+ security = transport.getUDDISecurityService();
+ publish = transport.getUDDIPublishService();
- //step one, get a token
- GetAuthToken getAuthTokenRoot = new GetAuthToken();
- getAuthTokenRoot.setUserID("uddi");
+ //step one, get a token
+ GetAuthToken getAuthTokenRoot = new GetAuthToken();
+ getAuthTokenRoot.setUserID("uddi");
- getAuthTokenRoot.setCred("uddi");
- AuthToken authToken = security.getAuthToken(getAuthTokenRoot);
- TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi:testdomain:keygenerator", "a name", "en");
+ getAuthTokenRoot.setCred("uddi");
+ AuthToken authToken = security.getAuthToken(getAuthTokenRoot);
+ TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi:testdomain:keygenerator", "a name", "en");
- TModel createKeyGenator2 = UDDIClerk.createKeyGenator("uddi:testdomain2:keygenerator", "a name", "en");
+ TModel createKeyGenator2 = UDDIClerk.createKeyGenator("uddi:testdomain2:keygenerator", "a name", "en");
- SaveTModel st = new SaveTModel();
- st.setAuthInfo(authToken.getAuthInfo());
- st.getTModel().add(createKeyGenator);
- st.getTModel().add(createKeyGenator2);
- publish.saveTModel(st);
+ SaveTModel st = new SaveTModel();
+ st.setAuthInfo(authToken.getAuthInfo());
+ st.getTModel().add(createKeyGenator);
+ st.getTModel().add(createKeyGenator2);
+ publish.saveTModel(st);
- SaveBusiness sb = new SaveBusiness();
- sb.setAuthInfo(authToken.getAuthInfo());
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("uddi:testdomain:biz1");
- be.getName().add(new Name("test", "en"));
- be.setBusinessServices(new BusinessServices());
- BusinessService bs = new BusinessService();
- bs.setServiceKey("uddi:testdomain2:svc");
- bs.setBusinessKey("uddi:testdomain:biz1");
- bs.getName().add(new Name("svc", "en"));
- bs.setBindingTemplates(new BindingTemplates());
- BindingTemplate bt = new BindingTemplate();
- bt.setAccessPoint(new AccessPoint("http://localhost", "wsdlDeployment"));
- bt = UDDIClient.addSOAPtModels(bt);
- bs.getBindingTemplates().getBindingTemplate().add(bt);
- be.getBusinessServices().getBusinessService().add(bs);
- sb.getBusinessEntity().add(be);
- publish.saveBusiness(sb);
- }
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authToken.getAuthInfo());
+ BusinessEntity be = new BusinessEntity();
+ be.setBusinessKey("uddi:testdomain:biz1");
+ be.getName().add(new Name("test", "en"));
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.setServiceKey("uddi:testdomain2:svc");
+ bs.setBusinessKey("uddi:testdomain:biz1");
+ bs.getName().add(new Name("svc", "en"));
+ bs.setBindingTemplates(new BindingTemplates());
+ BindingTemplate bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint("http://localhost", "wsdlDeployment"));
+ bt = UDDIClient.addSOAPtModels(bt);
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+ publish.saveBusiness(sb);
+ }
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/CompareByTModelInstanceInfoQOS.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/CompareByTModelInstanceInfoQOS.java
index de8b0d7..6815c48 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/CompareByTModelInstanceInfoQOS.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/CompareByTModelInstanceInfoQOS.java
@@ -37,89 +37,90 @@
import org.uddi.api_v3.TModelInstanceInfo;
/**
- * doesn't make changes to a remote server, just creates a few businesses and compares the two by qos parameters
+ * doesn't make changes to a remote server, just creates a few businesses and
+ * compares the two by qos parameters
+ *
* @author Alex O'Ree
*/
public class CompareByTModelInstanceInfoQOS {
-
- public static void main(String[] args) throws Exception {
- BusinessEntity mary = CreateMary();
- BindingTemplate bt1 = mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0);
- BindingTemplate bt2 = mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1);
-
- TModelInstanceDetailsComparator tidc = new TModelInstanceDetailsComparator(WSDMQosConstants.METRIC_FAULT_COUNT_KEY, true, false, false);
- int compare = tidc.compare(bt1.getTModelInstanceDetails(), bt2.getTModelInstanceDetails());
- if (compare > 0)
- System.out.println(mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue() +
- " is greater than " + mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1).getAccessPoint().getValue());
- if (compare < 0)
- System.out.println(mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue() +
- " is less than " + mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1).getAccessPoint().getValue());
- if (compare== 0)
- System.out.println(mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue() +
- " is equal to " + mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1).getAccessPoint().getValue());
-
- }
+ public static void main(String[] args) throws Exception {
+ BusinessEntity mary = CreateMary();
+ BindingTemplate bt1 = mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0);
+ BindingTemplate bt2 = mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1);
-
+ TModelInstanceDetailsComparator tidc = new TModelInstanceDetailsComparator(WSDMQosConstants.METRIC_FAULT_COUNT_KEY, true, false, false);
+ int compare = tidc.compare(bt1.getTModelInstanceDetails(), bt2.getTModelInstanceDetails());
+ if (compare > 0) {
+ System.out.println(mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue()
+ + " is greater than " + mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1).getAccessPoint().getValue());
+ }
+ if (compare < 0) {
+ System.out.println(mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue()
+ + " is less than " + mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1).getAccessPoint().getValue());
+ }
+ if (compare == 0) {
+ System.out.println(mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue()
+ + " is equal to " + mary.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(1).getAccessPoint().getValue());
+ }
- /**
- * creates a business, service, bt with tmodel instance details with qos
- * parameters
- *
- * @param rootAuthToken
- * @throws Exception
- */
- private static BusinessEntity CreateMary() throws Exception {
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
- be.setDiscoveryURLs(new DiscoveryURLs());
- be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("home", "http://www.marybusinessone.com"));
- be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("serviceList", "http://www.marybusinessone.com/services"));
- be.getName().add(new Name("Mary Doe Enterprises", "en"));
- be.getName().add(new Name("Maria Negocio Uno", "es"));
- be.getDescription().add(new Description("This is the description for Mary Business One.", "en"));
- be.setContacts(new Contacts());
- Contact c = new Contact();
- c.setUseType("administrator");
- c.getPersonName().add(new PersonName("Mary Doe", "en"));
- c.getPersonName().add(new PersonName("Juan Doe", "es"));
- c.getDescription().add(new Description("This is the administrator of the service offerings.", "en"));
- be.getContacts().getContact().add(c);
- be.setBusinessServices(new BusinessServices());
- BusinessService bs = new BusinessService();
- bs.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
- bs.setServiceKey("uddi:uddi.marypublisher.com:marybusinessoneservice");
- bs.getName().add(new Name("name!", "en"));
- bs.setBindingTemplates(new BindingTemplates());
- BindingTemplate bt = new BindingTemplate();
- bt.setAccessPoint(new AccessPoint("http://localhost/endpoint1BAD", AccessPointType.WSDL_DEPLOYMENT.toString()));
- bt.setTModelInstanceDetails(new TModelInstanceDetails());
- TModelInstanceInfo tii = new TModelInstanceInfo();
- tii.setTModelKey(WSDMQosConstants.METRIC_FAULT_COUNT_KEY);
+ }
- tii.setInstanceDetails(new InstanceDetails());
- tii.getInstanceDetails().setInstanceParms("400");
- bt = UDDIClient.addSOAPtModels(bt);
- bt.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
- bs.getBindingTemplates().getBindingTemplate().add(bt);
-
- bt = new BindingTemplate();
- bt.setAccessPoint(new AccessPoint("http://localhost/endpoint2BETTER", AccessPointType.WSDL_DEPLOYMENT.toString()));
- bt.setTModelInstanceDetails(new TModelInstanceDetails());
- tii = new TModelInstanceInfo();
- tii.setTModelKey(WSDMQosConstants.METRIC_FAULT_COUNT_KEY);
+ /**
+ * creates a business, service, bt with tmodel instance details with qos
+ * parameters
+ *
+ * @param rootAuthToken
+ * @throws Exception
+ */
+ private static BusinessEntity CreateMary() throws Exception {
+ BusinessEntity be = new BusinessEntity();
+ be.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
+ be.setDiscoveryURLs(new DiscoveryURLs());
+ be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("home", "http://www.marybusinessone.com"));
+ be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("serviceList", "http://www.marybusinessone.com/services"));
+ be.getName().add(new Name("Mary Doe Enterprises", "en"));
+ be.getName().add(new Name("Maria Negocio Uno", "es"));
+ be.getDescription().add(new Description("This is the description for Mary Business One.", "en"));
+ be.setContacts(new Contacts());
+ Contact c = new Contact();
+ c.setUseType("administrator");
+ c.getPersonName().add(new PersonName("Mary Doe", "en"));
+ c.getPersonName().add(new PersonName("Juan Doe", "es"));
+ c.getDescription().add(new Description("This is the administrator of the service offerings.", "en"));
+ be.getContacts().getContact().add(c);
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
+ bs.setServiceKey("uddi:uddi.marypublisher.com:marybusinessoneservice");
+ bs.getName().add(new Name("name!", "en"));
+ bs.setBindingTemplates(new BindingTemplates());
+ BindingTemplate bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint("http://localhost/endpoint1BAD", AccessPointType.WSDL_DEPLOYMENT.toString()));
+ bt.setTModelInstanceDetails(new TModelInstanceDetails());
+ TModelInstanceInfo tii = new TModelInstanceInfo();
+ tii.setTModelKey(WSDMQosConstants.METRIC_FAULT_COUNT_KEY);
- tii.setInstanceDetails(new InstanceDetails());
- tii.getInstanceDetails().setInstanceParms("4");
- bt = UDDIClient.addSOAPtModels(bt);
- bt.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
- bs.getBindingTemplates().getBindingTemplate().add(bt);
-
-
- be.getBusinessServices().getBusinessService().add(bs);
-
- return be;
- }
+ tii.setInstanceDetails(new InstanceDetails());
+ tii.getInstanceDetails().setInstanceParms("400");
+ bt = UDDIClient.addSOAPtModels(bt);
+ bt.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+
+ bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint("http://localhost/endpoint2BETTER", AccessPointType.WSDL_DEPLOYMENT.toString()));
+ bt.setTModelInstanceDetails(new TModelInstanceDetails());
+ tii = new TModelInstanceInfo();
+ tii.setTModelKey(WSDMQosConstants.METRIC_FAULT_COUNT_KEY);
+
+ tii.setInstanceDetails(new InstanceDetails());
+ tii.getInstanceDetails().setInstanceParms("4");
+ bt = UDDIClient.addSOAPtModels(bt);
+ bt.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+
+ be.getBusinessServices().getBusinessService().add(bs);
+
+ return be;
+ }
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/DES.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/DES.java
index 14f6741..69119b9 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/DES.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/DES.java
@@ -38,67 +38,67 @@
*/
public class DES {
- private static final String UNICODE_FORMAT = "UTF8";
- public static final String DESEDE_ENCRYPTION_SCHEME = "DESede";
- static private KeySpec ks;
- static private SecretKeyFactory skf;
- static private Cipher cipher;
- static byte[] arrayBytes;
- static private String myEncryptionKey;
- static private String myEncryptionScheme;
- static SecretKey key;
+ private static final String UNICODE_FORMAT = "UTF8";
+ public static final String DESEDE_ENCRYPTION_SCHEME = "DESede";
+ static private KeySpec ks;
+ static private SecretKeyFactory skf;
+ static private Cipher cipher;
+ static byte[] arrayBytes;
+ static private String myEncryptionKey;
+ static private String myEncryptionScheme;
+ static SecretKey key;
- public DES() throws Exception {
- }
-
- public String encrypt(String clear) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
- String encryptedString = null;
- try {
- cipher.init(Cipher.ENCRYPT_MODE, key);
- byte[] plainText = clear.getBytes(UNICODE_FORMAT);
- byte[] encryptedText = cipher.doFinal(plainText);
- encryptedString = new String(Base64.encodeBase64(encryptedText));
- } catch (Exception e) {
- e.printStackTrace();
- }
- return encryptedString;
- }
-
- public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
- String encryptedString = null;
- try {
- cipher.init(Cipher.DECRYPT_MODE, key);
- byte[] encryptedText = Base64.decodeBase64(str.getBytes());
- byte[] clear = cipher.doFinal(encryptedText);
- encryptedString = new String(Base64.encodeBase64(clear));
- } catch (Exception e) {
- e.printStackTrace();
- }
- return encryptedString;
- }
-
- public static void main(String[] args) throws Exception {
- DES des = new DES();
- KeyGenerator kgen;
- try {
- kgen = KeyGenerator.getInstance(DESEDE_ENCRYPTION_SCHEME);
- kgen.init(168);
- SecretKey skey = kgen.generateKey();
- byte[] raw = skey.getEncoded();
- myEncryptionKey = new String(Base64.encodeBase64(raw));
- myEncryptionScheme = DESEDE_ENCRYPTION_SCHEME;
- arrayBytes = myEncryptionKey.getBytes(UNICODE_FORMAT);
- ks = new DESedeKeySpec(arrayBytes);
- skf = SecretKeyFactory.getInstance(myEncryptionScheme);
- cipher = Cipher.getInstance(myEncryptionScheme);
- key = skf.generateSecret(ks);
-
- System.out.println(new String(Base64.encodeBase64(raw)));
- System.out.println(des.encrypt("password"));
- System.out.println(des.decrypt(des.encrypt("password")));
- } catch (Exception ex) {
- ex.printStackTrace();;
+ public DES() throws Exception {
}
- }
+ public String encrypt(String clear) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ String encryptedString = null;
+ try {
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+ byte[] plainText = clear.getBytes(UNICODE_FORMAT);
+ byte[] encryptedText = cipher.doFinal(plainText);
+ encryptedString = new String(Base64.encodeBase64(encryptedText), "UTF-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return encryptedString;
+ }
+
+ public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ String encryptedString = null;
+ try {
+ cipher.init(Cipher.DECRYPT_MODE, key);
+ byte[] encryptedText = Base64.decodeBase64(str.getBytes("UTF-8"));
+ byte[] clear = cipher.doFinal(encryptedText);
+ encryptedString = new String(Base64.encodeBase64(clear), "UTF-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return encryptedString;
+ }
+
+ public static void main(String[] args) throws Exception {
+ DES des = new DES();
+ KeyGenerator kgen;
+ try {
+ kgen = KeyGenerator.getInstance(DESEDE_ENCRYPTION_SCHEME);
+ kgen.init(168);
+ SecretKey skey = kgen.generateKey();
+ byte[] raw = skey.getEncoded();
+ myEncryptionKey = new String(Base64.encodeBase64(raw), "UTF-8");
+ myEncryptionScheme = DESEDE_ENCRYPTION_SCHEME;
+ arrayBytes = myEncryptionKey.getBytes(UNICODE_FORMAT);
+ ks = new DESedeKeySpec(arrayBytes);
+ skf = SecretKeyFactory.getInstance(myEncryptionScheme);
+ cipher = Cipher.getInstance(myEncryptionScheme);
+ key = skf.generateSecret(ks);
+
+ System.out.println(new String(Base64.encodeBase64(raw), "UTF-8"));
+ System.out.println(des.encrypt("password"));
+ System.out.println(des.decrypt(des.encrypt("password")));
+ } catch (Exception ex) {
+ ex.printStackTrace();;
+ }
+
+ }
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
index 5170e35..73003d3 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
@@ -16,14 +16,6 @@
package org.apache.juddi.samples;
import java.io.File;
-import java.util.List;
-import org.apache.juddi.api_v3.Node;
-import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDINode;
-import org.apache.juddi.v3.client.transport.Transport;
-import org.uddi.api_v3.DiscardAuthToken;
-import org.uddi.api_v3.GetAuthToken;
-import org.uddi.v3_service.UDDISecurityPortType;
/**
*
@@ -65,8 +57,7 @@
} else {
System.out.println("javax.net.ssl.trustStore = " + trustStore);
}
-
-
+
if (System.getProperty("javax.net.ssl.keyStore") == null) {
File f = new File("../../juddi-tomcat/keystore.jks");
if (f.exists()) {
@@ -142,18 +133,18 @@
System.out.println("2) Digitally sign a UDDI entity from a file.");
System.out.println(" q) Quit/exit");
System.out.print("#");
- input=System.console().readLine();
+ input = System.console().readLine();
processOffline(input);
} while (!"q".equalsIgnoreCase(input));
}
private static void processOffline(String input) throws Exception {
- if (input.equals("1")) {
- CompareByTModelInstanceInfoQOS.main(null);
+ if ("1".equals(input)) {
+ CompareByTModelInstanceInfoQOS.main(new String[0]);
}
- if (input.equals("2")) {
- new UddiDigitalSignatureFile().Fire(null, null, null);
+ if ("2".equals(input)) {
+ new UddiDigitalSignatureFile().fire(null, null, null);
}
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPointSingleNode.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPointSingleNode.java
index 42d190e..6d78051 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPointSingleNode.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPointSingleNode.java
@@ -220,38 +220,38 @@
if (input.equals("9")) {
System.out.print("Business key to sign: ");
String key = (System.console().readLine());
- new UddiDigitalSignatureBusiness().Fire(authtoken, key);
+ new UddiDigitalSignatureBusiness().fire(authtoken, key);
}
if (input.equals("10")) {
System.out.print("Service key to sign: ");
String key = (System.console().readLine());
- new UddiDigitalSignatureService().Fire(authtoken, key);
+ new UddiDigitalSignatureService().fire(authtoken, key);
}
if (input.equals("11")) {
System.out.print("tModel key to sign: ");
String key = (System.console().readLine());
- new UddiDigitalSignatureTmodel().Fire(authtoken, key);
+ new UddiDigitalSignatureTmodel().fire(authtoken, key);
}
if (input.equals("12")) {
- new UddiDigitalSignatureSearch().Fire(authtoken);
+ new UddiDigitalSignatureSearch().fire(authtoken);
}
if (input.equals("13")) {
- new UddiFindBinding().Fire(authtoken);
+ new UddiFindBinding().fire(authtoken);
}
if (input.equals("14")) {
System.out.print("Service key to parse the endpoints: ");
String key = (System.console().readLine());
- new UddiFindEndpoints().Fire(authtoken, key);
+ new UddiFindEndpoints().fire(authtoken, key);
}
if (input.equals("15")) {
System.out.print("Service key: ");
String key = (System.console().readLine());
- new UddiGetServiceDetails().Fire(authtoken, key);
+ new UddiGetServiceDetails().fire(authtoken, key);
}
if (input.equals("16")) {
System.out.print("Get FQDN: ");
String key = (System.console().readLine());
- new UddiKeyGenerator().Fire(authtoken, key);
+ new UddiKeyGenerator().fire(authtoken, key);
}
if (input.equals("17")) {
UDDISecurityPortType security = null;
@@ -284,10 +284,10 @@
System.out.print("relationship (parent-child, peer-peer,or identity) : ");
String relationship = (System.console().readLine());
- new UddiRelatedBusinesses().Fire(key, authtokenFrom, key2, authtokenFrom2, relationship);
+ new UddiRelatedBusinesses().fire(key, authtokenFrom, key2, authtokenFrom2, relationship);
}
if (input.equals("18")) {
- new UddiSubscribe(client, currentNode, transport).Fire();
+ new UddiSubscribe(client, currentNode, transport).fire();
}
if (input.equals("19")) {
@@ -302,40 +302,40 @@
String url = (System.console().readLine());
System.out.print("Business key to attach to: ");
String key = (System.console().readLine());
- new WsdlImport().Fire(url, key, authtoken, transport);
+ new WsdlImport().fire(url, key, authtoken, transport);
}
if (input.equals("21")) {
System.out.print("Path or URL to WADL file: ");
String url = (System.console().readLine());
System.out.print("Business key to attach to: ");
String key = (System.console().readLine());
- new WadlImport().Fire(url, key, authtoken, transport);
+ new WadlImport().fire(url, key, authtoken, transport);
}
if (input.equals("22")) {
- new UddiSubscriptionManagement(transport).PrintSubscriptions(authtoken);
+ new UddiSubscriptionManagement(transport).printSubscriptions(authtoken);
}
if (input.equals("23")) {
System.out.print("Subscription key: ");
String key2 = (System.console().readLine());
- new UddiSubscriptionManagement(transport).DeleteSubscription(authtoken, key2);
+ new UddiSubscriptionManagement(transport).deleteSubscription(authtoken, key2);
}
if (input.equals("24")) {
- new UddiSubscriptionManagement(transport).DeleteAllSubscriptions(authtoken);
+ new UddiSubscriptionManagement(transport).deleteAllSubscriptions(authtoken);
}
if (input.equals("25")) {
- new UddiSubscribeAssertionStatus(transport).Fire(currentNode);
+ new UddiSubscribeAssertionStatus().fire(currentNode);
}
if (input.equals("26")) {
//System.out.println("27) Replication - do_ping");
- new UddiReplication(client, currentNode).DoPing();
+ new UddiReplication(client, currentNode).doPing();
}
if (input.equals("27")) {
//System.out.println("28) Replication - get high watermarks");
- new UddiReplication(client, currentNode).GetHighWatermarks();
+ new UddiReplication(client, currentNode).getHighWatermarks();
}
if (input.equals("28")) {
@@ -347,7 +347,7 @@
System.out.print("Node id of something in the replication graph: ");
String src = (System.console().readLine());
- new UddiReplication(client, currentNode).GetChangeRecords(Long.parseLong(id), src);
+ new UddiReplication(client, currentNode).getChangeRecords(Long.parseLong(id), src);
}
if ("29".equals(input)) {
@@ -552,9 +552,8 @@
System.out.println("after business counts "
+ afterfindBusiness.getListDescription().getActualCount());
System.out.println("actual created " + createdBusinesses);
- System.out.println("Delta = " + (afterfindBusiness.getListDescription().getActualCount() - findBusiness.getListDescription().getActualCount()));
-
-
+ System.out.println("Delta = " + (afterfindBusiness.getListDescription().getActualCount() - findBusiness.getListDescription().getActualCount()));
+
System.out.println("before service counts "
+ findService.getListDescription().getActualCount());
@@ -564,9 +563,11 @@
+ afterfindService.getListDescription().getActualCount());
System.out.println("actual created " + createdServices);
System.out.println("delta = " + (afterfindService.getListDescription().getActualCount() - findService.getListDescription().getActualCount()));
- if ((afterfindService.getListDescription().getActualCount() - findService.getListDescription().getActualCount()) == createdServices)
+ if ((afterfindService.getListDescription().getActualCount() - findService.getListDescription().getActualCount()) == createdServices) {
System.out.println("success");
- else System.out.println("failure!");
+ } else {
+ System.out.println("failure!");
+ }
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoitMultiNode.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoitMultiNode.java
index 84c0efa..19b0264 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoitMultiNode.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoitMultiNode.java
@@ -19,7 +19,6 @@
import org.apache.juddi.api_v3.Node;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
@@ -37,10 +36,10 @@
public class EntryPoitMultiNode {
static void goMultiNode() throws Exception {
- String currentNode = "default";
+
UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+
String input = null;
do {
System.out.println("1) Sets undirected replication two instances of jUDDI");
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
index 0e507ea..3e2fbff 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
@@ -47,162 +47,160 @@
import org.uddi.v3_service.UDDISecurityPortType;
/**
- *
+ * This class was made to try and hunt down a bug reported by an end user.
* @author Alex O'Ree
*/
public class FindBusinessBugHunt {
- 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 static UDDIInquiryPortType inquiry;
+ 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 static UDDIInquiryPortType inquiry;
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) throws Exception {
- // 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");
- UDDIClerk 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();
- publish = transport.getUDDIPublishService();
- inquiry = transport.getUDDIInquiryService();
- //step one, get a token
- GetAuthToken getAuthTokenRoot = new GetAuthToken();
- getAuthTokenRoot.setUserID("uddi");
- getAuthTokenRoot.setCred("uddi");
+ // 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");
+
+ // 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();
+ publish = transport.getUDDIPublishService();
+ inquiry = transport.getUDDIInquiryService();
+ //step one, get a token
+ GetAuthToken getAuthTokenRoot = new GetAuthToken();
+ getAuthTokenRoot.setUserID("uddi");
+ getAuthTokenRoot.setCred("uddi");
- // Making API call that retrieves the authentication token for the 'root' user.
- String rootAuthToken = clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
- String uddi = security.getAuthToken(getAuthTokenRoot).getAuthInfo();
+ // Making API call that retrieves the authentication token for the 'root' user.
+ String uddi = security.getAuthToken(getAuthTokenRoot).getAuthInfo();
- System.out.println("killing mary's business if it exists");
- //first check is Mary's business exists and delete
- DeleteIfExists("uddi:uddi.marypublisher.com:marybusinessone", uddi);
+ System.out.println("killing mary's business if it exists");
+ //first check is Mary's business exists and delete
+ DeleteIfExists("uddi:uddi.marypublisher.com:marybusinessone", uddi);
- System.out.println("making mary's tmodel key gen");
- //make the key gen since our test case uses some custom keys
- TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi.marypublisher.com", "mary key gen", "en");
- //clerk.register(createKeyGenator);
- System.out.println("saving...");
- SaveTM(createKeyGenator, uddi);
+ System.out.println("making mary's tmodel key gen");
+ //make the key gen since our test case uses some custom keys
+ TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi.marypublisher.com", "mary key gen", "en");
+ //clerk.register(createKeyGenator);
+ System.out.println("saving...");
+ SaveTM(createKeyGenator, uddi);
+ System.out.println("fetching business list");
+ BusinessList before = getBusinessList(uddi);
+ if (before.getBusinessInfos() == null) {
+ System.out.println("before no businesses returned!");
+ before.setBusinessInfos(new BusinessInfos());
+ } else {
+ System.out.println(before.getBusinessInfos().getBusinessInfo().size() + " businesses returned before");
+ }
- System.out.println("fetching business list");
- BusinessList before = getBusinessList(uddi);
- if (before.getBusinessInfos() == null) {
- System.out.println("before no businesses returned!");
- before.setBusinessInfos(new BusinessInfos());
- } else {
- System.out.println(before.getBusinessInfos().getBusinessInfo().size() + " businesses returned before");
+ System.out.println("saving mary");
+ SaveMary(uddi);
+
+ BusinessList after = getBusinessList(uddi);
+ if (after.getBusinessInfos() == null) {
+ System.out.println("after no businesses returned!");
+ after.setBusinessInfos(new BusinessInfos());
+ } else {
+ System.out.println(after.getBusinessInfos().getBusinessInfo().size() + " businesses returned after");
+ }
+ PrintUDDI<BusinessList> p = new PrintUDDI<BusinessList>();
+ if (before.getBusinessInfos().getBusinessInfo().size()
+ < after.getBusinessInfos().getBusinessInfo().size()) {
+ System.out.println("hey it worked as advertised, double checking");
+ if (CheckFor(after, "uddi:uddi.marypublisher.com:marybusinessone")) {
+ System.out.println("ok!");
+ } else {
+ System.out.println("no good!");
+ }
+ } else {
+
+ System.out.println("something's not right, here's the before service listing");
+ System.out.println(p.print(before));
+ System.out.println(p.print(after));
+ }
+
}
- System.out.println("saving mary");
- SaveMary(uddi);
-
- BusinessList after = getBusinessList(uddi);
- if (after.getBusinessInfos() == null) {
- System.out.println("after no businesses returned!");
- after.setBusinessInfos(new BusinessInfos());
- } else {
- System.out.println(after.getBusinessInfos().getBusinessInfo().size() + " businesses returned after");
- }
- PrintUDDI<BusinessList> p = new PrintUDDI<BusinessList>();
- if (before.getBusinessInfos().getBusinessInfo().size()
- < after.getBusinessInfos().getBusinessInfo().size()) {
- System.out.println("hey it worked as advertised, double checking");
- if (CheckFor(after, "uddi:uddi.marypublisher.com:marybusinessone")) {
- System.out.println("ok!");
- } else {
- System.out.println("no good!");
- }
- } else {
-
- System.out.println("something's not right, here's the before service listing");
- System.out.println(p.print(before));
- System.out.println(p.print(after));
+ private static void DeleteIfExists(String key, String authInfo) {
+ GetBusinessDetail gbd = new GetBusinessDetail();
+ gbd.setAuthInfo(authInfo);
+ gbd.getBusinessKey().add(key);
+ boolean found = false;
+ try {
+ BusinessDetail businessDetail = inquiry.getBusinessDetail(gbd);
+ if (businessDetail != null
+ && !businessDetail.getBusinessEntity().isEmpty()
+ && businessDetail.getBusinessEntity().get(0).getBusinessKey().equals(key)) {
+ found = true;
+ }
+ } catch (Exception ex) {
+ }
+ if (found) {
+ DeleteBusiness db = new DeleteBusiness();
+ db.setAuthInfo(authInfo);
+ db.getBusinessKey().add(key);
+ try {
+ publish.deleteBusiness(db);
+ } catch (Exception ex) {
+ Logger.getLogger(FindBusinessBugHunt.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
}
- }
-
- private static void DeleteIfExists(String key, String authInfo) {
- GetBusinessDetail gbd = new GetBusinessDetail();
- gbd.setAuthInfo(authInfo);
- gbd.getBusinessKey().add(key);
- boolean found = false;
- try {
- BusinessDetail businessDetail = inquiry.getBusinessDetail(gbd);
- if (businessDetail != null
- && !businessDetail.getBusinessEntity().isEmpty()
- && businessDetail.getBusinessEntity().get(0).getBusinessKey().equals(key)) {
- found = true;
- }
- } catch (Exception ex) {
+ private static BusinessList getBusinessList(String token) throws Exception {
+ FindBusiness fb = new FindBusiness();
+ fb.setAuthInfo(token);
+ org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
+ fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ fb.setFindQualifiers(fq);
+ fb.getName().add((new Name(UDDIConstants.WILDCARD, null)));
+ return inquiry.findBusiness(fb);
}
- if (found) {
- DeleteBusiness db = new DeleteBusiness();
- db.setAuthInfo(authInfo);
- db.getBusinessKey().add(key);
- try {
- publish.deleteBusiness(db);
- } catch (Exception ex) {
- Logger.getLogger(FindBusinessBugHunt.class.getName()).log(Level.SEVERE, null, ex);
- }
+
+ private static void SaveMary(String rootAuthToken) throws Exception {
+ BusinessEntity be = new BusinessEntity();
+ be.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
+ be.setDiscoveryURLs(new DiscoveryURLs());
+ be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("home", "http://www.marybusinessone.com"));
+ be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("serviceList", "http://www.marybusinessone.com/services"));
+ be.getName().add(new Name("Mary Doe Enterprises", "en"));
+ be.getName().add(new Name("Maria Negocio Uno", "es"));
+ be.getDescription().add(new Description("This is the description for Mary Business One.", "en"));
+ be.setContacts(new Contacts());
+ Contact c = new Contact();
+ c.setUseType("administrator");
+ c.getPersonName().add(new PersonName("Mary Doe", "en"));
+ c.getPersonName().add(new PersonName("Juan Doe", "es"));
+ c.getDescription().add(new Description("This is the administrator of the service offerings.", "en"));
+ be.getContacts().getContact().add(c);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(rootAuthToken);
+ sb.getBusinessEntity().add(be);
+ publish.saveBusiness(sb);
}
- }
- private static BusinessList getBusinessList(String token) throws Exception {
- FindBusiness fb = new FindBusiness();
- fb.setAuthInfo(token);
- org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
- fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
- fb.setFindQualifiers(fq);
- fb.getName().add((new Name(UDDIConstants.WILDCARD, null)));
- return inquiry.findBusiness(fb);
- }
-
- private static void SaveMary(String rootAuthToken) throws Exception {
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("uddi:uddi.marypublisher.com:marybusinessone");
- be.setDiscoveryURLs(new DiscoveryURLs());
- be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("home", "http://www.marybusinessone.com"));
- be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("serviceList", "http://www.marybusinessone.com/services"));
- be.getName().add(new Name("Mary Doe Enterprises", "en"));
- be.getName().add(new Name("Maria Negocio Uno", "es"));
- be.getDescription().add(new Description("This is the description for Mary Business One.", "en"));
- be.setContacts(new Contacts());
- Contact c = new Contact();
- c.setUseType("administrator");
- c.getPersonName().add(new PersonName("Mary Doe", "en"));
- c.getPersonName().add(new PersonName("Juan Doe", "es"));
- c.getDescription().add(new Description("This is the administrator of the service offerings.", "en"));
- be.getContacts().getContact().add(c);
- SaveBusiness sb = new SaveBusiness();
- sb.setAuthInfo(rootAuthToken);
- sb.getBusinessEntity().add(be);
- publish.saveBusiness(sb);
- }
-
- private static boolean CheckFor(BusinessList list, String key) {
- for (int i = 0; i < list.getBusinessInfos().getBusinessInfo().size(); i++) {
- if (list.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey().equalsIgnoreCase(key)) {
- return true;
- }
+ private static boolean CheckFor(BusinessList list, String key) {
+ for (int i = 0; i < list.getBusinessInfos().getBusinessInfo().size(); i++) {
+ if (list.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey().equalsIgnoreCase(key)) {
+ return true;
+ }
+ }
+ return false;
}
- return false;
- }
- private static void SaveTM(TModel createKeyGenator, String uddi) throws Exception {
- SaveTModel stm = new SaveTModel();
- stm.setAuthInfo(uddi);
- stm.getTModel().add(createKeyGenator);
- publish.saveTModel(stm);
- }
+ private static void SaveTM(TModel createKeyGenator, String uddi) throws Exception {
+ SaveTModel stm = new SaveTModel();
+ stm.setAuthInfo(uddi);
+ stm.getTModel().add(createKeyGenator);
+ publish.saveTModel(stm);
+ }
}
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
index b26e631..1ed62db 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
@@ -15,7 +15,6 @@
*/
package org.apache.juddi.samples;
-import java.io.File;
import java.io.FileInputStream;
import java.math.BigInteger;
import java.rmi.RemoteException;
@@ -43,7 +42,6 @@
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.Contact;
import org.uddi.api_v3.Description;
-import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.Email;
import org.uddi.api_v3.GetAuthToken;
import org.uddi.api_v3.PersonName;
@@ -64,11 +62,8 @@
*/
public class JuddiAdminService {
- // private static UDDISecurityPortType security = null;
- // private static UDDIPublicationPortType publish = null;
- static JUDDIApiPortType juddi = null;
- // static UDDIClerk clerk = null;
- static UDDIClient clerkManager = null;
+ private JUDDIApiPortType juddi = null;
+ private UDDIClient clerkManager = null;
public JuddiAdminService(UDDIClient client, Transport transport) {
try {
@@ -302,7 +297,7 @@
}
if (input.equalsIgnoreCase("d")) {
//save the changes
- DispositionReport setReplicationNodes = juddiApiService.setReplicationNodes(authtoken, replicationNodes);
+ juddiApiService.setReplicationNodes(authtoken, replicationNodes);
System.out.println("Saved!, dumping config from the server");
replicationNodes = juddiApiService.getReplicationNodes(authtoken);
JAXB.marshal(replicationNodes, System.out);
@@ -483,8 +478,6 @@
void autoMagic123() throws Exception {
//1 > 2 >3 >1
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
-
Transport transport = clerkManager.getTransport("default");
String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
@@ -564,8 +557,6 @@
void autoMagicDirected() throws Exception {
//1 > 2 >3 >1
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
-
Transport transport = clerkManager.getTransport("default");
String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
@@ -665,8 +656,6 @@
void autoMagic() throws Exception {
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
-
Transport transport = clerkManager.getTransport("default");
String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
@@ -683,7 +672,7 @@
}
//if (replicationNodes.getCommunicationGraph() == null) {
- replicationNodes.setCommunicationGraph(new CommunicationGraph());
+ replicationNodes.setCommunicationGraph(new CommunicationGraph());
//}
Operator op = new Operator();
op.setOperatorNodeID("uddi:juddi.apache.org:node1");
@@ -728,8 +717,6 @@
void autoMagic3() throws Exception {
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
-
Transport transport = clerkManager.getTransport("default");
String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
@@ -919,7 +906,17 @@
= KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
- ks.load(new FileInputStream(System.getProperty("javax.net.ssl.keyStore")), System.getProperty("javax.net.ssl.keyStorePassword").toCharArray());
+ FileInputStream fis = null;
+ try {
+ fis = new FileInputStream(System.getProperty("javax.net.ssl.keyStore"));
+ ks.load(fis, System.getProperty("javax.net.ssl.keyStorePassword").toCharArray());
+ } catch (Exception ex) {
+
+ } finally {
+ if (fis != null) {
+ fis.close();
+ }
+ }
kmf.init(ks, System.getProperty("javax.net.ssl.keyStorePassword").toCharArray());
@@ -943,7 +940,6 @@
void autoMagicDirectedSSL() throws Exception {
//1 > 2 >3 >1
- List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
Transport transport = clerkManager.getTransport("default");
String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
index 025e617..c773561 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
@@ -90,12 +90,12 @@
security = transport.getUDDISecurityService();
publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
- //step one, get a token
+ //step one, get a token
//GetAuthToken getAuthTokenRoot = new GetAuthToken();
//getAuthTokenRoot.setUserID("uddi");
//getAuthTokenRoot.setCred("uddi");
- // Making API call that retrieves the authentication token for the 'root' user.
+ // Making API call that retrieves the authentication token for the 'root' user.
//String rootAuthToken = clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
String uddi = token;// security.getAuthToken(getAuthTokenRoot).getAuthInfo();
@@ -145,7 +145,7 @@
}
public static void doFindBinding(String token) throws Exception {
- // 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();
@@ -153,12 +153,12 @@
security = transport.getUDDISecurityService();
publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
- //step one, get a token
+ //step one, get a token
// GetAuthToken getAuthTokenRoot = new GetAuthToken();
//getAuthTokenRoot.setUserID("uddi");
//getAuthTokenRoot.setCred("uddi");
- // Making API call that retrieves the authentication token for the 'root' user.
+ // Making API call that retrieves the authentication token for the 'root' user.
//String rootAuthToken = clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
String uddi = token;//security.getAuthToken(getAuthTokenRoot).getAuthInfo();
@@ -181,7 +181,6 @@
} else {
System.out.println(before.getBindingTemplate().size() + " service returned before");
}
-
System.out.println("saving mary");
SaveMary(uddi);
@@ -205,16 +204,11 @@
System.out.println(p.print(before));
System.out.println(p.print(after));
}
-
-
-
}
-
-
public static void doFindBusiness(String token) throws Exception {
- // 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();
@@ -222,12 +216,12 @@
security = transport.getUDDISecurityService();
publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
- //step one, get a token
+ //step one, get a token
// GetAuthToken getAuthTokenRoot = new GetAuthToken();
//getAuthTokenRoot.setUserID("uddi");
//getAuthTokenRoot.setCred("uddi");
- // Making API call that retrieves the authentication token for the 'root' user.
+ // Making API call that retrieves the authentication token for the 'root' user.
//String rootAuthToken = clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
String uddi = token;//security.getAuthToken(getAuthTokenRoot).getAuthInfo();
@@ -242,10 +236,9 @@
System.out.println("saving...");
SaveTM(createKeyGenator, uddi);
-
- System.out.println("fetching business list");
- BusinessList before2 = getBusinessList(uddi);
- if (before2.getBusinessInfos()== null) {
+ System.out.println("fetching business list");
+ BusinessList before2 = getBusinessList(uddi);
+ if (before2.getBusinessInfos() == null) {
System.out.println("before no service returned!");
// before.setServiceInfos(new ServiceInfos());
} else {
@@ -255,14 +248,12 @@
System.out.println("saving mary");
SaveMary(uddi);
-
-
-
- BusinessList after2 = getBusinessList(uddi);
-
+ BusinessList after2 = getBusinessList(uddi);
+
PrintUDDI<BusinessList> p2 = new PrintUDDI<BusinessList>();
- if (before2.getBusinessInfos()==null )
+ if (before2.getBusinessInfos() == null) {
before2.setBusinessInfos(new BusinessInfos());
+ }
if ((before2.getBusinessInfos().getBusinessInfo().size()
< after2.getBusinessInfos().getBusinessInfo().size())) {
System.out.println("hey it worked as advertised. Here's all the business with QOS parameters");
@@ -302,7 +293,7 @@
}
}
}
-
+
private static BusinessList getBusinessList(String token) throws Exception {
FindBusiness fb = new FindBusiness();
fb.setAuthInfo(token);
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java
index 0bd8085..cb62e1b 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SimpleBrowse.java
@@ -49,18 +49,18 @@
*/
public class SimpleBrowse {
- private static UDDISecurityPortType security = null;
- private static UDDIInquiryPortType inquiry = null;
+ private UDDISecurityPortType security = null;
+ private UDDIInquiryPortType inquiry = null;
/**
* This sets up the ws proxies using uddi.xml in META-INF
*/
public SimpleBrowse() {
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 client = new UDDIClient("META-INF/simple-browse-uddi.xml");
- // a UDDIClient can be a client to multiple UDDI nodes, so
+ // a UDDIClient 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 = client.getTransport("default");
@@ -217,7 +217,7 @@
}
for (int i = 0; i < bindingTemplates.getBindingTemplate().size(); i++) {
System.out.println("Binding Key: " + bindingTemplates.getBindingTemplate().get(i).getBindingKey());
- //TODO The UDDI spec is kind of strange at this point.
+ //TODO The UDDI spec is kind of strange at this point.
//An access point could be a URL, a reference to another UDDI binding key, a hosting redirector (which is
//esscentially a pointer to another UDDI registry) or a WSDL Deployment
//From an end client's perspective, all you really want is the endpoint.
@@ -282,8 +282,6 @@
return null;
}
-
-
private void PrintBusinessInfo(BusinessInfos businessInfos) {
if (businessInfos == null) {
System.out.println("No data returned");
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 @@
*/
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 @@
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 @@
/**
* 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 @@
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 @@
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 @@
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");
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 @@
*/
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 static void main(String args[]) throws Exception {
+ public void main(String args[]) throws Exception {
UddiCustodyTransfer sp = new UddiCustodyTransfer();
GetAuthToken getAuthTokenRoot = new GetAuthToken();
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 @@
*/
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 @@
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 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 @@
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);
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 @@
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 @@
*/
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 @@
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 @@
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 @@
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 @@
}
}
-
}
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 @@
*/
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);
- }
-
- 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();
+ UddiDigitalSignatureSearch sp = new UddiDigitalSignatureSearch();
+ sp.fire(null);
}
- }
- /**
- * 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 {
+ public void fire(String token) {
+ try {
- 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());
+ 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();
+ }
}
- 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(" ");
+ /**
+ * 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);
+
+ // 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 sb.toString();
- }
+
+ 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();
+ }
}
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 @@
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 @@
*/
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 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 @@
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 @@
}
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 @@
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 @@
}
}
- 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 @@
* @param style
* @return
*/
- private String GetAuthKey(String username, String password) {
+ private String getAuthKey(String username, String password) {
try {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
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 @@
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 @@
*/
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 @@
}
}
- /**
- * 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 @@
//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 @@
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 @@
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 @@
}
}
- 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 @@
* @param style
* @return
*/
- private String GetAuthKey(String username, String password) {
+ private String getAuthKey(String username, String password) {
try {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
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 @@
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 @@
*/
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 static void main(String args[]) {
UddiFindBinding sp = new UddiFindBinding();
- sp.Fire(null);
+ sp.fire(null);
}
}
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 @@
*/
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 static void main(String args[]) {
UddiFindEndpoints sp = new UddiFindEndpoints();
- sp.Fire(null, null);
+ sp.fire(null, null);
}
}
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 @@
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 @@
*/
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 @@
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 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");
}
}
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 @@
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 @@
*/
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 @@
st.getTModel().add(m);
publish.saveTModel(st);
- */
+ */
} catch (Exception e) {
e.printStackTrace();
}
@@ -99,6 +92,6 @@
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");
}
}
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.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 @@
*/
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 @@
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 @@
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;
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 @@
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 @@
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 @@
}
}
- 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 @@
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 @@
}
}
- private String GetChangeType(ChangeRecord get) {
+ private String getChangeType(ChangeRecord get) {
if (get.getChangeRecordAcknowledgement() != null) {
return "ACK";
}
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.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 @@
*
* @author <a href="mailto:alexoree@apache.org">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 @@
// 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 @@
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 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 @@
//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;
- }
+
}
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 @@
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 @@
*
* @author <a href="mailto:alexoree@apache.org">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 @@
// 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 @@
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 @@
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;
- }
}
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.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 @@
*/
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 @@
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();
}
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 @@
* @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 @@
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 @@
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 void DeleteAllSubscriptions(String authtoken) throws Exception {
+ public void deleteAllSubscriptions(String authtoken) throws Exception {
if (authtoken == null) {
authtoken = clerk.getAuthToken();
@@ -143,7 +115,5 @@
}
- private boolean running = true;
- PrintUDDI<Subscription> p = new PrintUDDI<Subscription>();
}
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 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 @@
*/
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 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);
}
}
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 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 @@
*/
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 @@
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
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/testStrings.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/testStrings.java
deleted file mode 100644
index c35e5ea..0000000
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/testStrings.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2001-2013 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.juddi.samples;
-
-import java.util.concurrent.atomic.AtomicReference;
-import javax.xml.ws.Holder;
-
-/**
- * A simple program to illistrate how to pass by "reference" vs by "value" in
- * Java. Or more accurately, how to persist changes on method parameters to the
- * caller. Written mostly because I forget it frequently and use this as
- * reference material.
- *
- * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
- */
-public class testStrings {
-
- public static void main(String[] args) {
- String str = "hi";
- System.out.println(str); //hi
- System.out.println(Test1(str)); //hir
- System.out.println(Test2(str)); //hix
- Test3(str);
- System.out.println(str); //hi no change
- Holder<String> holder = new Holder<String>();
- holder.value = str;
- Test4(holder);
- System.out.println(str); //hi no change
- System.out.println(holder.value); //hiw changed persists
-
- AtomicReference<String> astr = new AtomicReference<String>();
- astr.set(str);
- Test5(astr);
- System.out.println(str); //hi no change
- System.out.println(astr.get()); //hit change persists
-
- }
-
- static String Test1(String s) {
- return s + "r";
- }
-
- static String Test2(String s) {
- s += "x";
- return s;
- }
-
- static void Test3(String s) {
- s += "z";
- }
-
- static void Test4(Holder<String> s) {
- s.value += "w";
- }
-
- static void Test5(AtomicReference<String> s) {
- s.set(s.get() + "t");
- }
-}
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
index dd5a269..0c3d55a 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
@@ -200,7 +200,7 @@
private static List<SubscriptionResultsList> notificationsMessages = new ArrayList<SubscriptionResultsList>();
@Override
- public void HandleCallback(SubscriptionResultsList body) {
+ public void handleCallback(SubscriptionResultsList body) {
if (TckCommon.isDebug()) {
PrintUDDI<SubscriptionResultsList> p2 = new PrintUDDI<SubscriptionResultsList>();
logger.info(p2.print(body));
@@ -213,7 +213,7 @@
}
@Override
- public void NotifyEndpointStopped() {
+ public void notifyEndpointStopped() {
logger.info("Notify endpoints stopped");
}
