Author: alexoree
Date: Sun Jan 12 15:59:16 2014
New Revision: 1557549
URL: http://svn.apache.org/r1557549
Log:
JUDDI-775 adding printables for publisher assertions
JUDDI-717 reducing log output for WSDL importer, progress
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java?rev=1557549&r1=1557548&r2=1557549&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDLLocatorImpl.java
Sun Jan 12 15:59:16 2014
@@ -180,7 +180,8 @@ public class WSDLLocatorImpl implements
//inputSource = new InputSource(inputStream);
latestImportURI = url;
} catch (Exception e) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
+ log.debug(e.getMessage(), e);
lastException = e;
} finally {
if (httpclient != null) {
@@ -213,7 +214,8 @@ public class WSDLLocatorImpl implements
try {
baseURIStr = baseURI.toURL().toExternalForm();
} catch (IOException e) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
+ log.debug(e.getMessage(), e);
lastException=e;
}
return baseURIStr;
@@ -248,7 +250,8 @@ public class WSDLLocatorImpl implements
inputSource = new InputSource(inputStream);
latestImportURI = importUrl.toExternalForm();
} catch (Exception e) {
- log.error(e.getMessage(), e);
+ log.error(e.getMessage());
+ log.debug(e.getMessage(), e);
lastException=e;
}
return inputSource;
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java?rev=1557549&r1=1557548&r2=1557549&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
Sun Jan 12 15:59:16 2014
@@ -63,7 +63,7 @@ public class UddiCustodyTransfer {
public static void main(String args[]) throws Exception {
UddiCustodyTransfer sp = new UddiCustodyTransfer();
-
+
GetAuthToken getAuthTokenRoot = new GetAuthToken();
getAuthTokenRoot.setUserID("root");
getAuthTokenRoot.setCred("root");
@@ -80,16 +80,13 @@ public class UddiCustodyTransfer {
AuthToken uddiAuthToken =
security.getAuthToken(getAuthTokenRoot);
System.out.println("uddi AUTHTOKEN = " + "don't log auth
tokens!");
BusinessEntity biz = sp.CreateBusiness("uddi");
-
-
-
- //save user uddi's business
+
+ //save user uddi's business
SaveBusiness sb = new SaveBusiness();
sb.setAuthInfo(uddiAuthToken.getAuthInfo());
sb.getBusinessEntity().add(biz);
BusinessDetail saveBusiness = publish.saveBusiness(sb);
-
-
+
sp.TransferBusiness(uddiAuthToken.getAuthInfo(), "uddi",
rootAuthToken.getAuthInfo(), "root",
saveBusiness.getBusinessEntity().get(0).getBusinessKey());
}
@@ -102,50 +99,61 @@ public class UddiCustodyTransfer {
gcal.setTimeInMillis(System.currentTimeMillis());
XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal);
-
-
//Create a transfer token from fromUser to toUser
KeyBag kb = new KeyBag();
kb.getKey().add(BusinessKey);
Holder<String> nodeidOUT = new Holder<String>();
Holder<XMLGregorianCalendar> expiresOUT = new
Holder<XMLGregorianCalendar>();
Holder<byte[]> tokenOUT = new Holder<byte[]>();
- custodyTransferPortType.getTransferToken(fromUser, kb,
nodeidOUT, expiresOUT, tokenOUT);
+ custodyTransferPortType.getTransferToken(fromUserAuthToken,
kb, nodeidOUT, expiresOUT, tokenOUT);
+
+ System.out.println("Transfer token obtained. Give this to user
" + toUser);
+ System.out.println("Expires " +
expiresOUT.value.toXMLFormat());
+ System.out.println("Node " + nodeidOUT.value);
+ System.out.println("Token " +
org.apache.commons.codec.binary.Base64.encodeBase64String(tokenOUT.value));
+
+ if (toUser == null || toUser.length() == 0 || toUserAuthToken
== null || toUserAuthToken.length() == 0) {
+ System.out.println("The toUser parameters are either
null or empty, I can't complete the transfer here");
+ return;
+ }
//The magic part happens here, the user ROOT needs to give the
user UDDI the token information out of band
//in practice, all values must match exactly
//UDDI now accepts the transfer
TransferEntities te = new TransferEntities();
- te.setAuthInfo(toUser);
+ te.setAuthInfo(toUserAuthToken);
te.setKeyBag(kb);
TransferToken tt = new TransferToken();
tt.setExpirationTime(expiresOUT.value);
tt.setNodeID(nodeidOUT.value);
tt.setOpaqueToken(tokenOUT.value);
te.setTransferToken(tt);
+ System.out.println("Excuting transfer...");
custodyTransferPortType.transferEntities(te);
+ System.out.println("Complete! verifing ownership change...");
//confirm the transfer
GetOperationalInfo go = new GetOperationalInfo();
- go.setAuthInfo(fromUser);
+ go.setAuthInfo(fromUserAuthToken);
go.getEntityKey().add(BusinessKey);
OperationalInfos operationalInfo =
uddiInquiryService.getOperationalInfo(go);
boolean ok = false;
+ boolean found = false;
for (int i = 0; i <
operationalInfo.getOperationalInfo().size(); i++) {
if
(operationalInfo.getOperationalInfo().get(i).getEntityKey().equalsIgnoreCase(BusinessKey))
{
+ found = true;
if
(operationalInfo.getOperationalInfo().get(i).getAuthorizedName().equalsIgnoreCase(fromUser))
{
System.out.println("Transfer
unexpected failed");
}
- } else if
(operationalInfo.getOperationalInfo().get(i).getEntityKey().equalsIgnoreCase(BusinessKey))
{
if
(operationalInfo.getOperationalInfo().get(i).getAuthorizedName().equalsIgnoreCase(toUser))
{
- //success
ok = true;
}
- } else {
- System.out.println("the key wasn't found!");
+
}
}
-
+ if (!found) {
+ System.out.println("Could get the operational info the
transfed business");
+ }
System.out.println("Transfer " + (ok ? "success" : " failed"));
}
@@ -155,5 +163,4 @@ public class UddiCustodyTransfer {
return be;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
