Author: kstam
Date: Fri Jun 10 13:24:59 2011
New Revision: 1134316
URL: http://svn.apache.org/viewvc?rev=1134316&view=rev
Log:
JUDDI-495, toning down logging
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
Fri Jun 10 13:24:59 2011
@@ -33,11 +33,11 @@ public class BackGroundRegistration impl
public void run() {
try {
if
(UDDIClientContainer.getUDDIClerkManager(manager.getName())!=null &&
manager.getClientConfig().isRegisterOnStartup()) {
- log.info("Starting UDDI Clerks for manager " +
manager.getClientConfig().getManagerName() + "...");
+ log.debug("Starting UDDI Clerks for manager " +
manager.getClientConfig().getManagerName() + "...");
manager.saveClerkAndNodeInfo();
manager.registerAnnotatedServices();
manager.xRegister();
- log.info("Clerks started succesfully for
manager " + manager.getClientConfig().getManagerName());
+ log.debug("Clerks started succesfully for
manager " + manager.getClientConfig().getManagerName());
} else {
log.debug(manager.getName() + " already
registered to the UDDIClientContainer.");
}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
Fri Jun 10 13:24:59 2011
@@ -209,7 +209,7 @@ public class ClientConfig
if (!clerks.containsKey(toClerkRef)) throw new
ConfigurationException("Could not find toClerk with name=" + toClerkRef);
UDDIClerk toClerk = clerks.get(toClerkRef);
xRegistration.setToClerk(toClerk);
- log.info(xRegistration);
+ log.debug(xRegistration);
xRegistrations.add(xRegistration);
}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/Property.java
Fri Jun 10 13:24:59 2011
@@ -51,7 +51,7 @@ public class Property
public static final String DEFAULT_BUSINESS_KEY_FORMAT =
"uddi:${keyDomain}:business_${businessName}";
public static final String DEFAULT_SERVICE_KEY_FORMAT =
"uddi:${keyDomain}:service_${serviceName}";
public static final String DEFAULT_SUBSCRIPTION_KEY_FORMAT =
"uddi:${keyDomain}:service_cache_${nodeName}";
- public static final String DEFAULT_BINDING_KEY_FORMAT =
"uddi:${keyDomain}:binding_${nodeName}_${serviceName}_${portName}_${port}";
+ public static final String DEFAULT_BINDING_KEY_FORMAT =
"uddi:${keyDomain}:binding_${nodeName}_${serviceName}_${portName}";
public static final String DEFAULT_SERVICE_DESCRIPTION = "Default
service description when no <wsdl:document> element is defined inside the
<wsdl:service> element.";
public static final String DEFAULT_BINDING_DESCRIPTION = "Default
binding description when no <wsdl:document> element is defined inside the
<wsdl:binding> element.";
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
Fri Jun 10 13:24:59 2011
@@ -547,7 +547,7 @@ public class UDDIClerk implements Serial
log.info("entityKey " + entityKey + " was not found in
the registry");
} else {
if (report == null) {
- log.error("Missing DispositionReport");
+ log.info("Missing DispositionReport");
} else {
for (Result result : report.getResult()) {
log.error(result.getErrInfo().getErrCode() + " " +
result.getErrInfo().getValue());
@@ -595,7 +595,7 @@ public class UDDIClerk implements Serial
public ClerkDetail saveClerk(UDDIClerk senderClerk) {
ClerkDetail clerkDetail = null;
try {
- log.info("Sending Clerk " + senderClerk.getName() + "
info to jUDDI " + getUDDINode().getName());
+ log.debug("Sending Clerk " + senderClerk.getName() + "
info to jUDDI " + getUDDINode().getName());
SaveClerk saveClerk = new SaveClerk();
saveClerk.setAuthInfo(getAuthToken(senderClerk.getUDDINode().getSecurityUrl()));
saveClerk.getClerk().add(getApiClerk());
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
Fri Jun 10 13:24:59 2011
@@ -163,7 +163,7 @@ public class UDDIClerkManager {
log.error("The client config needs to
have one homeJUDDI node and found " + numberOfHomeJUDDIs);
}
} else {
- log.info("No home clerk found.");
+ log.debug("No home clerk found.");
}
}
}
@@ -172,7 +172,7 @@ public class UDDIClerkManager {
* X-Register services listed in the uddi.xml
*/
public void xRegister() {
- log.info("Starting cross registration...");
+ log.debug("Starting cross registration...");
//XRegistration of listed businesses
Set<XRegistration> xBusinessRegistrations =
clientConfig.getXBusinessRegistrations();
for (XRegistration xRegistration : xBusinessRegistrations) {
@@ -183,7 +183,7 @@ public class UDDIClerkManager {
for (XRegistration xRegistration :
xServiceBindingRegistrations) {
xRegistration.xRegisterServiceBinding();
}
- log.info("Cross registration completed");
+ log.debug("Cross registration completed");
}
/**
* Registers services to UDDI using a clerk, and the uddi.xml
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/BPEL2UDDI.java
Fri Jun 10 13:24:59 2011
@@ -306,7 +306,7 @@ public class BPEL2UDDI extends Annotatio
//customization to add KeyedReferences into the categoryBag of
the service
if (properties.containsKey(Property.SERVICE_CATEGORY_BAG)) {
String serviceCategoryBag =
properties.getProperty(Property.SERVICE_CATEGORY_BAG);
- log.info("Adding KeyedReferences '" +
serviceCategoryBag + "' to service " + serviceName.getLocalPart());
+ log.debug("Adding KeyedReferences '" +
serviceCategoryBag + "' to service " + serviceName.getLocalPart());
CategoryBag categoryBag =
parseCategoryBag(serviceCategoryBag);
service.setCategoryBag(categoryBag);
}
@@ -378,8 +378,8 @@ public class BPEL2UDDI extends Annotatio
tModel.setCategoryBag(categoryBag);
- if (log.isInfoEnabled()) {
- System.out.println(new PrintUDDI<TModel>().print(tModel));
+ if (log.isDebugEnabled()) {
+ log.debug(new PrintUDDI<TModel>().print(tModel));
}
return tModel;
@@ -471,8 +471,8 @@ public class BPEL2UDDI extends Annotatio
log.error("Could not find Service with serviceName: " +
serviceName.getLocalPart());
}
- if (log.isInfoEnabled()) {
- System.out.println(new
PrintUDDI<BindingTemplate>().print(bindingTemplate));
+ if (log.isDebugEnabled()) {
+ log.debug(new
PrintUDDI<BindingTemplate>().print(bindingTemplate));
}
return bindingTemplate;
@@ -504,8 +504,8 @@ public class BPEL2UDDI extends Annotatio
categoryBag.getKeyedReference().add(typesReference);
findTModel.setCategoryBag(categoryBag);
- if (log.isInfoEnabled()) {
- System.out.println(new
PrintUDDI<FindTModel>().print(findTModel));
+ if (log.isDebugEnabled()) {
+ log.debug(new PrintUDDI<FindTModel>().print(findTModel));
}
return findTModel;
}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
Fri Jun 10 13:24:59 2011
@@ -116,7 +116,7 @@ public class ServiceLocator {
+ " with serviceKey
'" + serviceKey + "'"
+ " but no EPRs");
} else {
- log.info("Found service " +
service.getName().get(0).getValue()
+ log.debug("Found service " +
service.getName().get(0).getValue()
+ " with serviceKey
'" + serviceKey + "'"
+ " and " +
bindingTemplates.getBindingTemplate().size() + " EPRs");
//Loop over all bindingTemplates found
and get the endpoints.
@@ -124,7 +124,7 @@ public class ServiceLocator {
AccessPoint accessPoint =
bindingTemplate.getAccessPoint();
if
(AccessPointType.END_POINT.toString().equals(accessPoint.getUseType())) {
String url =
accessPoint.getValue();
- log.info("epr= " + url);
+ log.debug("epr= " +
url);
eprs.add(url);
}
}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIClientSubscriptionListenerImpl.java
Fri Jun 10 13:24:59 2011
@@ -59,7 +59,6 @@ public class UDDIClientSubscriptionListe
public UDDIClientSubscriptionListenerImpl() {
super();
- // TODO Auto-generated constructor stub
}
public static Map<String, UDDIServiceCache> getServiceCacheMap() {
@@ -75,7 +74,7 @@ public class UDDIClientSubscriptionListe
Marshaller marshaller = context.createMarshaller();
StringWriter sw = new StringWriter();
marshaller.marshal(body, sw);
- logger.info("Notification received by
UDDISubscriptionListenerService : " + sw.toString());
+ logger.debug("Notification received by
UDDISubscriptionListenerService : " + sw.toString());
String bindingKey =
body.getSubscriptionResultsList().getSubscription().getBindingKey();
if (serviceCacheMap.containsKey(bindingKey)) {
UDDIServiceCache serviceCache =
serviceCacheMap.get(bindingKey);
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java
Fri Jun 10 13:24:59 2011
@@ -51,8 +51,6 @@ public class UDDIServiceCache {
private Log log = LogFactory.getLog(this.getClass());
private UDDIClerk clerk = null;
private URLLocalizer urlLocalizer = null;
- private Integer port = null;
- private String serverName = "localhost";
private Properties properties = null;
URL serviceUrl = null;
private ConcurrentHashMap<String, Topology> serviceLocationMap = new
ConcurrentHashMap<String, Topology>();
@@ -77,11 +75,14 @@ public class UDDIServiceCache {
private void init() throws DatatypeConfigurationException,
MalformedURLException, WSDLException, RemoteException, ConfigurationException,
TransportException {
- QName serviceQName = new QName("urn:uddi-org:v3_service",
"UDDISubscriptionListenerService");
- String portName = "UDDISubscriptionListenerImplPort";
+ QName serviceQName = new QName("urn:uddi-org:v3_service",
"UDDIClientSubscriptionListenerService");
+ String portName = "UDDIClientSubscriptionListenerImplPort";
+ //Overriding the baseUrl with info obtained from the
URLLocalizer.
String url = urlLocalizer.rewrite(new
URL("http://localhost:8080/subscriptionlistener_"; + clerk.getManagerName()));
- serviceUrl = new URL(url);
+ serviceUrl = new URL(url);
+ log.info("Bring up Subscription Listener for manager " +
clerk.getManagerName()
+ + " with endpoint " + url);
bindingKey = Property.getBindingKey(properties, serviceQName,
portName, serviceUrl);
endpoint = Endpoint.create(new
UDDIClientSubscriptionListenerImpl(bindingKey,this));
endpoint.publish(serviceUrl.toExternalForm());
@@ -95,8 +96,8 @@ public class UDDIServiceCache {
public void shutdown() throws RemoteException, ConfigurationException,
TransportException {
unRegisterSubscription();
- QName serviceQName = new QName("urn:uddi-org:v3_service",
"UDDISubscriptionListenerService");
- String portName = "UDDISubscriptionListenerImplPort";
+ QName serviceQName = new QName("urn:uddi-org:v3_service",
"UDDIClientSubscriptionListenerService");
+ String portName = "UDDIClientSubscriptionListenerImplPort";
WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(clerk, urlLocalizer,
properties);
wsdl2UDDI.unRegister(serviceQName, portName, serviceUrl);
endpoint.stop();
@@ -104,6 +105,7 @@ public class UDDIServiceCache {
}
public void removeAll() {
+ log.info("Flushing the UDDIServiceCache.");
for (String key : serviceLocationMap.keySet()) {
serviceLocationMap.remove(key);
}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java?rev=1134316&r1=1134315&r2=1134316&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WSDL2UDDI.java
Fri Jun 10 13:24:59 2011
@@ -471,12 +471,6 @@ public class WSDL2UDDI {
return typesReference;
}
- @Override
- public String toString() {
- // TODO Auto-generated method stub
- return super.toString();
- }
-
/** Builds a finder to find the binding tModels for a portType.
*
* @param processName
@@ -502,8 +496,8 @@ public class WSDL2UDDI {
findTModel.setCategoryBag(categoryBag);
- if (log.isInfoEnabled()) {
- System.out.println(new
PrintUDDI<FindTModel>().print(findTModel));
+ if (log.isDebugEnabled()) {
+ log.debug(new PrintUDDI<FindTModel>().print(findTModel));
}
return findTModel;
}
@@ -537,8 +531,8 @@ public class WSDL2UDDI {
findTModel.setCategoryBag(categoryBag);
- if (log.isInfoEnabled()) {
- System.out.println(new
PrintUDDI<FindTModel>().print(findTModel));
+ if (log.isDebugEnabled()) {
+ log.debug(new PrintUDDI<FindTModel>().print(findTModel));
}
return findTModel;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
