[jboss-svn-commits] JBL Code SVN: r12486 - in labs/jbossesb/workspace/dbevenius: product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers and 22 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 12 09:08:47 EDT 2007
Author: beve
Date: 2007-06-12 09:08:46 -0400 (Tue, 12 Jun 2007)
New Revision: 12486
Added:
labs/jbossesb/workspace/dbevenius/product/lib/ext/commons-httpclient.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/javassist.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-aop-jdk50.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossweb.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/trove.jar
labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/lib/log4j.jar
labs/jbossesb/workspace/dbevenius/qa/lib/ext/javassist.jar
labs/jbossesb/workspace/dbevenius/qa/lib/ext/jboss-aop-jdk50.jar
labs/jbossesb/workspace/dbevenius/qa/lib/ext/trove.jar
Removed:
labs/jbossesb/workspace/dbevenius/product/lib/ext/jms/jbossmessaging/
Modified:
labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java
labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/HibernateListenerMapper.java
labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java
labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java
labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java
labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java
labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java
labs/jbossesb/workspace/dbevenius/product/core/services/build.xml
labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java
labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java
labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java
labs/jbossesb/workspace/dbevenius/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
labs/jbossesb/workspace/dbevenius/product/docs/services/ContentBasedRouting.odt
labs/jbossesb/workspace/dbevenius/product/install/standalone/jbossesb-server-base.zip
labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-jaxws.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-messaging-client.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-remoting.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-system.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossall-client.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossts-common.jar
labs/jbossesb/workspace/dbevenius/product/lib/ext/log4j.jar
labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/Bank.java
labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerFlatFile.java
labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java
labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/BankTest.java
labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/FlatFileProcessorTest.java
labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java
labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
labs/jbossesb/workspace/dbevenius/qa/lib/ext/jboss-messaging-client.jar
labs/jbossesb/workspace/dbevenius/qa/log4j.xml
Log:
Merge from main: 12459:12480
Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/actions/soap/JBossWSAdapter.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -34,9 +34,9 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.BasicInvocationContext;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.invocation.BasicInvocationContext;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/HibernateListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/HibernateListenerMapper.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/HibernateListenerMapper.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -32,7 +32,6 @@
import org.jboss.soa.esb.listeners.config.HibernateListenerDocument.HibernateListener;
import org.jboss.soa.esb.listeners.config.HibernateMessageFilterDocument.HibernateMessageFilter;
import org.jboss.soa.esb.listeners.config.HibernateProviderDocument.HibernateProvider;
-
import org.jboss.soa.esb.listeners.gateway.HibernateGatewayListener;
import org.w3c.dom.Element;
Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateEventListener.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -28,7 +28,51 @@
import org.apache.log4j.Logger;
import org.hibernate.HibernateException;
-import org.hibernate.event.*;
+import org.hibernate.event.AbstractEvent;
+import org.hibernate.event.AutoFlushEvent;
+import org.hibernate.event.AutoFlushEventListener;
+import org.hibernate.event.DeleteEvent;
+import org.hibernate.event.DeleteEventListener;
+import org.hibernate.event.DirtyCheckEvent;
+import org.hibernate.event.DirtyCheckEventListener;
+import org.hibernate.event.EvictEvent;
+import org.hibernate.event.EvictEventListener;
+import org.hibernate.event.FlushEntityEvent;
+import org.hibernate.event.FlushEntityEventListener;
+import org.hibernate.event.FlushEvent;
+import org.hibernate.event.FlushEventListener;
+import org.hibernate.event.InitializeCollectionEvent;
+import org.hibernate.event.InitializeCollectionEventListener;
+import org.hibernate.event.LoadEvent;
+import org.hibernate.event.LoadEventListener;
+import org.hibernate.event.LockEvent;
+import org.hibernate.event.LockEventListener;
+import org.hibernate.event.MergeEvent;
+import org.hibernate.event.MergeEventListener;
+import org.hibernate.event.PersistEvent;
+import org.hibernate.event.PersistEventListener;
+import org.hibernate.event.PostDeleteEvent;
+import org.hibernate.event.PostDeleteEventListener;
+import org.hibernate.event.PostInsertEvent;
+import org.hibernate.event.PostInsertEventListener;
+import org.hibernate.event.PostLoadEvent;
+import org.hibernate.event.PostLoadEventListener;
+import org.hibernate.event.PostUpdateEvent;
+import org.hibernate.event.PostUpdateEventListener;
+import org.hibernate.event.PreDeleteEvent;
+import org.hibernate.event.PreDeleteEventListener;
+import org.hibernate.event.PreInsertEvent;
+import org.hibernate.event.PreInsertEventListener;
+import org.hibernate.event.PreLoadEvent;
+import org.hibernate.event.PreLoadEventListener;
+import org.hibernate.event.PreUpdateEvent;
+import org.hibernate.event.PreUpdateEventListener;
+import org.hibernate.event.RefreshEvent;
+import org.hibernate.event.RefreshEventListener;
+import org.hibernate.event.ReplicateEvent;
+import org.hibernate.event.ReplicateEventListener;
+import org.hibernate.event.SaveOrUpdateEvent;
+import org.hibernate.event.SaveOrUpdateEventListener;
/**
* This class is a Hibernate EventListener which implements hooks to all the available
Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -21,8 +21,8 @@
*/
package org.jboss.soa.esb.listeners.gateway;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.ArrayList;
import org.apache.log4j.Logger;
import org.hibernate.SessionFactory;
Modified: labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/HibernateInterceptor.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -34,7 +34,6 @@
import org.hibernate.EmptyInterceptor;
import org.hibernate.Transaction;
import org.hibernate.type.Type;
-
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.MalformedEPRException;
Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -1,7 +1,7 @@
package org.jboss.soa.esb.persistence.manager;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.util.ClassUtil;
@@ -19,7 +19,7 @@
if (className==null) {
className = DEFAULT;
}
- logger.log(Priority.DEBUG, "Going to load " + className);
+ logger.log(Level.DEBUG, "Going to load " + className);
try{
// instruct class loader to load the connection manager
Class managerClass = ClassUtil.forName(className, ConnectionManagerFactory.class);
Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -30,8 +30,8 @@
import junit.framework.JUnit4TestAdapter;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -145,7 +145,7 @@
{
// Setting a Bogus Driver
SimpleDataSource simpleDS = new SimpleDataSource("bogusDriver", mDbUrl, mDbUsername, mDbPassword);
- logger.log(Priority.INFO, simpleDS);
+ logger.log(Level.INFO, simpleDS);
assertTrue(false);
}
catch (Exception _ex)
Modified: labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/rosetta/tests/src/org/jboss/soa/esb/util/ClassUtilUnitTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -32,8 +32,8 @@
public void test_getResourceList() {
List<String> resources;
- resources = ClassUtil.getResourceList("/org/apache/log4j/jmx/Abstract.*", ClassUtilUnitTest.class);
+ resources = ClassUtil.getResourceList("/org/apache/log4j/jdbc/JDBC.*", ClassUtilUnitTest.class);
assertEquals(1, resources.size());
- assertTrue(resources.contains("/org/apache/log4j/jmx/AbstractDynamicMBean.class"));
+ assertTrue(resources.contains("/org/apache/log4j/jdbc/JDBCAppender.class"));
}
}
Modified: labs/jbossesb/workspace/dbevenius/product/core/services/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/build.xml 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/build.xml 2007-06-12 13:08:46 UTC (rev 12486)
@@ -28,7 +28,7 @@
<!-- Define the class path -->
<!-- =================================================================== -->
<path id="org.jboss.esb.services.base.classpath">
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar" excludes="jbossall-client.jar"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar" />
<pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
</path>
Modified: labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -53,8 +53,8 @@
import javax.xml.registry.infomodel.TelephoneNumber;
import javax.xml.registry.infomodel.User;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.common.Configuration;
@@ -102,7 +102,7 @@
factory.setProperties(props);
connection = factory.createConnection();
} catch (JAXRException e) {
- logger.log(Priority.ERROR, "Could not set up a connection to the Registry. " + e.getMessage(), e);
+ logger.log(Level.ERROR, "Could not set up a connection to the Registry. " + e.getMessage(), e);
}
return connection;
}
@@ -116,7 +116,7 @@
connection.close();
}
} catch (JAXRException je) {
- logger.log(Priority.ERROR, je.getMessage(), je);
+ logger.log(Level.ERROR, je.getMessage(), je);
}
}
/**
@@ -185,7 +185,7 @@
//Find the service
Service service = findService(category,serviceName);
if (service==null) {
- logger.log(Priority.DEBUG, "Service " + serviceName + " does not yet exist, creating now..");
+ logger.log(Level.DEBUG, "Service " + serviceName + " does not yet exist, creating now..");
service = registerService(category, serviceName, serviceDescription);
}
@@ -408,20 +408,20 @@
Collection<String> namePatterns = new ArrayList<String>();
namePatterns.add("%" + organizationName + "%");
//Find based upon qualifier type and values
- logger.log(Priority.DEBUG,"Going to query the registry for name pattern " + namePatterns);
+ logger.log(Level.DEBUG,"Going to query the registry for name pattern " + namePatterns);
BulkResponse response = bqm.findOrganizations(findQualifiers,
namePatterns, null, null, null, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
for (Iterator orgIter = response.getCollection().iterator(); orgIter.hasNext();)
{
Organization org = (Organization) orgIter.next();
- logger.log(Priority.DEBUG, "Organization name: " + org.getName().getValue());
- logger.log(Priority.DEBUG, "Description: " + org.getDescription().getValue());
- logger.log(Priority.DEBUG, "Key id: " + org.getKey().getId());
+ logger.log(Level.DEBUG, "Organization name: " + org.getName().getValue());
+ logger.log(Level.DEBUG, "Description: " + org.getDescription().getValue());
+ logger.log(Level.DEBUG, "Key id: " + org.getKey().getId());
User primaryContact = org.getPrimaryContact();
- logger.log(Priority.DEBUG, "Primary Contact: " + primaryContact.getPersonName().getFullName());
+ logger.log(Level.DEBUG, "Primary Contact: " + primaryContact.getPersonName().getFullName());
if (orgIter.hasNext()) {
- logger.log(Priority.ERROR, "Found " + response.getCollection().size()
+ logger.log(Level.ERROR, "Found " + response.getCollection().size()
+ " Organization, while expecting only one of name " + organizationName);
}
return org;
@@ -467,20 +467,20 @@
Collection<String> namePatterns = new ArrayList<String>();
namePatterns.add(serviceName);
//Find based upon qualifier type and values
- logger.log(Priority.DEBUG, "Going to query the registry for name pattern " + namePatterns);
+ logger.log(Level.DEBUG, "Going to query the registry for name pattern " + namePatterns);
BulkResponse response = bqm.findServices(null, findQualifiers,
namePatterns, classifications, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
for (Iterator servIter = response.getCollection().iterator(); servIter.hasNext();)
{
Service service = (Service) servIter.next();
- logger.log(Priority.DEBUG, "Service name: " + service.getName().getValue());
+ logger.log(Level.DEBUG, "Service name: " + service.getName().getValue());
if (service.getDescription()!=null) {
- logger.log(Priority.DEBUG, "Description: " + service.getDescription().getValue());
+ logger.log(Level.DEBUG, "Description: " + service.getDescription().getValue());
}
- logger.log(Priority.DEBUG, "Key id: " + service.getKey().getId());
+ logger.log(Level.DEBUG, "Key id: " + service.getKey().getId());
if (servIter.hasNext()) {
- logger.log(Priority.ERROR, "Found " + response.getCollection().size()
+ logger.log(Level.ERROR, "Found " + response.getCollection().size()
+ " Services, while expecting only one by the name of "
+ serviceName + " in category " + category);
}
@@ -528,7 +528,7 @@
Collection<Classification> classifications = new ArrayList<Classification>();
classifications.add(classification);
//Find based upon qualifier type and values
- logger.log(Priority.DEBUG, "Going to query the registry for classification " + classifications);
+ logger.log(Level.DEBUG, "Going to query the registry for classification " + classifications);
BulkResponse response = bqm.findServices(null, findQualifiers,
null, classifications, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
@@ -626,22 +626,22 @@
br = blm.saveServiceBindings(registryObjects);
break;
} else {
- logger.log(Priority.ERROR, "Trying to save an unsupported RegistryObject");
+ logger.log(Level.ERROR, "Trying to save an unsupported RegistryObject");
throw new JAXRException("Trying to save an unsupported RegistryObject");
}
}
//Verify the return
if (br!=null && br.getStatus() == JAXRResponse.STATUS_SUCCESS) {
- logger.log(Priority.DEBUG, interfaceName + " successfully saved");
+ logger.log(Level.DEBUG, interfaceName + " successfully saved");
Collection coll = br.getCollection();
Iterator iter = coll.iterator();
while (iter.hasNext()) {
Key key = (Key) iter.next();
registryObject.setKey(key);
- logger.log(Priority.DEBUG, "Saved Key=" + key.getId());
+ logger.log(Level.DEBUG, "Saved Key=" + key.getId());
}
} else {
- logger.log(Priority.ERROR, "Errors occurred during save.");
+ logger.log(Level.ERROR, "Errors occurred during save.");
if (br!=null) {
Collection exceptions = br.getExceptions();
Iterator iter = exceptions.iterator();
@@ -651,7 +651,7 @@
Exception e = (Exception) iter.next();
errors += e.getLocalizedMessage() + "\n";
je.setStackTrace(e.getStackTrace());
- logger.log(Priority.ERROR, e.getLocalizedMessage(), e);
+ logger.log(Level.ERROR, e.getLocalizedMessage(), e);
//if it's the last error, throw it now and set the current stacktrace
if (!iter.hasNext()) {
throw new JAXRException(errors, e);
Modified: labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -21,8 +21,8 @@
*/
package org.jboss.soa.esb.services.registry;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.util.ClassUtil;
@@ -56,7 +56,7 @@
{
Registry registry = null;
String className = Configuration.getRegistryImplementationClass();
- logger.log(Priority.DEBUG, "Going to load " + className);
+ logger.log(Level.DEBUG, "Going to load " + className);
try
{
Modified: labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -29,8 +29,8 @@
import java.util.List;
import java.util.UUID;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.MalformedEPRException;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
@@ -85,13 +85,13 @@
try
{
Registry registry = RegistryFactory.getRegistry();
- logger.log(Priority.DEBUG, "Looking for EPRs for category="
+ logger.log(Level.DEBUG, "Looking for EPRs for category="
+ serviceCategory + " and serviceName=" + serviceName);
Collection<EPR> eprs = registry.findEPRs(serviceCategory, serviceName);
for (Iterator<EPR> eprIter = eprs.iterator(); eprIter.hasNext();)
{
EPR epr = eprs.iterator().next();
- logger.log(Priority.DEBUG, "Message=" + message
+ logger.log(Level.DEBUG, "Message=" + message
+ " -> Destination=" + serviceCategory + "-" + serviceName);
try
{
@@ -106,10 +106,10 @@
newEpr.setPostSuffix(fileEpr.getInputSuffix());
epr = newEpr;
} catch (URISyntaxException usex) {
- logger.log(Priority.ERROR, "Malformed epr while setting :"
+ logger.log(Level.ERROR, "Malformed epr while setting :"
+ epr, usex);
} catch (MalformedURLException muex) {
- logger.log(Priority.ERROR, "Malformed epr:"
+ logger.log(Level.ERROR, "Malformed epr:"
+ epr, muex);
}
}
@@ -126,10 +126,10 @@
isSent = true;
break;
} catch (MalformedEPRException ex) {
- logger.log(Priority.ERROR, "Malformed epr:" + epr);
+ logger.log(Level.ERROR, "Malformed epr:" + epr);
lastException = ex;
} catch (CourierException ce) {
- logger.log(Priority.ERROR, "Could not send using epr:"
+ logger.log(Level.ERROR, "Could not send using epr:"
+ epr, ce);
lastException = ce;
// if there are more eprs in the collection is will try
@@ -138,11 +138,11 @@
}
if (isSent == false)
{
- logger.log(Priority.ERROR, "Could not find any valid EPRs. Message is not routed.", lastException);
+ logger.log(Level.ERROR, "Could not find any valid EPRs. Message is not routed.", lastException);
throw new MessageRouterException("Message Could not be delivered. ", lastException);
}
} catch (RegistryException re) {
- logger.log(Priority.ERROR, "Could not obtain an EPR from the Registry. Message is not routed. "
+ logger.log(Level.ERROR, "Could not obtain an EPR from the Registry. Message is not routed. "
+ re.getLocalizedMessage(), re);
throw new MessageRouterException("Message Could not be delivered due to issues with the Registry. "
+ re.getMessage(), re);
Modified: labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -21,8 +21,8 @@
*/
package org.jboss.soa.esb.services.routing.cbr;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.soa.esb.services.routing.MessageRouterException;
import org.jboss.soa.esb.util.ClassUtil;
/**
@@ -37,7 +37,7 @@
public static ContentBasedRouter getRouter(String className) throws MessageRouterException
{
ContentBasedRouter cbr = null;
- logger.log(Priority.DEBUG, "Going to load " + className);
+ logger.log(Level.DEBUG, "Going to load " + className);
try {
// instruct class loader to load the Content Based Router Implementation
Class cbrClass = ClassUtil.forName(className, ContentBasedRouterFactory.class);
Modified: labs/jbossesb/workspace/dbevenius/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -34,8 +34,8 @@
import junit.framework.JUnit4TestAdapter;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.testutils.FileUtil;
import org.jboss.soa.esb.testutils.HsqldbUtil;
@@ -72,7 +72,7 @@
registry.registerEPR(CATEGORY, SERVICE_NAME, "Service for traveling",
epr, "Specific Service Binding for traveling");
} catch (RegistryException re) {
- logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ logger.log(Level.ERROR, re.getLocalizedMessage(), re);
assertTrue(false);
}
try {
@@ -80,7 +80,7 @@
registry.registerEPR(null, SERVICE_NAME, null,
epr, null);
} catch (RegistryException re) {
- logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ logger.log(Level.ERROR, re.getLocalizedMessage(), re);
assertTrue(false);
}
//make sure we can handle some null arguments
@@ -97,11 +97,11 @@
Collection<String> services = registry.findServices(CATEGORY);
for (Iterator i=services.iterator();i.hasNext();) {
String serviceName = (String) i.next();
- logger.log(Priority.INFO, "Found service: " + serviceName);
+ logger.log(Level.INFO, "Found service: " + serviceName);
assertEquals(SERVICE_NAME, serviceName);
}
} catch (RegistryException re) {
- logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ logger.log(Level.ERROR, re.getLocalizedMessage(), re);
assertTrue(false);
}
}
@@ -116,10 +116,10 @@
Collection<EPR> eprs = registry.findEPRs(CATEGORY, SERVICE_NAME);
for (Iterator i=eprs.iterator();i.hasNext();) {
EPR epr = (EPR) i.next();
- logger.log(Priority.INFO, "Found epr: " + epr);
+ logger.log(Level.INFO, "Found epr: " + epr);
}
} catch (RegistryException re) {
- logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ logger.log(Level.ERROR, re.getLocalizedMessage(), re);
assertTrue(false);
}
}
@@ -132,10 +132,10 @@
registry.unRegisterEPR(CATEGORY, SERVICE_NAME, eprToBeRemoved);
// Now make sure this EPR is really gone
Collection<EPR> eprs = registry.findEPRs(CATEGORY, SERVICE_NAME);
- logger.log(Priority.INFO, "Number of Bindings left should be 0, and is: " + eprs.size());
+ logger.log(Level.INFO, "Number of Bindings left should be 0, and is: " + eprs.size());
assertEquals(eprs.size(),0);
} catch (Exception re) {
- logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ logger.log(Level.ERROR, re.getLocalizedMessage(), re);
assertTrue(false);
}
}
@@ -148,10 +148,10 @@
registry.unRegisterService(null, SERVICE_NAME);
//Make sure it's really gone
Collection<String> services = registry.findAllServices();
- logger.log(Priority.INFO, "Number of Services left should be 0, and is: " + services.size());
+ logger.log(Level.INFO, "Number of Services left should be 0, and is: " + services.size());
assertEquals(services.size(),0);
} catch (Exception re) {
- logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ logger.log(Level.ERROR, re.getLocalizedMessage(), re);
assertTrue(false);
}
}
Modified: labs/jbossesb/workspace/dbevenius/product/docs/services/ContentBasedRouting.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/install/standalone/jbossesb-server-base.zip
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/commons-httpclient.jar (from rev 12480, labs/jbossesb/trunk/product/lib/ext/commons-httpclient.jar)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/javassist.jar (from rev 12480, labs/jbossesb/trunk/product/lib/ext/javassist.jar)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-aop-jdk50.jar (from rev 12480, labs/jbossesb/trunk/product/lib/ext/jboss-aop-jdk50.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-jaxws.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-remoting.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss-system.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jboss.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossall-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossts-common.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/jbossweb.jar (from rev 12480, labs/jbossesb/trunk/product/lib/ext/jbossweb.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/lib/ext/log4j.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/product/lib/ext/trove.jar (from rev 12480, labs/jbossesb/trunk/product/lib/ext/trove.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/Bank.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/Bank.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/Bank.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -24,8 +24,8 @@
import java.math.BigDecimal;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
/**
* This Bank is pretty well focussed on doing one thing, which is giving out loans. On the
@@ -102,14 +102,14 @@
*/
protected BankQuoteReply processMessage(BankQuoteRequest bankQuoteRequest)
{
- logger.log(Priority.INFO, "Bank '" + bankName + "' received a request for SSN="
+ logger.log(Level.INFO, "Bank '" + bankName + "' received a request for SSN="
+ bankQuoteRequest.getSsn()
+ " for $" + bankQuoteRequest.loanAmount
+ " over " + bankQuoteRequest.loanTerm + " months.");
- logger.log(Priority.DEBUG, bankQuoteRequest);
+ logger.log(Level.DEBUG, bankQuoteRequest);
BankQuoteReply bankQuoteReply = computeBankQuoteReply(bankQuoteRequest);
- logger.log(Priority.INFO, "Bank '" + bankName + " offers SSN="
+ logger.log(Level.INFO, "Bank '" + bankName + " offers SSN="
+ bankQuoteRequest.getSsn() + " " + bankQuoteReply);
return bankQuoteReply;
Modified: labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerFlatFile.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerFlatFile.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerFlatFile.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -25,7 +25,7 @@
import java.math.BigDecimal;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.apache.log4j.xml.DOMConfigurator;
import org.sadun.util.polling.BasePollManager;
import org.sadun.util.polling.CycleEndEvent;
@@ -62,7 +62,7 @@
* Handle to the cycle start event.
*/
public void cycleStarted(CycleStartEvent evt) {
- logger.log(Priority.DEBUG, "Poller awakened "
+ logger.log(Level.DEBUG, "Poller awakened "
+ (evt.getPoller().getFilter() == null ? "(no filtering)" : evt
.getPoller().getFilter().toString()));
}
@@ -70,19 +70,19 @@
* Handle to the cycle end event.
*/
public void cycleEnded(CycleEndEvent evt) {
- logger.log(Priority.DEBUG, "Poller going to sleep");
+ logger.log(Level.DEBUG, "Poller going to sleep");
}
/**
* Handle to the directory lookup start event.
*/
public void directoryLookupStarted(DirectoryLookupStartEvent evt) {
- logger.log(Priority.DEBUG, "Scanning " + evt.getDirectory());
+ logger.log(Level.DEBUG, "Scanning " + evt.getDirectory());
}
/**
* Handle to the directory lookup end event.
*/
public void directoryLookupEnded(DirectoryLookupEndEvent evt) {
- logger.log(Priority.DEBUG, "Finished scanning " + evt.getDirectory());
+ logger.log(Level.DEBUG, "Finished scanning " + evt.getDirectory());
}
/**
* Handle to the file set found event. Currenty this is the only event that
@@ -101,7 +101,7 @@
* Handle to the file found event.
*/
public void fileFound(FileFoundEvent evt) {
- logger.log(Priority.DEBUG, evt);
+ logger.log(Level.DEBUG, evt);
// Add artificial delay
}
/**
@@ -126,7 +126,7 @@
bankQuoteReply.setQuoteId(BANK_NAME);
int errorCode=7;
String message=null;
- logger.log(Priority.INFO, "Found " + file.getAbsolutePath() );
+ logger.log(Level.INFO, "Found " + file.getAbsolutePath() );
try {
BankQuoteRequest bankQuoteRequest = new BankQuoteRequest();
@@ -151,7 +151,7 @@
bankQuoteReply = fileBasedBank.processMessage(bankQuoteRequest);
} catch (Throwable e) {
//Package up the error, so it can be processed
- logger.log(Priority.ERROR, e.getMessage());
+ logger.log(Level.ERROR, e.getMessage());
bankQuoteReply.setErrorCode(errorCode);
}
@@ -162,11 +162,11 @@
outgoingDir.mkdir();
}
File outgoingFile = new File(outgoingDir + "/" + PREFIX + file.getName());
- logger.log(Priority.INFO, "Creating outgoing file " + outgoingFile.getAbsolutePath());
+ logger.log(Level.INFO, "Creating outgoing file " + outgoingFile.getAbsolutePath());
outgoingFile.createNewFile();
String reply=bankQuoteReply.getInterestRate() + "," + bankQuoteReply.getQuoteId() + ","
+ bankQuoteReply.getErrorCode() + "," + bankQuoteReply.getCustomerUID();
- logger.log(Priority.INFO, "Writing reply " + reply);
+ logger.log(Level.INFO, "Writing reply " + reply);
FileUtil.writeTextFile(outgoingFile, reply);
//Move the processed file away so it does not get processed again
@@ -174,14 +174,14 @@
if (!processedDir.exists()) {
processedDir.mkdir();
}
- logger.log(Priority.INFO, "Moving file " + file.getName() + " to processed directory");
+ logger.log(Level.INFO, "Moving file " + file.getName() + " to processed directory");
File processedFile = new File(processedDir.getAbsolutePath() + "/" + file.getName());
file.renameTo(processedFile);
if (file.exists()) {
file.delete();
}
} catch (Exception e) {
- logger.log(Priority.ERROR, e.getMessage(), e);
+ logger.log(Level.ERROR, e.getMessage(), e);
}
}
Modified: labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -40,7 +40,7 @@
import javax.naming.NamingException;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.apache.log4j.xml.DOMConfigurator;
import com.thoughtworks.xstream.XStream;
@@ -159,14 +159,14 @@
.processMessage(bankQuoteRequest);
bankQuoteReply.setCustomerEmail(bankQuoteRequest.customerEmail);
String bankQuoteReplyXML = xstream.toXML(bankQuoteReply);
- logger.log(Priority.INFO, "Looking up connection factory");
+ logger.log(Level.INFO, "Looking up connection factory");
InitialContext ctx = getContext();
QueueConnectionFactory qcf = (QueueConnectionFactory) ctx
.lookup("ConnectionFactory");
- logger.log(Priority.INFO, "Creating connection");
+ logger.log(Level.INFO, "Creating connection");
outQueueConnection = qcf.createQueueConnection();
try {
- logger.log(Priority.INFO, "Creating session");
+ logger.log(Level.INFO, "Creating session");
QueueSession qs = outQueueConnection.createQueueSession(false,
Session.DUPS_OK_ACKNOWLEDGE);
Queue outQueue;
@@ -182,7 +182,7 @@
queueSender.send(responseTextMessage);
logger.info("message being sent back on " + QUEUE_OUT + "\n" + responseTextMessage);
} catch (JMSException je) {
- logger.log(Priority.ERROR, je.getMessage(), je);
+ logger.log(Level.ERROR, je.getMessage(), je);
} finally {
outQueueConnection.close();
}
Modified: labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/BankTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/BankTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/BankTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -28,7 +28,7 @@
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.junit.Test;
public class BankTest {
@@ -49,7 +49,7 @@
bankQuoteRequest.setLoanTerm(72);
bankQuoteRequest.setLoanAmount(20000);
bankQuoteRequest.setCustomerUID("unique");
- logger.log(Priority.INFO, bankQuoteRequest);
+ logger.log(Level.INFO, bankQuoteRequest);
//Getting a Bank Instance
String bankName = "TestBank";
@@ -59,7 +59,7 @@
//Getting a quote from this bank
BankQuoteReply bankQuoteReply = bank.processMessage(bankQuoteRequest);
- logger.log(Priority.INFO, bankQuoteReply);
+ logger.log(Level.INFO, bankQuoteReply);
//Checking for validity
BigDecimal expectedInterestRate = BigDecimal.valueOf(8.85);
Modified: labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/FlatFileProcessorTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/FlatFileProcessorTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/FlatFileProcessorTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -29,7 +29,7 @@
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.junit.Test;
public class FlatFileProcessorTest {
@@ -45,7 +45,7 @@
@Test public void processRequest()
{
File writableDir=null;
- logger.log(Priority.INFO, "Check to see if I can write to /tmp");
+ logger.log(Level.INFO, "Check to see if I can write to /tmp");
File tmpDir = new File("/tmp");
if (tmpDir.exists() && tmpDir.canWrite()) {
writableDir=tmpDir;
@@ -54,14 +54,14 @@
if (tempDir.exists() && tempDir.canWrite()) {
writableDir=tempDir;
} else {
- logger.log(Priority.ERROR, "Could not find either /tmp or C:\\Temp for a temporary "
+ logger.log(Level.ERROR, "Could not find either /tmp or C:\\Temp for a temporary "
+ "writing space.");
assertTrue(false);
}
}
// We found a temp space so now we can drop in a load request file.
try {
- logger.log(Priority.INFO, "Creating " + FLAT_FILE + " file in " + writableDir.getAbsolutePath());
+ logger.log(Level.INFO, "Creating " + FLAT_FILE + " file in " + writableDir.getAbsolutePath());
File loanRequestFile = new File(writableDir.getAbsolutePath() + "/"+ FLAT_FILE);
if (loanRequestFile.exists()) {
loanRequestFile.delete();
@@ -70,7 +70,7 @@
String str="23456890,3,4,20000,5,unique";
FileUtil.writeTextFile(loanRequestFile, str);
- logger.log(Priority.INFO, "Processing FlatFileProcessorTest.txt");
+ logger.log(Level.INFO, "Processing FlatFileProcessorTest.txt");
ManagerFlatFile pollManager = new ManagerFlatFile();
pollManager.processFile(loanRequestFile);
@@ -79,29 +79,29 @@
File processedFile = new File(writableDir.getAbsolutePath() + "/"
+ ManagerFlatFile.PROCESSED_DIR + "/" + FLAT_FILE);
- logger.log(Priority.INFO, "Check to see if " + processedFile.getAbsolutePath()
+ logger.log(Level.INFO, "Check to see if " + processedFile.getAbsolutePath()
+ " exists");
assertTrue(processedFile.exists());
- logger.log(Priority.INFO, "OK");
+ logger.log(Level.INFO, "OK");
File replyToFile = new File(writableDir.getAbsolutePath() + "/"
+ ManagerFlatFile.OUTGOING_DIR + "/" + ManagerFlatFile.PREFIX
+ FLAT_FILE);
- logger.log(Priority.INFO, "Check to see if " + replyToFile.getAbsolutePath()
+ logger.log(Level.INFO, "Check to see if " + replyToFile.getAbsolutePath()
+ " exists");
assertTrue(replyToFile.exists());
- logger.log(Priority.INFO, "OK");
+ logger.log(Level.INFO, "OK");
//Checking the content of the reply
- logger.log(Priority.INFO, "Check the reply, should be ('8.29,FileBasedBank-0,0,unique'");
+ logger.log(Level.INFO, "Check the reply, should be ('8.29,FileBasedBank-0,0,unique'");
assertTrue("8.29,FileBasedBank-0,0,unique".equals(FileUtil.readTextFile(replyToFile)));
- logger.log(Priority.INFO, "OK");
+ logger.log(Level.INFO, "OK");
//Cleaning up
processedFile.delete();
replyToFile.delete();
} catch (Throwable e) {
- logger.log(Priority.ERROR,e.getMessage(),e);
+ logger.log(Level.ERROR,e.getMessage(),e);
assertTrue(false);
}
}
Modified: labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -37,7 +37,7 @@
import junit.framework.JUnit4TestAdapter;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.junit.Test;
public class JmsProcessorTest {
@@ -82,8 +82,8 @@
//if it fails it may be because the server is not up and the Queue is not found
//I'm not letting the test fail, since we may want to do nightly build/test runs
//which may not have the server up.
- logger.log(Priority.ERROR, e.getMessage(), e);
- logger.log(Priority.ERROR, "Is the server up and running?");
+ logger.log(Level.ERROR, e.getMessage(), e);
+ logger.log(Level.ERROR, "Is the server up and running?");
}
}
Modified: labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -31,7 +31,7 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
@@ -121,7 +121,7 @@
RuleBase ruleBase = ruleBases.get(ruleSet);
if (ruleBase == null || isRulesChanged)
{
- logger.log(Priority.DEBUG,
+ logger.log(Level.DEBUG,
"Reading ruleSet from file=" + ruleSet);
ruleBase = readRuleBase(ruleSet, ruleLanguage);
if (ruleBase != null) ruleBases.put(ruleSet, ruleBase);
@@ -132,7 +132,7 @@
if (ruleSet != null) ruleSets.put(ruleSet, newRuleSet);
}
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- logger.log(Priority.DEBUG,
+ logger.log(Level.DEBUG,
"Obtained message=" + message + " with ruleSet=" + ruleSet);
workingMemory.setGlobal("destinations", destinations);
if (objectList!=null) {
@@ -141,9 +141,9 @@
}
}
workingMemory.assertObject(message);
- logger.log(Priority.DEBUG, "Fire the JBossRules Engine");
+ logger.log(Level.DEBUG, "Fire the JBossRules Engine");
workingMemory.fireAllRules();
- logger.log(Priority.DEBUG,
+ logger.log(Level.DEBUG,
"Outgoing Destinations: " + destinations);
return destinations;
} catch (IOException ioe) {
Copied: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/lib/log4j.jar (from rev 12480, labs/jbossesb/trunk/product/services/soapui-client/src/lib/log4j.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -19,25 +19,31 @@
*/
package org.jboss.soa.esb.services.soapui;
-import com.eviware.soapui.impl.wsdl.WsdlInterface;
-import com.eviware.soapui.impl.wsdl.WsdlProject;
-import com.eviware.soapui.model.iface.Operation;
-
+import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.ByteArrayInputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.soap.OGNLUtils;
+import org.jboss.soa.esb.dom.YADOMUtil;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.soa.esb.dom.YADOMUtil;
-import org.jboss.internal.soa.esb.soap.OGNLUtils;
-import org.w3c.dom.*;
+import org.milyn.xml.XmlUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import org.milyn.xml.XmlUtil;
-import org.apache.log4j.Logger;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
+import com.eviware.soapui.impl.wsdl.WsdlInterface;
+import com.eviware.soapui.impl.wsdl.WsdlProject;
+import com.eviware.soapui.model.iface.Operation;
/**
* Soap UI Soap Client Service MBean.
Modified: labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java 2007-06-12 13:08:46 UTC (rev 12486)
@@ -19,17 +19,23 @@
*/
package org.jboss.soa.esb.services.soapui;
-import junit.framework.TestCase;
-
-import java.io.*;
-import java.util.Map;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
-import java.math.BigDecimal;
+import java.util.Map;
import javax.xml.transform.stream.StreamResult;
+import junit.framework.TestCase;
+
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.dom.YADOMUtil;
import org.w3c.dom.Document;
Copied: labs/jbossesb/workspace/dbevenius/qa/lib/ext/javassist.jar (from rev 12480, labs/jbossesb/trunk/qa/lib/ext/javassist.jar)
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/qa/lib/ext/jboss-aop-jdk50.jar (from rev 12480, labs/jbossesb/trunk/qa/lib/ext/jboss-aop-jdk50.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/qa/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Copied: labs/jbossesb/workspace/dbevenius/qa/lib/ext/trove.jar (from rev 12480, labs/jbossesb/trunk/qa/lib/ext/trove.jar)
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/dbevenius/qa/log4j.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/qa/log4j.xml 2007-06-12 10:34:38 UTC (rev 12485)
+++ labs/jbossesb/workspace/dbevenius/qa/log4j.xml 2007-06-12 13:08:46 UTC (rev 12486)
@@ -60,7 +60,7 @@
<!-- ======================= -->
<root>
- <priority value="WARN"/>
+ <priority value="INFO"/>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
More information about the jboss-svn-commits
mailing list