Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[4269] wsrflite/wsrfcore/trunk
|
From: <bsc...@us...> - 2009-03-03 21:57:27
|
Revision: 4269
http://unicore.svn.sourceforge.net/unicore/?rev=4269&view=rev
Author: bschuller
Date: 2009-03-03 21:57:17 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
improved exception logging; better handling of http timeout properties; minor cleanup
Modified Paths:
--------------
wsrflite/wsrfcore/trunk/pom.xml
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Home.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Kernel.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminTool.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactory.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactoryImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/jetty/JettyServer.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/impl/MessageQueueStore.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/EhCache.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/HsqldbPersist.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/MySQLPersist.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Log.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogInMessageHandler.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogOutMessageHandler.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Utilities.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/AutomaticDeployment.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/DeploymentCenter.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/ServiceConfigReader.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/ReliableProxy.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFInvoker.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireClientFactory.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireKernel.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/http/HttpUtils.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/sg/impl/ServiceGroupRegistrationImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/wsn/impl/NotificationProducerSupport.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/wsn/impl/SubscriptionImpl.java
wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/wsn/provider/WSNProvider.java
wsrflite/wsrfcore/trunk/src/site/apt/admin.apt
wsrflite/wsrfcore/trunk/src/site/apt/configuration.apt
wsrflite/wsrfcore/trunk/src/test/java/de/fzj/unicore/wsrflite/messaging/TestMessaging.java
Modified: wsrflite/wsrfcore/trunk/pom.xml
===================================================================
--- wsrflite/wsrfcore/trunk/pom.xml 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/pom.xml 2009-03-03 21:57:17 UTC (rev 4269)
@@ -105,6 +105,24 @@
<tagBase>https://unicore.svn.sourceforge.net/svnroot/unicore/wsrflite/wsrfcore/tags</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Specification-Title>${name}</Specification-Title>
+ <Specification-Vendor>UNICORE</Specification-Vendor>
+ <Specification-Version>${version}</Specification-Version>
+ <Implementation-Title>${name}</Implementation-Title>
+ <Implementation-Vendor-Id>unicore.eu</Implementation-Vendor-Id>
+ <Implementation-Vendor>UNICORE</Implementation-Vendor>
+ <Implementation-Version>${version}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
<repositories>
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Home.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Home.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Home.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -33,12 +33,12 @@
package de.fzj.unicore.wsrflite;
-import java.rmi.RemoteException;
import java.util.Calendar;
import java.util.Map;
import org.codehaus.xfire.MessageContext;
+import de.fzj.unicore.wsrflite.exceptions.ClientException;
import de.fzj.unicore.wsrflite.exceptions.ResourceNotCreatedException;
import de.fzj.unicore.wsrflite.exceptions.ResourceUnknownException;
import de.fzj.unicore.wsrflite.exceptions.TerminationTimeChangeRejectedException;
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Kernel.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Kernel.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/Kernel.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -64,7 +64,7 @@
*/
public class Kernel {
- public static final String VERSION = "1.8.11-SNAPSHOT";
+ public static final String VERSION = Kernel.class.getPackage().getImplementationVersion();
/**
* property defining the base URL where services can be contacted
@@ -100,7 +100,7 @@
private ISecurityProperties securityProperties;
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE,Kernel.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE,Kernel.class);
private Kernel(){
printHeader();
@@ -164,9 +164,8 @@
/**
* register a wsrf service with the kernel. Delegates to {@link DeploymentCenter}.
- * @see DeploymentCenter
- * @deprecated use {@link DeploymentCenter#deployService(String, String, String, boolean, boolean)} instead
*
+ * @see DeploymentCenter
*/
public void registerWSRFService(String name, Class<?> spec, Class<? extends Home> impl)throws Exception{
String isP=getProperty(XFireKernel.PERSISTENT+"."+name, "true");
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminTool.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminTool.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminTool.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -79,6 +79,7 @@
public static final QName RPLoggedActionsQName=new QName("http://www.fz-juelich.de/unicore/wsrflite","LoggedActions");
+ public static final String SERVICE_NAME="AdminTool";
/**
* Retrieves the resource properties document of the specified WS-Resource
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactory.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactory.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactory.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -46,6 +46,9 @@
*/
@WebService(targetNamespace="http://www.fz-juelich.de/unicore/wsrflite", portName="AdminToolFactory")
public interface AdminToolFactory{
+
+ public static final String SERVICE_NAME="AdminToolFactory";
+
@WebMethod(action="http://www.fz-juelich.de/unicore/wsrflite/admin/service")
public GetAdminToolResponseDocument getAdminTool(GetAdminToolDocument in) throws BaseFault;
}
\ No newline at end of file
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactoryImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactoryImpl.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolFactoryImpl.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -4,7 +4,10 @@
import org.w3.x2005.x08.addressing.AttributedURIType;
import org.w3.x2005.x08.addressing.EndpointReferenceType;
+import de.fzj.unicore.wsrflite.Home;
import de.fzj.unicore.wsrflite.Kernel;
+import de.fzj.unicore.wsrflite.exceptions.ResourceNotCreatedException;
+import de.fzj.unicore.wsrflite.utils.Log;
import de.fzj.unicore.wsrflite.utils.deployment.DeploymentCenter;
import de.fzj.unicore.wsrflite.xmlbeans.BaseFault;
import de.fzj.unicore.wsrflite.xmlbeans.GetAdminToolDocument;
@@ -32,7 +35,8 @@
return response;
}catch(Exception e){
- throw BaseFault.createFault(e.getMessage());
+ Log.log("Error creating service instance", e);
+ throw BaseFault.createFault(e.getMessage(),e);
}
}
@@ -40,8 +44,10 @@
* create AdminTool as Singleton
* @return
*/
- protected String makeNewInstance() throws Exception {
- return DeploymentCenter.getInstance().getServiceHome("AdminTool").createWSRFServiceInstance(null);
+ protected String makeNewInstance() throws ResourceNotCreatedException{
+ Home home=DeploymentCenter.getInstance().getServiceHome(AdminTool.SERVICE_NAME);
+ if(home!=null)return DeploymentCenter.getInstance().getServiceHome(AdminTool.SERVICE_NAME).createWSRFServiceInstance(null);
+ else throw new ResourceNotCreatedException("The "+AdminTool.SERVICE_NAME+" is not deployed.");
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolImpl.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/admin/service/AdminToolImpl.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -32,7 +32,6 @@
package de.fzj.unicore.wsrflite.admin.service;
-import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.annotation.Annotation;
@@ -44,7 +43,6 @@
import javax.xml.namespace.QName;
import org.apache.log4j.Logger;
-import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.codehaus.xfire.service.Service;
import org.w3.x2005.x08.addressing.EndpointReferenceType;
@@ -59,8 +57,6 @@
import de.fzj.unicore.wsrflite.utils.Log;
import de.fzj.unicore.wsrflite.utils.Utilities;
import de.fzj.unicore.wsrflite.utils.deployment.DeploymentCenter;
-import de.fzj.unicore.wsrflite.utils.deployment.exceptions.ServiceAlreadyExistsException;
-import de.fzj.unicore.wsrflite.utils.deployment.exceptions.ServiceDeploymentException;
import de.fzj.unicore.wsrflite.xfire.XFireKernel;
import de.fzj.unicore.wsrflite.xmlbeans.CreateServiceInstanceRequestDocument;
import de.fzj.unicore.wsrflite.xmlbeans.CreateServiceInstanceResponseDocument;
@@ -163,10 +159,9 @@
status = "SUCCESS";
}
catch(Exception e) {
- System.out.println("Retrieving resource property document for '"+serviceName+"' instance "+uid+" failed.\n"+e.getMessage());
+ Log.logException("Retrieving resource property document for '"+serviceName+"' instance "+uid+" failed.",e,logger);
status=status.concat(": "+e.getMessage());
exception = stackTrace(e);
- e.printStackTrace();
}
finally {
log("getServiceInstanceData", new ActionParameter[] {
@@ -210,8 +205,7 @@
catch(Exception e) {
status=status.concat(": "+e.getMessage());
exception=stackTrace(e);
- e.printStackTrace();
- System.out.println("Couldn't delete instance "+uid);
+ Log.logException("Couldn't delete instance "+uid,e,logger);
}
finally {
log("deleteServiceInstance", new ActionParameter[] {
@@ -259,8 +253,7 @@
catch(Exception e) {
status=status.concat(": "+e.getMessage());
exception=stackTrace(e);
- e.printStackTrace();
- System.out.println("Couldn't create a new instance of "+serviceName);
+ Log.logException("Couldn't create a new instance of "+serviceName,e,logger);
}
finally {
log("createServiceInstance", new ActionParameter[] {
@@ -309,29 +302,10 @@
res.addNewDeployServiceResponse().setStatus(status);
}
- catch(IOException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
- catch(XmlException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
- catch(ClassNotFoundException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
- catch(ServiceDeploymentException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
- catch(ServiceAlreadyExistsException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
catch(Exception e) {
status = status.concat(": "+e.getMessage());
exception=stackTrace(e);
+ Log.logException("Deploying service <"+serviceName+"> failed.", e,logger);
}
finally {
log("deployService", new ActionParameter[] {
@@ -366,17 +340,10 @@
status = "SUCCESS";
res.addNewUndeployServiceResponse().setStatus(status);
}
- catch(IOException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
- catch(XmlException e) {
- status = status.concat(": "+e.getMessage());
- exception=stackTrace(e);
- }
catch(Exception e) {
status = status.concat(": "+e.getMessage());
exception=stackTrace(e);
+ Log.logException("Undeploy service <"+serviceName+"> failed",e,logger);
}
@@ -514,10 +481,10 @@
status = "SUCCESS";
}
catch(Exception e) {
- System.out.println("Updating termination time for service '"+serviceName+"' failed.\n"+e.getMessage());
+ Log.logException("Updating termination time for service '"+serviceName+"' failed",e,logger);
status = status.concat(": "+e.getMessage());
exception=stackTrace(e);
- e.printStackTrace();
+
}
finally{
log("setResourceTerminationTime", new ActionParameter[] {
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/DefaultHome.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -154,7 +154,7 @@
protected void initExpiryCheck(){
String[] uniqueIDs=serviceInstances.getUniqueIDs();
- logger.info("Have "+uniqueIDs.length+" instances from permanent storage");
+ logger.info("["+serviceName+"] Have "+uniqueIDs.length+" instances from permanent storage");
//setupTerminationTimeMap(uniqueIDs);
instanceChecking.addAll(uniqueIDs);
@@ -170,7 +170,7 @@
}catch(Exception e){
period=5;
}
- logger.debug("Expiry thread scheduled at a period of "+period+" secs.");
+ logger.debug("["+serviceName+"] Expiry thread scheduled at a period of "+period+" secs.");
ResourcePool.getScheduledExecutorService().scheduleWithFixedDelay(instanceChecking,initial,period,TimeUnit.SECONDS);
}
@@ -229,7 +229,6 @@
return newInstance.getUniqueID();
}
catch(Exception e){
- logger.warn("Resource not created.",e);
throw new ResourceNotCreatedException("Resource not created. Reason: "+e.getMessage(),e);
}
}
@@ -300,8 +299,8 @@
* @return unique id
*/
protected String createServiceReference(MessageContext context) throws ResourceUnknownException{
+ String id=null;
try{
- String id=null;
AddressingHeaders wsaHeaders=(AddressingHeaders)context.getInMessage().getProperty(AddressingInHandler.ADRESSING_HEADERS);
if(wsaHeaders!=null){
try{
@@ -345,17 +344,17 @@
}
}
- if(id!=null){
- return id;
- }
-
+
}
-
- catch(Exception e){
- logger.warn("Could not retrieve service reference from WS-Addressing headers.",e);
+ catch(RuntimeException e){
+ Log.logException("Could not retrieve service reference from the incoming message.", e, logger);
}
- throw new ResourceUnknownException("Could not retrieve service reference from WS-Addressing headers.");
+ if(id!=null){
+ return id;
+ }
+ else throw new ResourceUnknownException("Could not retrieve service reference from the incoming message.");
+
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/ExpiryChecker.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -51,16 +51,13 @@
*/
public class ExpiryChecker implements InstanceChecker {
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE,ExpiryChecker.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE,ExpiryChecker.class);
public boolean check(Home home, String id)throws ResourceUnknownException {
Calendar c=home.getTerminationTime(id);
- if(logger.isDebugEnabled()){
- logger.debug("Checking <"+home.getServiceName()+">"+id);
- }
if(c==null)return false;
if(logger.isDebugEnabled()){
- logger.debug("TT = "+c.getTime());
+ logger.debug("Checking <"+home.getServiceName()+">"+id+" TT = "+c.getTime());
}
return (c.compareTo(Calendar.getInstance())<=0);
}
@@ -74,10 +71,10 @@
// instance is invalid and should be removed from all checks
return false;
}catch(ResourceUnknownException rue){
- logger.warn("Could not find instance "+serviceName+"<"+id+">",rue);
+ Log.logException("Could not find instance "+serviceName+"<"+id+">",rue,logger);
return false;
}catch(Exception e){
- logger.warn("Could not destroy instance "+serviceName+"<"+id+">",e);
+ Log.logException("Could not destroy instance "+serviceName+"<"+id+">",e,logger);
//try again later, do not remove from instance checker
return true;
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/InstanceChecking.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -51,7 +51,7 @@
*/
public class InstanceChecking implements Runnable {
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE,InstanceChecking.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE,InstanceChecking.class);
//list of uniqueIDs
protected final List<String> list;
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/impl/WSRFInstanceImpl.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -161,7 +161,7 @@
terminationTime=newTT;
if(home!=null)home.setTerminationTime(uniqueID,newTT);
}catch(Exception e){
- logger.warn("Error setting tt.",e);
+ Log.logException("Error setting tt.",e,logger);
}
}
@@ -243,7 +243,7 @@
Serializable o=(Serializable)f.get(this);
map.put(key,o);
}catch(Exception e){
- logger.fatal("INTERNAL ERROR persisting: "+f.getName()+" for service "+getServiceName());
+ Log.logException("INTERNAL ERROR persisting: "+f.getName()+" for service "+getServiceName(),e,logger);
}
}
return map;
@@ -257,7 +257,7 @@
try{
f.set(this, state.get(key));
}catch(IllegalAccessException e){
- logger.warn("INTERNAL ERROR writing: "+f.getName());
+ Log.logException("INTERNAL ERROR writing: "+f.getName(),e,logger);
}
}
isDirty=false;
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/jetty/JettyServer.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/jetty/JettyServer.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/jetty/JettyServer.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -86,7 +86,7 @@
*/
public static final String LOW_RESOURCE_MAX_IDLE_TIME = "unicore.wsrflite.jetty.lowResourceMaxIdleTime";
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE,JettyServer.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE,JettyServer.class);
private final Server theServer;
private final String url;
@@ -195,7 +195,7 @@
}
protected void addServlets()throws Exception {
- logger.info("Adding XFire servlet.");// on "+Kernel.getKernel().getProperty(Kernel.WSRF_SERVLETPATH)+"/*");
+ logger.info("Adding XFire servlet.");
root.addServlet(Servlet.class,"/services/*");
String enableGzip=Kernel.getKernel().getProperty(ConfigurableGzipFilter.ENABLE_GZIP, "true");
if("true".equalsIgnoreCase(enableGzip)){
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/MessagingImpl.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -50,13 +50,13 @@
*/
public class MessagingImpl implements IMessaging{
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE,MessagingImpl.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE,MessagingImpl.class);
private static MessagingImpl sm;
- private MessageQueueStore store;
+ private final MessageQueueStore store;
- private HashMap<String,IMessagingProvider>providers;
+ private final HashMap<String,IMessagingProvider>providers;
private MessagingImpl(){
store=new MessageQueueStore("MessageQueueStorage");
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/impl/MessageQueueStore.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/impl/MessageQueueStore.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/messaging/impl/MessageQueueStore.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -60,7 +60,7 @@
*/
public class MessageQueueStore implements IPersistenceProperties{
- protected static final Logger log=Log.getLogger(Log.PERSISTENCE,MessageQueueStore.class);
+ private static final Logger log=Log.getLogger(Log.PERSISTENCE,MessageQueueStore.class);
public static final String CLEAR_ON_STARTUP="MessageQueueStore.clearDBOnStartup";
@@ -119,7 +119,6 @@
}
try{
s.execute("DROP TABLE entries");
-
}catch(SQLException e){
log.warn(e.getMessage());
}
@@ -142,16 +141,20 @@
try{
s.executeUpdate(sql);
}catch(SQLException e){
- log.warn(e.getMessage());
+ if(!e.getMessage().contains("Table already exists")){
+ Log.logException(e.getMessage(),e,log);
+ }
}
try{
s.executeUpdate(sql2);
}catch(SQLException e){
- log.warn(e.getMessage());
+ if(!e.getMessage().contains("Table already exists")){
+ Log.logException(e.getMessage(),e,log);
+ }
}
s.close();
} catch (SQLException e) {
- log.fatal(e.getMessage(),e);
+ Log.logException(e.getMessage(),e,log);
}
try {
psInsertMessage=conn.prepareStatement("INSERT INTO entries(id,destination,data) VALUES (?,?,?)");
@@ -162,7 +165,7 @@
psReadAll=conn.prepareStatement("SELECT data FROM entries WHERE destination=?");
psReadOne=conn.prepareStatement("SELECT data FROM entries WHERE id=?");
} catch (SQLException e) {
- log.fatal("Could not create statements.",e);
+ Log.logException("Could not create statements.",e,log);
}
}
@@ -175,7 +178,7 @@
//create tables if not existing
createTablesAndPreparedStatements();
} catch (Exception e) {
- log.fatal("Error initialising database.",e);
+ Log.logException("Error initialising database.",e,log);
throw new RuntimeException(e);
}
}
@@ -213,7 +216,7 @@
//s.close(); //TODO
return r;
} catch (SQLException e) {
- log.fatal("Error executing "+sql,e);
+ Log.logException("Error executing "+sql,e,log);
return null;
}
}
@@ -232,7 +235,7 @@
s.close();
return true;
} catch (SQLException e) {
- log.fatal("Error executing "+sql,e);
+ Log.logException("Error executing "+sql,e,log);
return false;
}
}
@@ -251,7 +254,7 @@
}
} catch (SQLException e) {
- log.warn("Error writing to queue: "+destination,e);
+ Log.logException("Error writing to queue: "+destination,e,log);
}
}
}
@@ -281,7 +284,7 @@
log.trace("["+dbname+"] "+psCreateDestination.getUpdateCount()+" created.");
}
} catch (SQLException e) {
- log.warn("Create destination: "+e.getMessage());
+ Log.logException("Create destination: "+e.getMessage(),e,log);
}
}
}
@@ -295,7 +298,7 @@
log.trace("["+dbname+"] "+psDeleteDestination.getUpdateCount()+" created.");
}
} catch (SQLException e) {
- log.warn(e.getMessage());
+ Log.logException("Delete destination: "+e.getMessage(),e,log);
}
}
}
@@ -308,7 +311,7 @@
}
return l;
} catch (SQLException e) {
- log.warn("Error getting id list",e);
+ Log.logException("Error getting id list",e,log);
}
return null;
}
@@ -321,7 +324,7 @@
}
return l.toArray(new String[l.size()]);
} catch (SQLException e) {
- log.warn("Error getting id list",e);
+ Log.logException("Error getting id list",e,log);
}
return null;
}
@@ -338,7 +341,7 @@
}
return l.toArray(new String[l.size()]);
}catch(Exception e){
- log.fatal("Error",e);
+ Log.logException("Error reading message ids",e,log);
return new String[0];
}
}
@@ -354,7 +357,7 @@
Message m=(Message)r.getObject(1);
return m;
}catch(Exception e){
- log.fatal("Error",e);
+ Log.logException("Error reading message",e,log);
return null;
}
}
@@ -366,7 +369,7 @@
psDeleteMessage.setString(1,messageID);
psDeleteMessage.execute();
}catch(Exception e){
- log.warn("Error",e);
+ Log.logException("Error removing message <"+messageID+">",e,log);
}
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/AbstractStore.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -63,7 +63,7 @@
*/
public abstract class AbstractStore implements Store {
- protected static final Logger logger=Log.getLogger(Log.PERSISTENCE,AbstractStore.class);
+ private static final Logger logger=Log.getLogger(Log.PERSISTENCE,AbstractStore.class);
protected String serviceName;
@@ -117,7 +117,7 @@
cache=EhCache.createCache(serviceName);
}
catch(Exception e){
- logger.fatal("Could not create cache.");
+ Log.logException("Could not create cache.",e,logger);
}
}
@@ -158,7 +158,7 @@
}
} catch (Exception e) {
String msg=inst!=null?inst.getServiceName()+"["+inst.getUniqueID()+"]":"[null]";
- logger.error("Error persisting "+msg,e);
+ Log.logException("Error persisting "+msg,e,logger);
}
}
@@ -236,7 +236,7 @@
}
}
catch (Exception e) {
- logger.warn("Error reading instance of service '"+serviceName+"'.",e);
+ Log.logException("Error reading instance of service '"+serviceName+"'.",e,logger);
}
return inst;
@@ -343,7 +343,7 @@
instances.clear();
}
catch(Exception e) {
- e.printStackTrace();
+ Log.logException("Error removing service persistence",e,logger);
}
shutdown();
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/EhCache.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/EhCache.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/EhCache.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -20,7 +20,7 @@
*/
public class EhCache {
- protected static final Logger log=Log.getLogger(Log.PERSISTENCE,EhCache.class);
+ private static final Logger log=Log.getLogger(Log.PERSISTENCE,EhCache.class);
private static CacheManager cacheManager;
@@ -115,7 +115,7 @@
try{
cache.put(new Element(inst.getUniqueID(),inst));
}catch(Exception e){
- log.warn("Problem putting item into cache",e);
+ Log.logException("Problem putting item into cache",e,log);
}
}
@@ -123,7 +123,7 @@
try{
cache.remove(id);
}catch(Exception e){
- log.warn("Problem removing item from cache",e);
+ Log.logException("Problem removing item from cache",e,log);
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/HsqldbPersist.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/HsqldbPersist.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/HsqldbPersist.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -34,6 +34,7 @@
package de.fzj.unicore.wsrflite.persistence;
import java.io.File;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -57,7 +58,7 @@
*/
public class HsqldbPersist extends AbstractStore {
- protected static final Logger log=Log.getLogger(Log.PERSISTENCE,HsqldbPersist.class);
+ private static final Logger logger=Log.getLogger(Log.PERSISTENCE,HsqldbPersist.class);
protected Connection conn;
@@ -142,7 +143,7 @@
psDelete=conn.prepareStatement("DELETE FROM entries WHERE id=?");
psRead=conn.prepareStatement("SELECT data FROM entries WHERE id=?");
} catch (SQLException e) {
- logger.fatal("Could not create statement(s).",e);
+ Log.logException("Could not create statement(s).",e,logger);
}
}
@@ -161,7 +162,7 @@
getUniqueIDs();
//initTerminationTimes();
} catch (Exception e) {
- logger.fatal("Error initialising database for <"+serviceName+">",e);
+ Log.logException("Error initialising database for <"+serviceName+">",e,logger);
throw new RuntimeException(e);
}
}
@@ -207,7 +208,7 @@
s.close();
return true;
} catch (SQLException e) {
- logger.fatal("Error executing "+sql,e);
+ Log.logException("Error executing "+sql,e,logger);
return false;
}
}
@@ -251,7 +252,7 @@
uniqueIDs.add(r.getString(1));
}
} catch (SQLException e) {
- logger.warn("Error getting id list",e);
+ Log.logException("Error getting id list",e,logger);
}
finally{
try{s.close();}catch(SQLException ex) {}
@@ -269,7 +270,7 @@
return r.getLong(1);
}
} catch (SQLException e) {
- logger.warn("Error getting id list",e);
+ Log.logException("Error getting id list",e,logger);
}
finally{
try{s.close();}catch(SQLException ex) {}
@@ -292,7 +293,7 @@
logger.debug("Not found: "+serviceName+"<"+uniqueID+">");
}
}catch(Exception e){
- logger.fatal("Error",e);
+ Log.logException("Error",e,logger);
}
return null;
}
@@ -307,7 +308,7 @@
logger.debug("Removed "+serviceName+"<"+uniqueID+">");
}
}catch(Exception e){
- logger.warn("Error",e);
+ Log.logException("Error",e,logger);
}
}
}
@@ -317,7 +318,7 @@
try{
initTerminationTimes();
}catch(Exception e){
- logger.fatal("Can't init termination times!",e);
+ Log.logException("Can't init termination times!",e,logger);
}
haveInitTT=true;
}
@@ -327,38 +328,18 @@
// NEW
public boolean destroyServicePersistence() {
-
boolean deleted=false;
String storageDir = Kernel.getKernel().getProperty("unicore.wsrflite.persistence.storagedirectory");
-
- File f = new File(storageDir+"/"+serviceName+".properties");
+ File dir=new File(storageDir);
+ File[] files=dir.listFiles(new FilenameFilter(){
+ public boolean accept(File dir, String name) {
+ return name.startsWith(serviceName);
+ }
+ });
+ for (File f : files){
if(f.exists())
deleted=f.delete();
-
- f = new File(storageDir+"/"+serviceName+".script");
- if(f.exists())
- deleted=f.delete();
-
- f = new File(storageDir+"/"+serviceName+".backup");
- if(f.exists())
- deleted=f.delete();
-
- f = new File(storageDir+"/"+serviceName+".data");
- if(f.exists())
- deleted=f.delete();
-
- f = new File(storageDir+"/"+serviceName+".lck");
- if(f.exists())
- deleted=f.delete();
-
- f = new File(storageDir+"/"+serviceName+".log");
- if(f.exists())
- deleted=f.delete();
-
- f = new File(storageDir+"/"+serviceName+".properties.new");
- if(f.exists())
- deleted=f.delete();
-
+ }
return deleted;
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/MySQLPersist.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/MySQLPersist.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/MySQLPersist.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -28,7 +28,7 @@
*/
public class MySQLPersist extends AbstractStore {
- protected static final Logger logger=Log.getLogger(Log.PERSISTENCE,MySQLPersist.class);
+ private static final Logger logger=Log.getLogger(Log.PERSISTENCE,MySQLPersist.class);
protected Connection conn;
@@ -146,7 +146,7 @@
} catch (SQLException e) {
- logger.fatal("Could not create statement(s).",e);
+ Log.logException("Could not create statement(s).",e,logger);
}
}
@@ -177,7 +177,7 @@
getUniqueIDs();
}
catch (Exception e) {
- logger.fatal("Error initialising database for <"+serviceName+">",e);
+ Log.logException("Error initialising database for <"+serviceName+">",e,logger);
throw new RuntimeException(e);
}
}
@@ -237,7 +237,7 @@
uniqueIDs.add(r.getString(1));
}
} catch (SQLException e) {
- logger.warn("Error getting id list",e);
+ Log.logException("Error getting id list",e,logger);
}
finally{
@@ -258,7 +258,7 @@
}
else logger.info("Not found: "+uniqueID);
}catch(Exception e){
- logger.fatal("Error",e);
+ Log.logException("Error",e,logger);
}
return null;
}
@@ -276,7 +276,7 @@
logger.trace("Removed "+uniqueID);
}catch(Exception e){
- logger.warn("Error removing entry",e);
+ Log.logException("Error removing entry",e,logger);
}
}
}
@@ -314,7 +314,6 @@
}
}
}
-
}
@Override
@@ -332,7 +331,7 @@
}
}
catch(Exception e) {
- logger.fatal("",e);
+ Log.logException("Error getting termination times.",e,logger);
}
return terminationTimes;
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/persistence/PersistenceManager.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -84,13 +84,13 @@
logger.info("Using '"+persistClass.getName()+"' for permanent storage.");
}
catch(Exception e){
- logger.info("Fallback to in-memory",e);
+ Log.logException("Fallback to in-memory",e,logger);
//fallback to no persistence
isPersistent=false;
try {
persistClass=InMemory.class;
} catch (Exception e1) {
- logger.fatal("Error instantiating class.",e1);
+ Log.logException("Error instantiating class.",e1,logger);
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Log.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Log.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Log.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -46,4 +46,60 @@
return Logger.getLogger(prefix+"."+clazz.getSimpleName());
}
+ /**
+ * log a message to the default logger ("unicore.wsrflite")
+ * A human-friendly message is constructed and logged at "INFO" level.
+ * The stack trace is logged at "DEBUG" level.
+ *
+ * @param message - the error message
+ * @param cause - the cause of the error
+ *
+ */
+ public static void log(String message, Throwable cause){
+ logException(message,cause,Logger.getLogger(WSRFLITE));
+ }
+
+ /**
+ * log an exception to the specified logger.
+ * A human-friendly message is constructed and logged at "INFO" level.
+ * The stack trace is logged at "DEBUG" level.
+ *
+ * @param message - the error message
+ * @param cause - the cause of the error
+ * @param logger - the logger to use
+ */
+ public static void logException(String message, Throwable cause, Logger logger){
+ logger.error(message);
+ if(cause!=null){
+ logger.error("The root error was: "+getDetailMessage(cause));
+ if(logger.isDebugEnabled())logger.debug("Stack trace",cause);
+ else{
+ logger.error("To see the full error stack trace, set log4j.logger."+logger.getName()+"=DEBUG");
+ }
+ }
+ }
+
+ /**
+ * construct a (hopefully) useful error message from the root cause of an
+ * exception
+ * @param throwable
+ * @return the cause of the exception
+ */
+ private static String getDetailMessage(Throwable throwable){
+ StringBuilder sb=new StringBuilder();
+ Throwable cause=throwable;
+ String message=null;
+ String type=null;type=cause.getClass().getName();
+ do{
+ type=cause.getClass().getName();
+ message=cause.getMessage();
+ cause=cause.getCause();
+ }
+ while(cause!=null);
+
+ if(message!=null)sb.append(type).append(": ").append(message);
+ else sb.append(type).append(" (no further message available)");
+ return sb.toString();
+ }
+
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogInMessageHandler.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogInMessageHandler.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogInMessageHandler.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -35,6 +35,9 @@
public void invoke(MessageContext context) throws Exception {
+ //avoid constructing the log message if it will not be logged
+ if(!log.isInfoEnabled())return;
+
Document doc = null;
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setValidating(false);
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogOutMessageHandler.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogOutMessageHandler.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/LogOutMessageHandler.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -47,7 +47,9 @@
public void invoke(MessageContext context) throws Exception {
-
+ //avoid constructing the log message if it will not be logged
+ if(!log.isInfoEnabled())return;
+
OutMessage message = (OutMessage) context.getCurrentMessage();
W3CDOMStreamWriter writer = new W3CDOMStreamWriter(builder);
message.getSerializer().writeMessage(message, writer, context);
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Utilities.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Utilities.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/Utilities.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -222,9 +222,8 @@
* @param source - the xml fragment
* @param q - QName of elements to extract
* @return XmlObject[]
- * @throws XmlException
*/
- public static XmlObject[] extractAnyElements(XmlObject source, QName q)throws XmlException{
+ public static XmlObject[] extractAnyElements(XmlObject source, QName q){
List<XmlObject>results=new ArrayList<XmlObject>();
XmlCursor cursor=null;
try{
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/AutomaticDeployment.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/AutomaticDeployment.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/AutomaticDeployment.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -55,27 +55,23 @@
}
catch(XmlException e) {
String err="AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+"'. Reason: ";
- err = err.concat(e.getMessage());
- logger.info(err);
+ Log.logException(err,e,logger);
}
catch(IOException e) {
String err="AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+"'. Reason: ";
err = err.concat(e.getMessage());
- logger.info(err);
+ Log.logException(err,e,logger);
}
catch(Throwable e) {
- String err=null;
try {
// delete service jar file
DeploymentCenter.getInstance().releaseAndDeleteJar(serviceName);
- err="AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+"'.";
}
catch(IOException ex) {
- //ex.printStackTrace();
- logger.warn(err, ex);
+ String err="AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+"'.";
+ Log.logException(err,e,logger);
}
}
-
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/DeploymentCenter.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/DeploymentCenter.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/DeploymentCenter.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -8,7 +8,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.channels.FileChannel;
@@ -323,13 +322,13 @@
}
catch(IOException e) {
- logger.error("Plugin service deployment error: ", e);
+ Log.logException("Plugin service deployment error", e, logger);
}
catch(XmlException e) {
- logger.error("Plugin service deployment error: ", e);
+ Log.logException("Plugin service deployment error", e, logger);
}
catch(Exception e) {
- logger.error("Plugin service deployment error: ", e);
+ Log.logException("Plugin service deployment error", e, logger);
}
}
@@ -553,29 +552,29 @@
catch(IOException e) {
releaseAndDeleteJar(serviceName);
unregisterService(serviceName);
- logger.warn("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e);
+ Log.logException("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e,logger);
throw e;
}
catch(XmlException e) {
releaseAndDeleteJar(serviceName);
unregisterService(serviceName);
- logger.warn("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e);
+ Log.logException("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e,logger);
throw e;
}
catch(ClassNotFoundException e) {
releaseAndDeleteJar(serviceName);
unregisterService(serviceName);
- logger.warn("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e);
+ Log.logException("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e,logger);
throw e;
}
catch(ServiceDeploymentException e) {
releaseAndDeleteJar(serviceName);
unregisterService(serviceName);
- logger.warn("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e);
+ Log.logException("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e,logger);
throw e;
}
catch(ServiceAlreadyExistsException e) {
- logger.warn("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage());
+ Log.logException("Deployment for service '"+serviceName+"' aborted. Reason: "+e.getMessage(), e,logger);
throw e;
}
finally {
@@ -642,7 +641,7 @@
// update the plugin service configuration xml file
ServiceConfigAccess.getInstance("plugin").addService(serviceName, iFace, impl, isWSRF, isPersistent, tmpCopies.get(serviceName), checksums.get(serviceName));
- System.out.println("The Web Service '"+serviceName+"' has been deployed at "+Kernel.getKernel().getProperty("unicore.wsrflite.baseurl"));
+ logger.info("The Web Service '"+serviceName+"' has been deployed at "+Kernel.getKernel().getProperty("unicore.wsrflite.baseurl"));
}
catch(IOException e) {
releaseAndDeleteJar(serviceName);
@@ -651,15 +650,15 @@
catch(XmlException e) {
releaseAndDeleteJar(serviceName);
String xmlFileName = Kernel.getKernel().getProperty("unicore.wsrflite.utils.deployment.conf_plugin_services");
- logger.warn("AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+". Reason: couldn't access '"+xmlFileName+"'.");
+ Log.logException("AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+". Reason: couldn't access '"+xmlFileName+"'.",e,logger);
}
catch(ClassNotFoundException e) {
releaseAndDeleteJar(serviceName);
- logger.warn("AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+". Reason: couldn't find/load service classes.");
+ Log.logException("AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+". Reason: couldn't find/load service classes.",e,logger);
}
catch(ServiceJarFileManifestFormatException e) {
releaseAndDeleteJar(serviceName);
- logger.warn("AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+". Reason: invalid jar file manifest format.", e);
+ Log.logException("AUTOMATIC SERVICE DEPLOYMENT: couldn't deploy service '"+serviceName+". Reason: invalid jar file manifest format.", e,logger);
}
catch(SameNamedServiceCurrentlyInDeploymentException e) {
// just catch it, no processing or warning necessary
@@ -669,7 +668,7 @@
}
catch(ServiceDeploymentException e) {
releaseAndDeleteJar(serviceName);
- logger.warn("AUTOMATIC SERVICE DEPLOYMENT: "+e.getMessage());
+ Log.logException("AUTOMATIC SERVICE DEPLOYMENT: "+e.getMessage(),e,logger);
}
}
@@ -706,27 +705,15 @@
checksum = makeChecksum(tmpCopy);
// get a URL reference on that copy
- try {
- // load the jar copy with a classloader for this service and add that classloader to the classloader map
- URL url = tmpCopy.toURI().toURL();
- setServiceClassLoader(serviceName, new URLClassLoader( new URL[]{ url }) );
- }
- catch(MalformedURLException e) {
- throw e;
- }
+ // load the jar copy with a classloader for this service and add that classloader to the classloader map
+ URL url = tmpCopy.toURI().toURL();
+ setServiceClassLoader(serviceName, new URLClassLoader( new URL[]{ url }) );
+ // test-load the service classes
+ Class.forName(iFace, true, getServiceClassLoader(serviceName));
+ Class.forName(impl, true, getServiceClassLoader(serviceName));
+ classesLoaded = true;
- try {
- // test-load the service classes
- Class.forName(iFace, true, getServiceClassLoader(serviceName));
- Class.forName(impl, true, getServiceClassLoader(serviceName));
- classesLoaded = true;
- }
- catch(ClassNotFoundException e) {
- e = new ClassNotFoundException("SERVICE_CLASS_LOADING_EXCEPTION", e.getCause());
- throw e;
- }
-
// store the path to the temporary jar file copy of this service
tmpCopies.put(serviceName, tmpCopy.getName());
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/ServiceConfigReader.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/ServiceConfigReader.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/utils/deployment/ServiceConfigReader.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -120,7 +120,7 @@
Kernel.getKernel().setProperty(Kernel.WSRF_HOST, p.getCanonicalHostName());
}
catch(Exception e){
- logger.warn("Could not determine hostname. Fallback to localhost");
+ Log.logException("Could not determine hostname. Fallback to localhost",e,logger);
Kernel.getKernel().setProperty(Kernel.WSRF_HOST,"localhost");
}
}
@@ -224,7 +224,7 @@
try{
deployService(current,iFace,clazz,isWSRF,isPersistent);
}catch(Exception ex){
- logger.warn("Cannot deploy service <"+current+">", ex);
+ Log.logException("Cannot deploy service <"+current+">", ex, logger);
}
finally{
inhandlers.clear();
@@ -262,7 +262,7 @@
s.addInHandler(handler);
logger.info("Added incoming handler <"+h+"> on service <"+s.getSimpleName()+">");
}catch(Exception e){
- logger.fatal("Could not add handler",e);
+ Log.logException("Could not add handler",e,logger);
}
}
}
@@ -274,7 +274,7 @@
s.addOutHandler(handler);
logger.debug("Added outgoing handler <"+h+"> on service <"+s.getSimpleName()+">");
}catch(Exception e){
- logger.fatal("Could not add handler",e);
+ Log.logException("Could not add handler",e,logger);
}
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/ReliableProxy.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/ReliableProxy.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/ReliableProxy.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -68,7 +68,7 @@
try{
return doInvoke(proxy, method, args);
}catch(Throwable t){
- log.error("Error making call for "+method.getName()+" on "+client.getUrl(),t);
+ Log.logException("Error making call for "+method.getName()+" on "+client.getUrl(),t,log);
cause=t;
n++;
failedSubmits++;
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFInvoker.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFInvoker.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/WSRFInvoker.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -120,7 +120,7 @@
try{
hasMessages=Kernel.getMessaging().hasMessages(id);
}catch(MessagingException e){
- logger.warn("Error getting messages for "+id,e);
+ Log.logException("Error getting messages for "+id,e,logger);
}
if(!ps.isAllowedConcurrentAccess()){
if(!allowConcurrentMethod || hasMessages){
@@ -184,8 +184,8 @@
PersistenceManager.persist(serviceInstance);
}
}catch(Exception e){
- logger.error("Could not persist service instance " +
- "{"+serviceInstance.getServiceName()+"}"+serviceInstance.getUniqueID(),e);
+ Log.logException("Could not persist service instance " +
+ "{"+serviceInstance.getServiceName()+"}"+serviceInstance.getUniqueID(),e,logger);
}
serviceInstance.clearSecurityContext();
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireClientFactory.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireClientFactory.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireClientFactory.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -230,30 +230,7 @@
return null;
}
}
- /**
- * configure client-side security (JSSE) settings
- * @deprecated use configureSecurity(Object proxy) instead
- */
- protected void configureSecurity(){
-
- try{
- System.setProperty("javax.net.ssl.keyStorePassword",securityProperties.getKeystorePassword());
- System.setProperty("javax.net.ssl.keyStoreType",securityProperties.getKeystoreType());
- System.setProperty("javax.net.ssl.keyStore",securityProperties.getKeystore());
- }catch(Exception e){
- logger.warn("Could not configure keystore, "+e.getMessage());
- }
- try{
- System.setProperty("javax.net.ssl.trustStore",securityProperties.getTruststore());
- System.setProperty("javax.net.ssl.trustStoreType",securityProperties.getTruststoreType());
- System.setProperty("javax.net.ssl.trustStorePassword",securityProperties.getTruststorePassword());
- }catch(Exception e){
- logger.warn("Could not configure truststore, "+e.getMessage());
- }
-
- }
-
/**
* customize security settings on the client proxy object
*
@@ -265,7 +242,7 @@
Client client=xp.getClient();
configureSecurity(client, sec);
}catch(Exception e){
- logger.fatal("Could not set host configuration",e);
+ Log.logException("Could not set host configuration",e,logger);
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireKernel.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireKernel.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/XFireKernel.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -64,7 +64,7 @@
*/
public class XFireKernel {
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE, XFireKernel.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE, XFireKernel.class);
private static final Map<String,Service> services=Collections.synchronizedMap(new HashMap<String,Service>());
@@ -222,14 +222,14 @@
ServiceFactory i=(ServiceFactory)Class.forName("de.fzj.unicore.wsrflite.jaxb.ServiceFactory").newInstance();
return i;
}catch(Exception e){
- logger.fatal("",e);
+ Log.logException("Can't create service factory.",e,logger);
return null;
}
}
else if(BINDING_XMLBEANS.equalsIgnoreCase(annot.name())) return new JSR181ServiceFactory();
else {
- logger.debug("No matching binding found, fallback to default.");
- return null;
+ logger.debug("No matching binding found, fallback to default xmlbeans.");
+ return new JSR181ServiceFactory();
}
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/http/HttpUtils.java
===================================================================
--- wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/http/HttpUtils.java 2009-03-03 21:28:12 UTC (rev 4268)
+++ wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xfire/http/HttpUtils.java 2009-03-03 21:57:17 UTC (rev 4269)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.net.URI;
+import java.net.URISyntaxException;
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.Header;
@@ -40,7 +41,7 @@
*/
public class HttpUtils {
- protected static final Logger logger=Log.getLogger(Log.WSRFLITE,HttpUtils.class);
+ private static final Logger logger=Log.getLogger(Log.WSRFLITE,HttpUtils.class);
//prevent instantiation
private HttpUtils(){}
@@ -143,16 +144,24 @@
boolean disableEC = Boolean.valueOf((String) Kernel.getKernel().getProperty(DISABLE_EXPECT_CONTINUE)).booleanValue();
params.setBooleanParameter("http.protocol.expect-continue", !disableEC);
params.setVersion(HttpVersion.HTTP_1_1);
- String timeoutStr = (String) Kernel.getKernel().getProperty(HTTP_TIMEOUT, "20000");
- if (timeoutStr != null)
- {
- client.getParams().setSoTimeout(Integer.parseInt(timeoutStr));
+
+ Integer timeout=Integer.valueOf(10000);
+ try{
+ timeout=Integer.parseInt((String) Kernel.getKernel().getProperty(HTTP_TIMEOUT, "20000"));
+ }catch(NumberFormatException nfe){
+ Log.logException("Illegal number format for parameter "+HTTP_TIMEOUT, nfe, logger);
}
- String connTimeoutStr = (String) Kernel.getKernel().getProperty(HTTP_CONNECT_TIMEOUT, "10000");
- if (connTimeoutStr!= null)
- {
- client.getParams().setIntParameter(HTTP_CONNECT_TIMEOUT, Integer.parseInt(connTimeoutStr));
+ client.getParams().setSoTimeout(timeout);
+
+
+ Integer hct=Integer.valueOf(10000);
+ try{
+ hct=Integer.parseInt((String) Kernel.getKernel().getProperty(HTTP_CONNECT_TIMEOUT, "10000"));
+ }catch(NumberFormatException nfe){
+ Log.logException("Illegal number format for parameter "+HTTP_CONNECT_TIMEOUT, nfe, logger);
}
+ client.getParams().setIntParameter(HTTP_CONNECT_TIMEOUT, hct);
+
return client;
}
@@ -212,7 +221,6 @@
return c;
}
- //TODO
private static boolean isNonProxyHost(String uri){
String nonProxyHosts=(String)Kernel.getKernel().getProperty(HTTP_NON_PROXY_HOSTS);
if(nonProxyHosts==null)return false;
@@ -223,9 +231,10 @@
for(String npHost: npHosts){
if(host.contains(npHost))return true;
}
- }catch(Exception e){
- logger.fatal("Can't resolve URI from "+uri);
- }
+ }catch(URISyntaxException e){
+ Log.logException("Can't resolve URI from "+uri,e,logger);
+ }
+
return false;
}
Modified: wsrflite/wsrfcore/trunk/src/main/java/de/fzj/unicore/wsrflite/xmlbeans/impl/WSResourceImpl.java
===================================================================
--- wsrflite/wsrfcore/trunk...
[truncated message content] |