[jboss-svn-commits] JBL Code SVN: r8870 - in labs/jbossesb/trunk/product: core/listeners/tests/src/org/jboss/soa/esb/listeners and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 16 11:11:02 EST 2007
Author: kurt.stam at jboss.com
Date: 2007-01-16 11:10:55 -0500 (Tue, 16 Jan 2007)
New Revision: 8870
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/State.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java
labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
Log:
Cleaning up warnings. (imports and unused methods)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/State.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/State.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/State.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -21,8 +21,6 @@
package org.jboss.soa.esb.listeners;
-import org.apache.log4j.Logger;
-
/**
* ESB listener component state.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -30,8 +28,6 @@
public enum State {
Uninitialised, Loading_parameters, Running, Ready, Shutting_down, Done_OK, Exception_thrown;
- private static Logger logger = Logger.getLogger(State.class);
-
private int m_iCompletionCode = 0;
private Throwable m_oThrowable = null;
@@ -40,7 +36,7 @@
* @return True if this state instance in one of the states leading up to (but not including)
* the "Ready" state, otherwise false.
*/
- private boolean isGettingReady() {
+ public boolean isGettingReady() {
return (this.ordinal() < Ready.ordinal());
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -39,7 +39,6 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerManager;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.testutils.FileUtil;
import org.jboss.soa.esb.testutils.HsqldbUtil;
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerFileUnitTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -33,7 +33,6 @@
import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerUtil;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/ListenerManagerJMSXntegrationTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -22,7 +22,6 @@
package org.jboss.soa.esb.listeners;
-import java.io.File;
import java.io.FileInputStream;
import java.net.URI;
import java.util.UUID;
@@ -32,11 +31,9 @@
import org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier;
import org.jboss.soa.esb.addressing.Call;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerUtil;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -25,7 +25,6 @@
import java.security.InvalidParameterException;
import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -258,35 +258,6 @@
}
}
- // this method is only needed until there's an appropriate constructor that
- // takes an EPR
- // see TODO in constructor
- /**
- * @deprecated
- */
- private void configTreeFromEpr() throws CourierException
- {
- try
- {
- _tree = new ConfigTree("mockFromEPR");
- _tree.setAttribute(RemoteFileSystem.PARMS_FTP_SERVER, _server);
- _tree.setAttribute(RemoteFileSystem.PARMS_USER, _user);
- _tree.setAttribute(RemoteFileSystem.PARMS_PASSWD, _passwd);
- _tree.setAttribute(RemoteFileSystem.PARMS_REMOTE_DIR, _remoteDir);
- _tree.setAttribute(RemoteFileSystem.PARMS_PORT, Integer
- .toString(_port));
- _tree.setAttribute(RemoteFileSystem.PARMS_LOCAL_DIR, _localDir);
- _tree.setAttribute(RemoteFileSystem.PARMS_ASCII, Boolean
- .toString(_isAscii));
- _tree.setAttribute(RemoteFileSystem.PARMS_PASSIVE, Boolean
- .toString(_isPassive));
- }
- catch (Exception e)
- {
- throw new CourierException(e);
- }
- }
-
private static final Logger _logger = Logger
.getLogger(FtpFileHandler.class);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -34,7 +34,6 @@
import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
-import org.jboss.soa.esb.couriers.CourierException;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.util.FtpClientUtil;
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/CourierIntegrationTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -27,11 +27,7 @@
import java.net.URL;
import java.util.UUID;
-import junit.framework.Assert;
-import junit.framework.JUnit4TestAdapter;
-
import org.jboss.soa.esb.addressing.Call;
-import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
import org.jboss.soa.esb.common.tests.BaseTest;
@@ -40,7 +36,6 @@
import org.jboss.soa.esb.couriers.TwoWayCourier;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
-import org.junit.Test;
/**
* Tests for internal FtpFileHandler class
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/addressing/util/tests/EPRManagerUnitTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -22,25 +22,12 @@
package org.jboss.soa.esb.addressing.util.tests;
-import java.io.StringWriter;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import junit.framework.TestCase;
-import org.jboss.internal.soa.esb.addressing.helpers.PortReferenceHelper;
import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.PortReference;
-import org.jboss.soa.esb.addressing.XMLUtil;
import org.jboss.soa.esb.addressing.eprs.EmailEpr;
import org.jboss.soa.esb.addressing.util.EPRManager;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
/**
* Unit tests for the Class class.
*
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -21,22 +21,18 @@
*/
package org.jboss.soa.esb.helpers.persist;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
import junit.framework.JUnit4TestAdapter;
-
import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.log4j.Priority;
-import org.apache.log4j.Logger;
-import java.sql.ResultSet;
-import java.sql.PreparedStatement;
-
/**
* Unit tests for the JdbcCleanConn class.
*
@@ -54,12 +50,6 @@
private static String mDbUsername = "sa";
private static String mDbPassword ="";
- private Logger logger = Logger.getLogger(this.getClass());
-
-
-
-
-
/**
* Setup the database.
*/
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -24,21 +24,19 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
import junit.framework.JUnit4TestAdapter;
-
+import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
import org.jboss.soa.esb.testutils.HsqldbUtil;
-import org.jboss.soa.esb.helpers.ConfigTree;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.log4j.Priority;
-import org.apache.log4j.Logger;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-
/**
* Unit tests for the SimpleDataSource class.
*
@@ -148,6 +146,7 @@
{
// Setting a Bogus Driver
SimpleDataSource simpleDS = new SimpleDataSource("bogusDriver", mDbUrl, mDbUsername, mDbPassword);
+ logger.log(Priority.INFO, simpleDS);
assertTrue(false);
}
catch (Exception _ex)
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/MessageUnitTest.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
-import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessageType;
Modified: labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java 2007-01-16 16:07:22 UTC (rev 8869)
+++ labs/jbossesb/trunk/product/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java 2007-01-16 16:10:55 UTC (rev 8870)
@@ -158,7 +158,7 @@
logger.debug("looking for the following service in the registry -- Name: " + serviceName);
//EPRs to use for delivery and reply messages
- EPR toEPR=null, replyEPR=null;
+ EPR toEPR=null;
//find the service in the registry
toEPR = (JMSEpr)registry.findEPR(serviceCategoryName, serviceName);
More information about the jboss-svn-commits
mailing list