[jboss-svn-commits] JBL Code SVN: r29886 - in labs/jbossesb/trunk: product and 52 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 2 05:24:23 EST 2009
Author: kevin.conner at jboss.com
Date: 2009-11-02 05:24:16 -0500 (Mon, 02 Nov 2009)
New Revision: 29886
Added:
labs/jbossesb/trunk/findbugs/src/excludeFilter.xml
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTemporaryTransport.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/tx/InVMXAResource.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/BytesBodyImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/MapBodyImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/body/content/MapBodyImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Element.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Text.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBResponseFilter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedWiretap.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/LogAction.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticWiretap.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/cbr/XPathRouter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ScheduleListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JcaGatewayMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpGatewayMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JcaGatewayMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JmsListenerMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/GroovyGateway.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpServerDelegate.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/mina/UdpGatewayListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ha/ServiceClusterInfoImpl.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterStatistics.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/mock/MockListener.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/CertificateLoginModule.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocator.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocatorSorter.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tx/JBESB_2866_UnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/MockRegistry.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ServiceInvokerCallUnitTest.java
labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageHelper.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsJobService.java
labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java
labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBRulesCounter.java
labs/jbossesb/trunk/product/services/slsb/src/main/java/org/jboss/soa/esb/actions/EJBProcessor.java
labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksMessageCounter.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
Log:
First commit of findbugs changes: JBESB-2867
Added: labs/jbossesb/trunk/findbugs/src/excludeFilter.xml
===================================================================
--- labs/jbossesb/trunk/findbugs/src/excludeFilter.xml (rev 0)
+++ labs/jbossesb/trunk/findbugs/src/excludeFilter.xml 2009-11-02 10:24:16 UTC (rev 29886)
@@ -0,0 +1,7 @@
+<FindBugsFilter>
+ <Match>
+ <Class name="org.jboss.internal.soa.esb.webservice.JAXWSProviderClassGenerator"/>
+ <Method name="generate" params="java.lang.String, java.lang.String, org.jboss.internal.soa.esb.webservice.ESBServiceEndpointInfo, boolean" returns="byte[]"/>
+ <Bug pattern="REC_CATCH_EXCEPTION"/>
+ </Match>
+</FindBugsFilter>
Property changes on: labs/jbossesb/trunk/findbugs/src/excludeFilter.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/build.xml 2009-11-02 10:24:16 UTC (rev 29886)
@@ -566,17 +566,15 @@
output="html"
outputFile="findbugs.html"
projectName="JBoss ESB"
+ excludeFilter="${findbugs.home}/src/excludeFilter.xml"
styleSheet="${findbugs.home}/src/xsl/fancy.xsl">
<auxClasspath>
<fileset dir="${basedir}/build/jbossesb/lib">
- <include name="*.jar"/>
+ <include name="**/*.jar"/>
</fileset>
- <fileset dir="${basedir}/build/jbossesb-server-4.5.GA/client">
+ <fileset dir="${esbserver.dist.dir}/client">
<include name="*.jar"/>
</fileset>
- <fileset dir="${basedir}/build/jbossesb/lib/ext">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${basedir}/lib/ext/standalone">
<include name="c3p0-0.9.1-pre9.jar"/>
</fileset>
@@ -591,6 +589,13 @@
<sourcePath path="${basedir}/services/spring/src"/>
<sourcePath path="${basedir}/rosetta/src"/>
<class location="${basedir}/build/jbossesb.sar/lib/jbossesb-rosetta.jar" />
+ <class location="${basedir}/build/jbossesb/lib/jbossesb.esb/jbossesb-jbossesb.jar" />
+ <class location="${basedir}/build/jbossesb/lib/jbpm.esb/jbossesb-jbpm.jar" />
+ <class location="${basedir}/build/jbossesb/lib/slsb.esb/jbossesb-slsb.jar" />
+ <class location="${basedir}/build/jbossesb/lib/soap.esb/jbossesb-soap.jar" />
+ <class location="${basedir}/build/jbossesb/lib/jbrules.esb/jbossesb-jbrules.jar" />
+ <class location="${basedir}/build/jbossesb/lib/smooks.esb/jbossesb-smooks.jar" />
+ <class location="${basedir}/build/jbossesb/lib/spring.esb/jbossesb-spring.jar" />
</findbugs>
</target>
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/FileCourier.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -241,10 +241,7 @@
}
catch (final IOException ex)
{
- if (tmpFile == null)
- throw new CourierMarshalUnmarshalException(ex);
- else
- throw new CourierTransportException(ex);
+ throw new CourierMarshalUnmarshalException(ex);
}
catch (final Exception e)
{
@@ -252,8 +249,10 @@
}
finally
{
- if (null != tmpFile)
- tmpFile.delete();
+ if ((null != tmpFile) && !tmpFile.delete() && _logger.isDebugEnabled())
+ {
+ _logger.debug("Failed to delete file " + tmpFile.getAbsolutePath()) ;
+ }
}
} // ________________________________
@@ -368,8 +367,10 @@
}
finally
{
- if (null != tmpFile)
- tmpFile.delete();
+ if ((null != tmpFile) && !tmpFile.delete() && _logger.isDebugEnabled())
+ {
+ _logger.debug("Failed to delete file " + tmpFile.getAbsolutePath()) ;
+ }
}
} // ________________________________
@@ -499,6 +500,6 @@
protected LocalFileHandler _localFhandler;
- protected static Logger _logger = Logger.getLogger(FileCourier.class);
+ protected final static Logger _logger = Logger.getLogger(FileCourier.class);
} // ____________________________________________________________________________
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -23,7 +23,6 @@
package org.jboss.internal.soa.esb.couriers;
import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.List;
import java.util.Properties;
@@ -346,30 +345,32 @@
releaseSession() ;
return false ;
}
+ }
- final int maxRetry = 5; // TODO Magic number here!!!
- for (int i1 = 0; i1 < maxRetry; i1++) {
- // try to reconnect to the queue
- try {
+ final int maxRetry = 5; // TODO Magic number here!!!
+ for (int i1 = 0; i1 < maxRetry; i1++) {
+ // try to reconnect to the queue
+ try {
+ synchronized(this) {
if (_isReceiver) createMessageConsumer();
else
createMessageProducer();
break;
}
- catch (Exception e) {
- if (i1 < maxRetry - 1) {
- try {
- Thread.sleep(_sleepForRetries);
- }
- catch (InterruptedException e1) { // Just return after logging
- _logger.debug("Unexpected thread interupt exception.", e);
- break;
- }
- } else {
- _logger.debug("Failed to reconnect to JMS", e);
-
- return false;
+ }
+ catch (Exception e) {
+ if (i1 < maxRetry - 1) {
+ try {
+ Thread.sleep(_sleepForRetries);
}
+ catch (InterruptedException e1) { // Just return after logging
+ _logger.debug("Unexpected thread interupt exception.", e);
+ break;
+ }
+ } else {
+ _logger.debug("Failed to reconnect to JMS", e);
+
+ return false;
}
}
}
@@ -484,8 +485,7 @@
throw new CourierException("This is an outgoing-only Courier");
if (millis < 1)
throw new IllegalArgumentException("Timeout millis must be > 0");
- synchronized(this) {
- if (null == _messageConsumer) try {
+ try {
createMessageConsumer();
}
catch (Exception e) {
@@ -496,7 +496,6 @@
}
throw new CourierException("Unable to create Message Consumer", e);
}
- }
javax.jms.Message jmsMessage = null;
synchronized(this) {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/SqlTableCourier.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -31,10 +31,12 @@
import org.jboss.soa.esb.couriers.*;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.util.Util;
+import org.xml.sax.SAXException;
import org.jboss.soa.esb.client.ServiceInvoker;
import org.jboss.soa.esb.listeners.message.MessageDeliverException;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.Serializable;
import java.io.StringReader;
import java.net.URI;
@@ -42,6 +44,8 @@
import java.sql.*;
import java.util.UUID;
+import javax.xml.parsers.ParserConfigurationException;
+
public class SqlTableCourier implements PickUpOnlyCourier, DeliverOnlyCourier
{
public static final String SQL_RETRY_COUNT = "org.jboss.soa.esb.sql.retry.count";
@@ -58,7 +62,7 @@
private int messageType = Types.OTHER ;
private JDBCEprDBResourceFactory jdbcFactory;
- protected static Logger _logger = Logger.getLogger(SqlTableCourier.class);
+ protected static final Logger _logger = Logger.getLogger(SqlTableCourier.class);
/**
* Dead letter channel ServiceInvoker. Messages are delivered to the DLQ after the retry limit for a
@@ -408,13 +412,10 @@
}
result = Util.deserialize(value);
}
- catch (Exception e)
- {
- // If there's an error deserializing the message blob, we either
- // delete the message (deleteOnError), or change it's state
- // to "State.Error" i.e. no exceptions/rollbacks...
- result = null;
- } finally {
+ catch (IOException e) {} // ignore
+ catch (SAXException e) {} // ignore
+ catch (ParserConfigurationException e) {} // ignore
+ finally {
if (result == null && deleteOnError) {
deleteMsg(prospect.messageId, connection);
} else if (result != null && deleteOnSuccess) {
@@ -653,4 +654,4 @@
public int retryCount;
private boolean sendToDQL;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FileHandlerFactory.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -36,12 +36,7 @@
{
if (epr instanceof FTPEpr) return new FtpFileHandler ((FTPEpr)epr);
- //TODO Maybe ftps and sftp ? Wait for Bruno's input
-
// if flow falls through, last option should be local file handler
- if (epr instanceof FileEpr) return new LocalFileHandler ((FileEpr)epr);
-
- throw new CourierException("Unable to obtain a file handler for supplied EPR");
+ return new LocalFileHandler ((FileEpr)epr);
}
-
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/FtpFileHandler.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -134,7 +134,10 @@
}
File local = new File(_localDir, name);
byte[] ba = CourierUtil.bytesFromLocalFile(local);
- local.delete();
+ if (!local.delete())
+ {
+ _logger.warn("Could not delete file " + local.getCanonicalPath()) ;
+ }
return ba;
}
catch (Exception e)
@@ -162,7 +165,10 @@
{
handler.quit();
}
- file.delete();
+ if (!file.delete())
+ {
+ _logger.warn("Could not delete file " + file.getCanonicalPath()) ;
+ }
}
catch (Exception e)
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/helpers/LocalFileHandler.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -36,10 +36,6 @@
public class LocalFileHandler implements FileHandler
{
- private LocalFileHandler()
- {
- }
-
LocalFileHandler(FileEpr epr)
{
_epr = epr;
@@ -102,8 +98,8 @@
{
try
{
- if (to.exists())
- to.delete();
+ if (to.exists() && !to.delete())
+ throw new CourierException("Unable to delete target file " + to.getCanonicalPath());
if (!FileUtil.renameTo(from, to))
throw new CourierException("Unable to rename from " + from
+ " to " + to);
@@ -116,7 +112,7 @@
}
}
- private class FileEndsWith implements FileFilter
+ private static class FileEndsWith implements FileFilter
{
String m_sSuffix;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTemporaryTransport.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTemporaryTransport.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTemporaryTransport.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -137,7 +137,7 @@
final TransactionStrategy txStrategy = TransactionStrategy.getTransactionStrategy(true) ;
try
{
- txStrategy.enlistResource(new InVMXAResource(inVMEpr, addedObject, InVMXAResource.operation.INSERT));
+ txStrategy.enlistResource(new InVMXAResource(inVMEpr, addedObject, InVMXAResource.Operation.INSERT));
}
catch (final TransactionStrategyException tse)
{
@@ -221,7 +221,7 @@
final TransactionStrategy txStrategy = TransactionStrategy.getTransactionStrategy(true) ;
try
{
- txStrategy.enlistResource(new InVMXAResource(inVMEpr, msgObject, InVMXAResource.operation.REMOVE)) ;
+ txStrategy.enlistResource(new InVMXAResource(inVMEpr, msgObject, InVMXAResource.Operation.REMOVE)) ;
}
catch (final TransactionStrategyException tse)
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/transport/InVMTransport.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -397,7 +397,7 @@
final TransactionStrategy txStrategy = TransactionStrategy.getTransactionStrategy(true) ;
try
{
- txStrategy.enlistResource(new InVMXAResource(inVMEpr, addedObject, InVMXAResource.operation.INSERT));
+ txStrategy.enlistResource(new InVMXAResource(inVMEpr, addedObject, InVMXAResource.Operation.INSERT));
}
catch (final TransactionStrategyException tse)
{
@@ -466,7 +466,7 @@
final TransactionStrategy txStrategy = TransactionStrategy.getTransactionStrategy(true) ;
try
{
- txStrategy.enlistResource(new InVMXAResource(inVMEpr, msgObject, InVMXAResource.operation.REMOVE)) ;
+ txStrategy.enlistResource(new InVMXAResource(inVMEpr, msgObject, InVMXAResource.Operation.REMOVE)) ;
}
catch (final TransactionStrategyException tse)
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/tx/InVMXAResource.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/tx/InVMXAResource.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/couriers/tx/InVMXAResource.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -78,7 +78,7 @@
*/
private static ServiceInvoker dlQueueInvoker;
- public enum operation { INSERT, REMOVE };
+ public enum Operation { INSERT, REMOVE };
static {
String retryLimitConfig = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.INVM_RETRY_LIMIT, "5").trim();
@@ -89,7 +89,7 @@
}
}
- public InVMXAResource (final InVMEpr inVMEpr, final Object msgObject, final operation op)
+ public InVMXAResource (final InVMEpr inVMEpr, final Object msgObject, final Operation op)
{
this.inVMEpr = inVMEpr ;
this.msgObject = msgObject ;
@@ -106,7 +106,7 @@
public void commit (Xid xid, boolean onePhase) throws XAException
{
- if (_opcode == operation.INSERT)
+ if (_opcode == Operation.INSERT)
{
boolean problem = false;
@@ -168,7 +168,7 @@
public void rollback (Xid xid) throws XAException
{
- if (_opcode == operation.REMOVE) // put the message back on the queue
+ if (_opcode == Operation.REMOVE) // put the message back on the queue
{
/*
* The message goes back on the queue. This may not be the same
@@ -285,11 +285,9 @@
if (!"true".equalsIgnoreCase(Configuration.getRedeliveryDlsOn())) {
_logger.debug("org.jboss.soa.esb.dls.redeliver is turned off");
} else {
- if (dlQueueInvoker == null) {
- synchronized (ServiceInvoker.dlqService) {
- if (dlQueueInvoker == null) {
- dlQueueInvoker = new ServiceInvoker(ServiceInvoker.dlqService);
- }
+ synchronized (ServiceInvoker.dlqService) {
+ if (dlQueueInvoker == null) {
+ dlQueueInvoker = new ServiceInvoker(ServiceInvoker.dlqService);
}
}
@@ -304,8 +302,8 @@
private transient InVMEpr inVMEpr;
private transient Object msgObject;
- private transient operation _opcode;
+ private transient Operation _opcode;
private transient int _timeout;
- protected static Logger _logger = Logger.getLogger(InVMXAResource.class);
+ protected static final Logger _logger = Logger.getLogger(InVMXAResource.class);
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/H2Database.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -478,7 +478,14 @@
try
{
final Statement stmt = connection.createStatement() ;
- stmt.execute("shutdown") ;
+ try
+ {
+ stmt.execute("shutdown") ;
+ }
+ finally
+ {
+ stmt.close() ;
+ }
}
finally
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -738,8 +738,21 @@
shutdownCommand = DEFAULT_IN_MEMORY_SHUTDOWN_COMMAND;
}
- statement.executeQuery(shutdownCommand);
- this.connection = null;
+ try
+ {
+ try
+ {
+ statement.executeQuery(shutdownCommand);
+ }
+ finally
+ {
+ statement.close() ;
+ }
+ }
+ finally
+ {
+ this.connection = null;
+ }
log.info("Database in memory closed clean");
}
@@ -761,10 +774,23 @@
shutdownCommand = DEFAULT_REMOTE_SHUTDOWN_COMMAND;
}
- statement.executeQuery(shutdownCommand);
- // TODO: join thread?
- serverThread = null;
- this.connection = null;
+ try
+ {
+ try
+ {
+ statement.executeQuery(shutdownCommand);
+ }
+ finally
+ {
+ statement.close() ;
+ }
+ }
+ finally
+ {
+ // TODO: join thread?
+ serverThread = null;
+ this.connection = null;
+ }
log.info("Database remote closed clean");
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -30,7 +30,6 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.URL;
-import java.util.Properties;
import javax.naming.InitialContext;
@@ -38,10 +37,7 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.util.PropertiesHelper;
import org.jboss.internal.soa.esb.util.XMLHelper;
-import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigImplMBean;
public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
{
@@ -114,9 +110,8 @@
final ByteArrayInputStream bais = new ByteArrayInputStream(propertyFileContents) ;
final FileOutputStream juddiPropertyOS = new FileOutputStream(juddiPropertyFile) ;
- final Properties xmlProperties ;
try {
- xmlProperties = PropertiesHelper.translateXMLToText(bais, juddiPropertyOS, JUDDI_PROPERTY_FILE_COMMENTS) ;
+ PropertiesHelper.translateXMLToText(bais, juddiPropertyOS, JUDDI_PROPERTY_FILE_COMMENTS) ;
} finally {
juddiPropertyOS.close() ;
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/BytesBodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/BytesBodyImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/BytesBodyImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -306,10 +306,10 @@
private int _mode = UNSET_MODE;
- private ObjectOutputStream _outputStream;
+ private transient ObjectOutputStream _outputStream;
- private ObjectInputStream _inputStream;
+ private transient ObjectInputStream _inputStream;
- private ByteArrayOutputStream _byteStream;
+ private transient ByteArrayOutputStream _byteStream;
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/MapBodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/MapBodyImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/body/content/MapBodyImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -171,12 +171,12 @@
public void setBoolean (String name, boolean val)
{
- add(name, new Boolean(val));
+ add(name, Boolean.valueOf(val));
}
public void setByte (String name, byte val)
{
- add(name, new Byte(val));
+ add(name, Byte.valueOf(val));
}
public void setBytes (String name, byte[] val)
@@ -196,17 +196,17 @@
public void setChar (String name, char val)
{
- add(name, new Byte((byte) val));
+ add(name, Byte.valueOf((byte) val));
}
public void setInt (String name, int val)
{
- add(name, new Integer(val));
+ add(name, Integer.valueOf(val));
}
public void setLong (String name, long val)
{
- add(name, new Long(val));
+ add(name, Long.valueOf(val));
}
public void setString (String name, String val)
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/body/content/MapBodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/body/content/MapBodyImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/body/content/MapBodyImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -2,7 +2,6 @@
import java.io.Serializable;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Map;
import org.jboss.internal.soa.esb.message.format.xml.BodyImpl;
@@ -170,12 +169,12 @@
public void setBoolean (String name, boolean val)
{
- add(name, new Boolean(val));
+ add(name, Boolean.valueOf(val));
}
public void setByte (String name, byte val)
{
- add(name, new Byte(val));
+ add(name, Byte.valueOf(val));
}
public void setBytes (String name, byte[] val)
@@ -195,17 +194,17 @@
public void setChar (String name, char val)
{
- add(name, new Byte((byte) val));
+ add(name, Byte.valueOf((byte) val));
}
public void setInt (String name, int val)
{
- add(name, new Integer(val));
+ add(name, Integer.valueOf(val));
}
public void setLong (String name, long val)
{
- add(name, new Long(val));
+ add(name, Long.valueOf(val));
}
public void setString (String name, String val)
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -38,44 +38,35 @@
*/
public class J2eeConnectionManager implements ConnectionManager {
- private static J2eeConnectionManager instance = null;
- @SuppressWarnings("unused")
+ private static J2eeConnectionManager instance;
private DataSource datasource = null;
private Context oJndiCtx = null;
private static Logger _logger = Logger.getLogger(J2eeConnectionManager.class);
- private static final Object foo = new Integer(0);
public Connection getConnection() throws SQLException
{
return datasource.getConnection();
}
- public ConnectionManager getInstance() {
- if (null != instance)
- {
+ // Why is this part of the interface??
+ public synchronized ConnectionManager getInstance() {
+ if (null != instance)
return instance;
- }
- synchronized (foo)
+ try
{
- if (null != instance)
- return instance;
+ instance = new J2eeConnectionManager();
+ instance.init();
+ }
+ catch (Exception e)
+ {
+ _logger.error("Could not initialise instance.", e);
- try
- {
- instance = new J2eeConnectionManager();
- instance.init();
- }
- catch (Exception e)
- {
- _logger.error("Could not initialise instance.", e);
-
- return null;
- }
-
- return instance;
+ return null;
}
+
+ return instance;
}
public void init() throws ConfigurationException {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -43,36 +43,27 @@
protected ComboPooledDataSource pooledDS = null;
- private static final Object foo = new Integer(0);
-
private static Logger _logger = Logger.getLogger(StandaloneConnectionManager.class);
- public ConnectionManager getInstance ()
+ // Why is this part of the interface??
+ public synchronized ConnectionManager getInstance ()
{
- if (null != instance)
- {
+ if (null != instance)
return instance;
- }
- synchronized (foo)
+ try
{
- if (null != instance)
- return instance;
+ instance = new StandaloneConnectionManager();
+ instance.init();
+ }
+ catch (Exception e)
+ {
+ _logger.error("Could not initialise instance.", e);
- try
- {
- instance = new StandaloneConnectionManager();
- instance.init();
- }
- catch (Exception e)
- {
- _logger.error("Could not initialise instance.", e);
-
- return null;
- }
-
- return instance;
+ return null;
}
+
+ return instance;
}
public void init () throws ConfigurationException
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/remoting/HttpUnmarshaller.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -42,7 +42,7 @@
static final long serialVersionUID = 1085086661310576768L;
- protected final Logger log = Logger.getLogger(getClass());
+ private static final Logger log = Logger.getLogger(HttpUnmarshaller.class);
/**
* Will try to unmarshall data from inputstream. Will try to convert to either an object
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -784,6 +784,10 @@
final ConnectionFactory factory = (ConnectionFactory)factoryConnection ;
jmsConnection = useJMSSecurity ? factory.createConnection(username,password): factory.createConnection();
}
+ else
+ {
+ throw new ConnectionException("Unknown factory connection type: " + factoryConnection.getClass().getCanonicalName());
+ }
jmsConnection.setExceptionListener(new ExceptionListener() {
public void onException(JMSException arg0)
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -44,7 +44,7 @@
*/
public class JmsConnectionPoolContainer{
- protected static Logger logger = Logger.getLogger(JmsConnectionPoolContainer.class);
+ protected static final Logger logger = Logger.getLogger(JmsConnectionPoolContainer.class);
/**
* The lifecycle resource factory.
@@ -162,10 +162,11 @@
static Properties getJndiEnvironment(Map<String,String> poolKey) {
Properties environment = new Properties();
final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(poolKey.get(JMSEpr.JNDI_PREFIXES)) ;
- for (String key: poolKey.keySet()) {
+ for (Map.Entry<String, String> entry: poolKey.entrySet()) {
+ final String key = entry.getKey() ;
for(String jndiPrefix: jndiPrefixes) {
if (key.startsWith(jndiPrefix)) {
- environment.setProperty(key, poolKey.get(key));
+ environment.setProperty(key, entry.getValue());
break ;
}
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptor.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -108,7 +109,7 @@
throws RegistryException, ServiceNotFoundException
{
final Service service = new Service(category, name) ;
- final ConcurrentMap<EPR, EPR> eprs = getEPRs(service) ;
+ final ConcurrentMap<EPR, AtomicLong> eprs = getEPRs(service) ;
final Iterator<EPR> eprIter = eprs.keySet().iterator() ;
if (eprIter.hasNext())
{
@@ -132,7 +133,7 @@
throws RegistryException, ServiceNotFoundException
{
final Service service = new Service(category, name) ;
- final ConcurrentMap<EPR, EPR> eprs = getEPRs(service) ;
+ final ConcurrentMap<EPR, AtomicLong> eprs = getEPRs(service) ;
return Arrays.asList(eprs.keySet().toArray(new EPR[0])) ;
}
@@ -163,10 +164,10 @@
getRegistry().registerEPR(category, name, serviceDescription, epr, eprDescription) ;
if (serviceInfo != null)
{
- final ConcurrentMap<EPR, EPR> eprs = serviceInfo.getEPRs() ;
+ final ConcurrentMap<EPR, AtomicLong> eprs = serviceInfo.getEPRs() ;
if (eprs != null)
{
- eprs.put(epr, epr) ;
+ addEPR(eprs, epr) ;
}
}
}
@@ -200,10 +201,17 @@
getRegistry().unRegisterEPR(category, name, epr) ;
if (serviceInfo != null)
{
- final ConcurrentMap<EPR, EPR> eprs = serviceInfo.getEPRs() ;
+ final ConcurrentMap<EPR, AtomicLong> eprs = serviceInfo.getEPRs() ;
if (eprs != null)
{
- eprs.remove(epr) ;
+ final AtomicLong count = eprs.get(epr) ;
+ if (count != null)
+ {
+ if (count.decrementAndGet() == 0)
+ {
+ eprs.remove(epr) ;
+ }
+ }
}
}
}
@@ -305,7 +313,7 @@
* @throws RegistryException For errors accessing the registry delegate.
* @throws ServiceNotFoundException If the service is not in the registry.
*/
- private ConcurrentMap<EPR, EPR> getEPRs(final Service service)
+ private ConcurrentMap<EPR, AtomicLong> getEPRs(final Service service)
throws RegistryException, ServiceNotFoundException
{
final ServiceInfo serviceInfo = getServiceInfo(service) ;
@@ -314,7 +322,7 @@
serviceInfo.acquireReadLock() ;
try
{
- final ConcurrentMap<EPR, EPR> eprs = serviceInfo.getEPRs() ;
+ final ConcurrentMap<EPR, AtomicLong> eprs = serviceInfo.getEPRs() ;
if (eprs != null)
{
return eprs ;
@@ -329,7 +337,7 @@
newServiceInfo.acquireWriteLock() ;
try
{
- final ConcurrentMap<EPR, EPR> eprs = newServiceInfo.getEPRs() ;
+ final ConcurrentMap<EPR, AtomicLong> eprs = newServiceInfo.getEPRs() ;
if (eprs != null)
{
return eprs ;
@@ -337,10 +345,10 @@
else
{
final List<EPR> currentEPRs = getRegistry().findEPRs(service.getCategory(), service.getName()) ;
- final ConcurrentMap<EPR, EPR> newEPRs = new ConcurrentHashMap<EPR, EPR>() ;
+ final ConcurrentMap<EPR, AtomicLong> newEPRs = new ConcurrentHashMap<EPR, AtomicLong>() ;
for(EPR epr: currentEPRs)
{
- newEPRs.put(epr, epr) ;
+ addEPR(newEPRs, epr) ;
}
newServiceInfo.setEPRs(newEPRs) ;
if (LOGGER.isDebugEnabled())
@@ -357,6 +365,21 @@
}
/**
+ * Add an EPR entry into the map.
+ * @param eprs The current map.
+ * @param epr The epr to add.
+ */
+ private static void addEPR(final ConcurrentMap<EPR, AtomicLong> eprs, final EPR epr)
+ {
+ final AtomicLong newCount = new AtomicLong(1) ;
+ final AtomicLong count = eprs.putIfAbsent(epr, newCount) ;
+ if (count != null)
+ {
+ count.incrementAndGet() ;
+ }
+ }
+
+ /**
* Class representing the service information
* @author kevin
*/
@@ -364,7 +387,7 @@
{
private final long expiryTime ;
- private ConcurrentMap<EPR, EPR> eprs ;
+ private ConcurrentMap<EPR, AtomicLong> eprs ;
private ReadWriteLock lock = new ReentrantReadWriteLock() ;
@@ -385,12 +408,12 @@
return System.currentTimeMillis() < expiryTime ;
}
- ConcurrentMap<EPR, EPR> getEPRs()
+ ConcurrentMap<EPR, AtomicLong> getEPRs()
{
return eprs ;
}
- void setEPRs(final ConcurrentMap<EPR, EPR> eprs)
+ void setEPRs(final ConcurrentMap<EPR, AtomicLong> eprs)
{
this.eprs = eprs ;
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -117,7 +117,6 @@
/**
* Remove an EPR from the Registry
*/
- @SuppressWarnings("unchecked")
public void unRegisterService(String category, String serviceName) throws RegistryException, ServiceNotFoundException{
// first find the ServiceBindings for this service
Connection connection = jaxrConnectionFactory.getConnection();
@@ -213,7 +212,7 @@
// for backwards compatibility still have the decoder if
// unmarchalling fails
try {
- EPR epr = EPRHelper.fromXMLString(eprXML);
+ EPRHelper.fromXMLString(eprXML);
} catch (UnmarshalException unme) {
try {
eprXML = URLDecoder.decode(eprXML, "UTF-8").trim();
@@ -292,7 +291,6 @@
Connection connection = jaxrConnectionFactory.getConnection();
try {
RegistryService rs = connection.getRegistryService();
- BusinessQueryManager bqm = rs.getBusinessQueryManager();
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
Service service = findService(category, serviceName);
@@ -308,14 +306,11 @@
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.AND_ALL_KEYS);
findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
- ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
- Classification classification = blm.createClassification(cScheme, "category", category);
SpecificationLink sl = new SpecificationLinkImpl(blm);
sl.setSpecificationObject(jbossTModel);
serviceBinding.getSpecificationLinks().add(sl);
- @SuppressWarnings("unused")
String eprXML = serviceBinding.getAccessURI();
EPR epr = null;
//for backwards compatibility still have the decoder if
@@ -353,7 +348,6 @@
Connection connection = jaxrConnectionFactory.getConnection();
try {
RegistryService rs = connection.getRegistryService();
- BusinessQueryManager bqm = rs.getBusinessQueryManager();
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
Service service = findService(category, serviceName);
@@ -634,7 +628,6 @@
try {
RegistryService rs = connection.getRegistryService();
BusinessQueryManager bqm = rs.getBusinessQueryManager();
- BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
Collection<String> findQualifiers = new ArrayList<String>();
findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
@@ -644,7 +637,8 @@
BulkResponse response = bqm.findConcepts(findQualifiers, namePatterns, null, null, null);
if (response.getStatus()==JAXRResponse.STATUS_SUCCESS) {
Collection<RegistryObject> regs = (Collection<RegistryObject>) response.getCollection();
- for (Iterator orgIter = response.getCollection().iterator(); orgIter.hasNext();)
+ Iterator<RegistryObject> orgIter = regs.iterator();
+ if (orgIter.hasNext())
{
tmodel = (Concept) orgIter.next();
}
@@ -671,29 +665,26 @@
//Building organization
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
- Class[] interfaces = registryObject.getClass().getInterfaces();
- String interfaceName ="";
- for (int i=0; i<interfaces.length; i++) {
- interfaceName = interfaces[i].getName();
- if (interfaceName.equals("javax.xml.registry.infomodel.Organization")) {
- Collection<Organization> orginations = new ArrayList<Organization>();
- orginations.add((Organization) registryObject);
- br = blm.saveOrganizations(orginations);
- break;
- } else if (interfaceName.equals("javax.xml.registry.infomodel.Service")) {
- Collection<Service> services = new ArrayList<Service>();
- services.add((Service) registryObject);
- br = blm.saveServices(services);
- break;
- } else if (interfaceName.equals("javax.xml.registry.infomodel.ServiceBinding")) {
- Collection<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
- serviceBindings.add((ServiceBinding) registryObject);
- br = blm.saveServiceBindings(serviceBindings);
- break;
- } else {
- logger.log(Level.ERROR, "Trying to save an unsupported RegistryObject");
- throw new JAXRException("Trying to save an unsupported RegistryObject");
- }
+ final String interfaceName ;
+ if (registryObject instanceof Organization) {
+ interfaceName = Organization.class.getCanonicalName() ;
+ Collection<Organization> orginations = new ArrayList<Organization>();
+
+ orginations.add((Organization) registryObject);
+ br = blm.saveOrganizations(orginations);
+ } else if (registryObject instanceof Service) {
+ interfaceName = Organization.class.getCanonicalName() ;
+ Collection<Service> services = new ArrayList<Service>();
+ services.add((Service) registryObject);
+ br = blm.saveServices(services);
+ } else if (registryObject instanceof ServiceBinding) {
+ interfaceName = Organization.class.getCanonicalName() ;
+ Collection<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
+ serviceBindings.add((ServiceBinding) registryObject);
+ br = blm.saveServiceBindings(serviceBindings);
+ } else {
+ 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) {
@@ -710,16 +701,16 @@
if (br!=null) {
Collection exceptions = br.getExceptions();
Iterator iter = exceptions.iterator();
- String errors = "";
+ StringBuilder errors = new StringBuilder();
JAXRException je = new JAXRException("JAXRExceptions occurred during save");
while (iter.hasNext()) {
Exception e = (Exception) iter.next();
- errors += e.getLocalizedMessage() + "\n";
+ errors.append(e.getLocalizedMessage()).append("\n");
je.setStackTrace(e.getStackTrace());
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);
+ throw new JAXRException(errors.toString(), e);
}
}
throw new JAXRException("Errors occurred during save. Response status=" + br.getStatus());
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/MockRegistryImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -60,7 +60,6 @@
/**
* Remove an EPR from the Registry
*/
- @SuppressWarnings("unchecked")
public void unRegisterService(String categoryName, String serviceName) throws RegistryException
{
Category category = categories.get(categoryName);
@@ -189,7 +188,7 @@
return category.getServices();
}
- class Category
+ static class Category
{
List<Service> services = new ArrayList<Service>();
@@ -201,7 +200,7 @@
}
}
- class Service
+ static class Service
{
String name;
String description;
@@ -227,7 +226,7 @@
}
}
- class ServiceBinding
+ static class ServiceBinding
{
String name;
String description;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Element.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Element.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Element.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -21,6 +21,7 @@
*/
package org.jboss.internal.soa.esb.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -114,12 +115,27 @@
}
/**
+ * Return a hash code for this element.
+ * @return the element hash code.
+ */
+ @Override
+ public int hashCode()
+ {
+ return name.hashCode() ^ attributes.hashCode() ^ children.hashCode() ;
+ }
+
+ /**
* The QName comparator class.
* @author kevin
*/
- private static final class QNameComparator implements Comparator<QName>
+ private static final class QNameComparator implements Comparator<QName>, Serializable
{
/**
+ * Serial version UID for this comparator.
+ */
+ private static final long serialVersionUID = -8711685004148549433L;
+
+ /**
* Compare the QNames.
* @param name1 The first QName.
* @param name2 The second QName.
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Text.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Text.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/Text.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -69,4 +69,14 @@
return false ;
}
+
+ /**
+ * Return a hash code for this element.
+ * @return the element hash code.
+ */
+ @Override
+ public int hashCode()
+ {
+ return text.hashCode() ;
+ }
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBResponseFilter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBResponseFilter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBResponseFilter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -66,7 +66,7 @@
* <p/>
* Filters out the response i.e. ensures that the response body is empty.
*/
- private class OneWayResponseWrapper extends HttpServletResponseWrapper {
+ private static class OneWayResponseWrapper extends HttpServletResponseWrapper {
public OneWayResponseWrapper(HttpServletResponse httpServletResponse) {
super(httpServletResponse);
@@ -84,7 +84,7 @@
/**
* Null {@link ServletOutputStream}.
*/
- private class NullServletOutputStream extends ServletOutputStream {
+ private static class NullServletOutputStream extends ServletOutputStream {
public void write(int b) throws IOException {
}
public void write(byte b[]) throws IOException {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -69,5 +69,5 @@
return process(message);
}
- protected static Logger _logger = Logger.getLogger(ContentBasedRouter.class);
+ protected static final Logger _logger = Logger.getLogger(ContentBasedRouter.class);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedWiretap.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedWiretap.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/ContentBasedWiretap.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -323,7 +323,6 @@
protected org.jboss.soa.esb.services.routing.cbr.ContentBasedRouter _cbr;
- protected static Logger _logger = Logger
- .getLogger(ContentBasedWiretap.class);
+ protected static final Logger _logger = Logger.getLogger(ContentBasedWiretap.class);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/LogAction.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/LogAction.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/LogAction.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -92,6 +92,7 @@
public void setLogLevel( final String logLevel )
{
+ this.logLevel = logLevel ;
level = Level.toLevel( logLevel, Level.DEBUG );
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticRouter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -59,5 +59,5 @@
return process(message);
}
- protected static Logger _logger = Logger.getLogger(StaticRouter.class);
+ protected static final Logger _logger = Logger.getLogger(StaticRouter.class);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticWiretap.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticWiretap.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/StaticWiretap.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -97,5 +97,5 @@
protected MessageMulticaster messageMulticaster;
- protected static Logger _logger = Logger.getLogger(StaticWiretap.class);
+ protected static final Logger _logger = Logger.getLogger(StaticWiretap.class);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/cbr/XPathRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/cbr/XPathRouter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/cbr/XPathRouter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -102,7 +102,7 @@
}
}
- private class NamespaceContext extends XPathNamespaceContext {
+ private static class NamespaceContext extends XPathNamespaceContext {
public NamespaceContext(ConfigTree[] namespaces) throws ConfigurationException {
if(namespaces != null) {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/monitoring/MVELMonitoringAction.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -51,7 +51,6 @@
private static final String BEANSHELL_VARIABLE = "beanshellVar";
- private ObjectMapper objectMapper;
private MVELMonitor mvelMonitor;
ArrayList <MonitoringPatternBean> list = null;
@@ -99,7 +98,6 @@
}
public Message process(Message message) throws ActionProcessingException {
- objectMapper = new ObjectMapper();
if (list != null) {
for (int i = 0; i<list.size(); i++) {
MonitoringPatternBean mpb = list.get(i);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/EPR.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -162,6 +162,17 @@
return false;
}
+
+ /**
+ * Return a hash code for this element.
+ * @return the element hash code.
+ */
+ @Override
+ public int hashCode()
+ {
+ return _addr.hashCode() ;
+ }
+
static protected final Logger _logger = Logger.getLogger(EPR.class);
private PortReference _addr;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/PortReference.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -199,7 +199,7 @@
public String extendedToString()
{
- String addr = "<" + XMLUtil.WSA_PREFIX + ":Address " + _address + "/>";
+ StringBuilder addr = new StringBuilder("PortReference < ").append("<").append(XMLUtil.WSA_PREFIX).append(":Address ").append(_address + "/>");
Iterator extensions = getExtensions();
@@ -207,12 +207,12 @@
{
Extension ext = (Extension) extensions.next();
- addr += ", <" + XMLUtil.WSA_PREFIX + ":"
- + XMLUtil.REFERENCE_PROPERTIES_TAG + " " + ext.getPrefix()
- + ":" + ext.getTag() + " : " + ext.getValue() + "/>";
+ addr.append(", <").append(XMLUtil.WSA_PREFIX).append(":")
+ .append(XMLUtil.REFERENCE_PROPERTIES_TAG).append(" ").append(ext.getPrefix())
+ .append(":").append(ext.getTag()).append(" : ").append(ext.getValue()).append("/>");
}
- return "PortReference < " + addr + " >";
+ return addr.append(" >").toString();
}
/**
@@ -345,8 +345,8 @@
public String toString()
{
- return new String("< " + _tag + ", " + _prefix + ", " + _uri + ", "
- + _value + " >");
+ return "< " + _tag + ", " + _prefix + ", " + _uri + ", "
+ + _value + " >";
}
/**
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/util/EPRManager.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -106,6 +106,16 @@
return false;
}
+
+ /**
+ * Return a hash code for this element.
+ * @return the element hash code.
+ */
+ @Override
+ public int hashCode()
+ {
+ return _directory.hashCode() ;
+ }
/**
* Save the EPR into the specified file.
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -196,10 +196,8 @@
}
finally
{
- if (null != in)
- in.close();
- if (null != out)
- out.close();
+ in.close();
+ out.close();
}
return out.toByteArray();
}
@@ -284,5 +282,5 @@
}
- protected static Logger _logger = Logger.getLogger(CourierUtil.class);
+ protected static final Logger _logger = Logger.getLogger(CourierUtil.class);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/ConfigTree.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -31,6 +31,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -130,8 +131,8 @@
}
private void setParent(ConfigTree dad) {
- if (null != _dad && null != _dad._childs)
- _dad._childs.remove(this);
+ if (null != _dad)
+ _dad.removeChild(this);
if (null != dad)
dad.addChild(this);
}
@@ -357,6 +358,18 @@
new Child(child);
}
+ private void removeChild(final ConfigTree child) {
+ if (_childs != null) {
+ final Iterator<Child> childIter = _childs.iterator() ;
+ while (childIter.hasNext()) {
+ if (this == childIter.next()._obj) {
+ childIter.remove() ;
+ break ;
+ }
+ }
+ }
+ }
+
/**
* retrieve list of child elements of 'this' that are instances of ConfigTree
*
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/Email.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -549,7 +549,7 @@
return new String[]{attachments};
}
- private class MyAuth extends Authenticator {
+ private static class MyAuth extends Authenticator {
private String m_sUser, m_sPwd;
private MyAuth(String p_sU, String p_sP) {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -21,6 +21,7 @@
*/
package org.jboss.soa.esb.helpers;
+import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
@@ -86,8 +87,8 @@
public static Context getFreshServerContext(Properties properties)
{
String key = getKey(properties);
- if (_contextCache.containsKey(key)) {
- Context context = _contextCache.get(key);
+ Context context = _contextCache.get(key);
+ if (context != null) {
try {
context.close();
} catch (NamingException ne) {
@@ -123,10 +124,14 @@
*/
public static void closeAllContexts()
{
- for (String key : _contextCache.keySet()) {
+ for (Map.Entry<String, Context> entry : _contextCache.entrySet()) {
+ final String key = entry.getKey() ;
try {
_logger.debug("Closing JNDI connection for key: " + key);
- _contextCache.get(key).close();
+ final Context context = entry.getValue();
+ if (context != null) {
+ context.close();
+ }
} catch (NamingException ne) {
_logger.warn("Could not close JNDI connection for key: " + key);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/HibernateSessionFactory.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -99,13 +99,9 @@
}
if (sf == null) {
- if (f_cfg != null) {
- // Let Hibernate bind it to JNDI
- m_Logger.debug("Build SessionFactory from Configuration.");
- f_cfg.buildSessionFactory();
- } else {
- throw new ConfigurationException("Hibernate Configuration is null");
- }
+ // Let Hibernate bind it to JNDI
+ m_Logger.debug("Build SessionFactory from Configuration.");
+ sf = f_cfg.buildSessionFactory();
}
return sf;
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -179,8 +179,7 @@
eRet = e;
try {
- Thread.sleep(100 + (new Double(100 * Math.random()))
- .longValue());
+ Thread.sleep(100 + (long)(100 * Math.random()));
} catch (InterruptedException ex) {
m_oLogger.debug("Thread interrupted.", ex);
}
@@ -223,8 +222,7 @@
try
{
- Thread.sleep(100 + (new Double(100 * Math.random()))
- .longValue());
+ Thread.sleep(100 + (long)(100 * Math.random()));
}
catch (InterruptedException ex)
{
@@ -268,8 +266,7 @@
try
{
- Thread.sleep(2000 + (new Double(100 * Math.random()))
- .longValue());
+ Thread.sleep(2000 + (long)(100 * Math.random()));
}
catch (InterruptedException ex)
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ScheduleListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ScheduleListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ScheduleListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -40,10 +40,6 @@
public class ScheduleListener extends AbstractScheduledManagedLifecycle {
/**
- *
- */
- private static final long serialVersionUID = 1L;
- /**
* The action pipeline.
*/
private ActionProcessingPipeline pipeline;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/XmlValidatorImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -59,15 +59,7 @@
*/
private Logger log = Logger.getLogger(this.getClass());
- @SuppressWarnings("unused")
- private InputSource xmlSource, validationSource;
-
private String defaultSchema = "etc/schemas/xml/jbossesb-1.0.1.xsd";
- /**
- * The path separator
- */
- @SuppressWarnings("unused")
- private static String SEP = System.getProperty("file.separator");
private boolean isValid = true;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JcaGatewayMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -53,7 +53,7 @@
listenerNode.setAttribute("endpointClass", gateway.getEndpointClass());
listenerNode.setAttribute("messagingType", gateway.getMessagingType());
listenerNode.setAttribute("jcaBridge", gateway.getJcaBridge());
- listenerNode.setAttribute("transacted", new Boolean(gateway.getTransacted()).toString());
+ listenerNode.setAttribute("transacted", Boolean.valueOf(gateway.getTransacted()).toString());
MapperUtil.mapProperties(gateway.getPropertyList(), listenerNode);
listenerNode.setAttribute("gatewayClass", JcaInflowGateway.class.getName());
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -64,7 +64,6 @@
// The default JMS JCA adapter.
private static final String DEFAULT_JMS_ADAPTER = "jms-ra.rar" ;
- @SuppressWarnings("unused")
private static Logger log = Logger.getLogger( JmsListenerMapper.class );
/**
@@ -222,7 +221,7 @@
}
activationMapper.setMessageSelector(activationConfigValues, messageFilter.getSelector()) ;
- final Integer maxThreads = (listener.isSetMaxThreads() ? new Integer(listener.getMaxThreads()) : null) ;
+ final Integer maxThreads = (listener.isSetMaxThreads() ? Integer.valueOf(listener.getMaxThreads()) : null) ;
activationMapper.setMaxThreads(activationConfigValues, maxThreads) ;
final Element activationConfigElement = YADOMUtil.addElement(listenerNode, JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JcaGatewayMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JcaGatewayMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JcaGatewayMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -53,7 +53,7 @@
listenerNode.setAttribute("endpointClass", gateway.getEndpointClass());
listenerNode.setAttribute("messagingType", gateway.getMessagingType());
listenerNode.setAttribute("jcaBridge", gateway.getJcaBridge());
- listenerNode.setAttribute("transacted", new Boolean(gateway.getTransacted()).toString());
+ listenerNode.setAttribute("transacted", Boolean.valueOf(gateway.getTransacted()).toString());
MapperUtil.mapProperties(gateway.getPropertyList(), listenerNode);
listenerNode.setAttribute("gatewayClass", JcaInflowGateway.class.getName());
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/JmsListenerMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -64,7 +64,6 @@
// The default JMS JCA adapter.
private static final String DEFAULT_JMS_ADAPTER = "jms-ra.rar" ;
- @SuppressWarnings("unused")
private static Logger log = Logger.getLogger( JmsListenerMapper.class );
/**
@@ -222,7 +221,7 @@
}
activationMapper.setMessageSelector(activationConfigValues, messageFilter.getSelector()) ;
- final Integer maxThreads = (listener.isSetMaxThreads() ? new Integer(listener.getMaxThreads()) : null) ;
+ final Integer maxThreads = (listener.isSetMaxThreads() ? Integer.valueOf(listener.getMaxThreads()) : null) ;
activationMapper.setMaxThreads(activationConfigValues, maxThreads) ;
final Element activationConfigElement = YADOMUtil.addElement(listenerNode, JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpGatewayMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpGatewayMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpGatewayMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -114,7 +114,7 @@
if(rolesString.length() > 0) {
rolesString.append(",");
}
- rolesString.append(role.getName().toString());
+ rolesString.append(role.getName());
}
listenerNode.setAttribute(HttpGatewayDeploymentFactory.ALLOWED_ROLES, rolesString.toString());
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JcaGatewayMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JcaGatewayMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JcaGatewayMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -52,7 +52,7 @@
listenerNode.setAttribute("endpointClass", gateway.getEndpointClass());
listenerNode.setAttribute("messagingType", gateway.getMessagingType());
listenerNode.setAttribute("jcaBridge", gateway.getJcaBridge());
- listenerNode.setAttribute("transacted", new Boolean(gateway.getTransacted()).toString());
+ listenerNode.setAttribute("transacted", Boolean.valueOf(gateway.getTransacted()).toString());
MapperUtil.mapProperties(gateway.getPropertyList(), listenerNode);
listenerNode.setAttribute("gatewayClass", JcaInflowGateway.class.getName());
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JmsListenerMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/JmsListenerMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -64,7 +64,6 @@
// The default JMS JCA adapter.
private static final String DEFAULT_JMS_ADAPTER = "jms-ra.rar" ;
- @SuppressWarnings("unused")
private static Logger log = Logger.getLogger( JmsListenerMapper.class );
/**
@@ -222,7 +221,7 @@
}
activationMapper.setMessageSelector(activationConfigValues, messageFilter.getSelector()) ;
- final Integer maxThreads = (listener.isSetMaxThreads() ? new Integer(listener.getMaxThreads()) : null) ;
+ final Integer maxThreads = (listener.isSetMaxThreads() ? Integer.valueOf(listener.getMaxThreads()) : null) ;
activationMapper.setMaxThreads(activationConfigValues, maxThreads) ;
final Element activationConfigElement = YADOMUtil.addElement(listenerNode, JcaConstants.ELEMENT_ACTIVATION_CONFIG) ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/GroovyGateway.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/GroovyGateway.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/GroovyGateway.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -71,10 +71,6 @@
public class GroovyGateway extends AbstractThreadedManagedLifecycle {
/**
- *
- */
- private static final long serialVersionUID = 1L;
- /**
* Logger.
*/
private static Logger logger = Logger.getLogger(GroovyGateway.class);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HibernateGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -45,8 +45,6 @@
*
*/
public class HibernateGatewayListener extends AbstractManagedLifecycle {
- private static final long serialVersionUID = -8794895112076882394L;
-
private String m_cfgFile;
private ConfigTree m_config;
protected Object _composer;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -20,6 +20,7 @@
package org.jboss.soa.esb.listeners.gateway;
import java.io.IOException;
+import java.io.ObjectInputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -65,8 +66,10 @@
/** Default allow http method list */
private String allowHttpMethods = "POST,GET";
+ private ConfigTree config ;
+
/** ESB message delivery adapter */
- public UncomposedMessageDeliveryAdapter messageDeliveryAdapter = null;
+ public transient UncomposedMessageDeliveryAdapter messageDeliveryAdapter ;
/**
* Initilize method
@@ -75,7 +78,7 @@
* If error occured
*/
public void init() throws ServletException {
- ConfigTree config = (ConfigTree) getServletContext().getAttribute(
+ config = (ConfigTree) getServletContext().getAttribute(
"config");
synchronous = !config.getAttribute("synchronous", "true").equalsIgnoreCase("false");
@@ -83,17 +86,15 @@
asyncResponse = config.getAttribute("asyncResponse");
+
+ if (config.getAttribute(HttpGatewayListener.ALLOW_HTTP_METHOD) != null) {
+ allowHttpMethods = config.getAttribute(HttpGatewayListener.ALLOW_HTTP_METHOD).toUpperCase();
+ }
try {
- messageDeliveryAdapter = UncomposedMessageDeliveryAdapter
- .getGatewayDeliveryAdapter(config,
- new HttpMessageComposer<HttpRequestWrapper>());
+ initTransient() ;
} catch (ConfigurationException e) {
throw new ServletException(e);
}
-
- if (config.getAttribute(HttpGatewayListener.ALLOW_HTTP_METHOD) != null) {
- allowHttpMethods = config.getAttribute(HttpGatewayListener.ALLOW_HTTP_METHOD).toUpperCase();
- }
}
@@ -235,4 +236,20 @@
private boolean isSupportMethod(String name) {
return allowHttpMethods.indexOf(name) >= 0;
}
+
+ private void initTransient() throws ConfigurationException {
+ messageDeliveryAdapter = UncomposedMessageDeliveryAdapter.getGatewayDeliveryAdapter(config,
+ new HttpMessageComposer<HttpRequestWrapper>());
+ }
+
+ private void readObject(final ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ ois.defaultReadObject() ;
+ try {
+ initTransient();
+ } catch (final ConfigurationException ce) {
+ final IOException ioe = new IOException("Unexpected error deserialising servlet") ;
+ ioe.initCause(ce) ;
+ throw ioe ;
+ }
+ }
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -24,6 +24,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLEncoder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -81,23 +83,20 @@
*/
public class HttpGatewayListener extends AbstractManagedLifecycle {
- private static final long serialVersionUID = 1L;
-
-
private static Logger logger = Logger.getLogger(HttpGatewayListener.class);
/**The tag used to read the host value from configuration */
- public static String SERVER_HOST_TAG = "http_host";
+ public static final String SERVER_HOST_TAG = "http_host";
/**The tag used to read the port value from configuration */
- public static String SERVER_PORT_TAG = "http_port";
+ public static final String SERVER_PORT_TAG = "http_port";
/**The tag used to read the context value from configuration */
- public static String REQUEST_CONTEXT_TAG = "http_context";
+ public static final String REQUEST_CONTEXT_TAG = "http_context";
/**The tag used to read the dispatch servlet class name value from configuration */
- public static String DISPATCH_SERVLET_CLASS = "dispatch_servlet";
+ public static final String DISPATCH_SERVLET_CLASS = "dispatch_servlet";
/**Allow http method config attribute name*/
public static final String ALLOW_HTTP_METHOD = "allowHttpMethod";
@@ -309,8 +308,12 @@
protected void startHttpServer() throws Exception {
ctx = new StandardContext();
- URL[] urls = new URL[]{};
- URLClassLoader urlClassLoader = new URLClassLoader(urls, getClass().getClassLoader());
+ final URL[] urls = new URL[]{};
+ URLClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
+ public URLClassLoader run() {
+ return new URLClassLoader(urls, getClass().getClassLoader());
+ }
+ });
WebappLoader loader = new WebappLoader(urlClassLoader);
ctx.setLoader(loader);
@@ -326,7 +329,7 @@
Thread.currentThread().setContextClassLoader(urlClassLoader);
initWebappDefaults(ctx);
Thread.currentThread().setContextClassLoader(oldloader);
- String encodedAddr = URLEncoder.encode("/" + address).toString();
+ String encodedAddr = URLEncoder.encode("/" + address);
String connectorName = HttpServerDelegate.DOMAIN_NAME + ":address=" + encodedAddr + ",port=" + port + ",type=Connector";
if (!useJBossWebServletEngine) {
//Create default Tomcat standard vHost "localhost"
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpServerDelegate.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpServerDelegate.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpServerDelegate.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -51,14 +51,14 @@
public static final String defaultVHost = "localhost";
/**Record the count that the same host name is referenced by other Tomcat listener instance */
- public static Map<String, Integer> hostReference= new java.util.HashMap<String, Integer>();
+ public static final Map<String, Integer> hostReference= new java.util.HashMap<String, Integer>();
/**Record the count that the same connector/port is referenced by other Tomcat listener instance */
- public static Map<String, Integer> connectorReference= new java.util.HashMap<String, Integer>();
+ public static final Map<String, Integer> connectorReference= new java.util.HashMap<String, Integer>();
/**JMX domain name for http listener*/
- public static String DOMAIN_NAME = "jboss.esb.tomcat";
+ public static final String DOMAIN_NAME = "jboss.esb.tomcat";
/**MBean sever*/
private static MBeanServer mbeanServer = null;
@@ -70,18 +70,13 @@
}
- public static HttpServerDelegate getInstance() {
- if (instance != null) {
- return instance;
- }
-
- synchronized(HttpServerDelegate.class) {
+ public static synchronized HttpServerDelegate getInstance() {
+ if (instance == null) {
mbeanServer = MBeanServerLocator.locateJBoss();
instance = new HttpServerDelegate();
instance.createEngine();
}
return instance;
-
}
@@ -169,7 +164,7 @@
@SuppressWarnings("unchecked")
public void createConnector(String address, String port, List<KeyValuePair> properties) throws Exception {
ObjectName standardServiceName = new ObjectName(DOMAIN_NAME + ":type=Service");
- Set connectors = queryObjects(DOMAIN_NAME + ":address=" + URLEncoder.encode("/" + address).toString() +",port="
+ Set connectors = queryObjects(DOMAIN_NAME + ":address=" + URLEncoder.encode("/" + address) +",port="
+ port + ",type=Connector,*");
if (connectors.size() == 0) {
Connector connector = null;
@@ -254,7 +249,7 @@
obj = connectorReference.get(port);
if (obj != null && (Integer) obj == 0) {
- Set connectors = queryObjects(DOMAIN_NAME + ":address=" + URLEncoder.encode("/" + address).toString() +",port="
+ Set connectors = queryObjects(DOMAIN_NAME + ":address=" + URLEncoder.encode("/" + address) +",port="
+ port + ",type=Connector,*");
if (connectors.size() > 0) {
ObjectName connector = (ObjectName)connectors.iterator().next();
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JBossRemotingGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -92,7 +92,6 @@
*/
public class JBossRemotingGatewayListener extends AbstractManagedLifecycle implements ServerInvocationHandler {
- private static final long serialVersionUID = 1L;
/**
* JBoss Remoting connector config attribute name prefix.
*/
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -69,10 +69,6 @@
import org.jboss.soa.esb.util.JndiUtil;
public class JmsGatewayListener extends AbstractThreadedManagedLifecycle {
- /**
- * serial version uid for this class
- */
- private static final long serialVersionUID = 5070422864110923930L;
public JmsGatewayListener(ConfigTree listenerConfig)
throws ConfigurationException {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -73,10 +73,6 @@
* A strategy for handling call related to write operations.
*/
private RemoteFileSystemStrategy remotefileSystemStrategy;
- /**
- * serial version uid for this class
- */
- private static final long serialVersionUID = 8505559166811233906L;
public ReadOnlyRemoteGatewayListener(ConfigTree config) throws ConfigurationException, RegistryException, GatewayException {
super(config);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -54,11 +54,6 @@
*/
public class RemoteGatewayListener extends FileGatewayListener
{
- /**
- * serial version uid for this class
- */
- private static final long serialVersionUID = 8505559166811233906L;
-
public RemoteGatewayListener(ConfigTree config) throws ConfigurationException, RegistryException, GatewayException {
super(config);
checkMyParms() ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -98,11 +98,6 @@
public class SqlTableGatewayListener extends AbstractThreadedManagedLifecycle {
/**
- * serial version uid for this class
- */
- private static final long serialVersionUID = -4394272471377134121L;
-
- /**
* The current transaction strategy
*/
private TransactionStrategy transactionStrategy ;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/mina/UdpGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/mina/UdpGatewayListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/mina/UdpGatewayListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -58,11 +58,6 @@
public class UdpGatewayListener extends AbstractManagedLifecycle
{
/**
- * Serial version unique identifier.
- */
- private static final long serialVersionUID = 1L;
-
- /**
* Class Logger instance.
*/
private Logger log = Logger.getLogger(UdpGatewayListener.class);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ha/ServiceClusterInfoImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ha/ServiceClusterInfoImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ha/ServiceClusterInfoImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -43,10 +43,7 @@
ArrayList<EPR> eprs = null;
int cursor = ServiceClusterInfo.UNINITIALIZED_CURSOR;
- Object arbitraryObject = null;
- private ServiceClusterInfoImpl (){ }
-
public ServiceClusterInfoImpl (String serviceName, List<EPR> eprs)
{
this.serviceName = serviceName;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JBoss42ActivationBridge.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -53,7 +53,7 @@
/**
* The signature for createActivationSpec
*/
- protected static final String[] createActivationSpecSig = new String[]
+ private static final String[] createActivationSpecSig = new String[]
{
Class.class.getName(),
Collection.class.getName()
@@ -62,7 +62,7 @@
/**
* The signature for activate/deactivateEndpint
*/
- protected static final String[] activationSig = new String[]
+ private static final String[] activationSig = new String[]
{
MessageEndpointFactory.class.getName(),
ActivationSpec.class.getName()
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/jca/JcaInflowGateway.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -35,7 +35,6 @@
*/
public class JcaInflowGateway extends BaseJcaInflow<InflowGateway>
{
- private static final long serialVersionUID = 1L;
private String serviceName;
private String serviceCategory;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/AbstractManagedLifecycle.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.ObjectInputStream;
-import java.io.Serializable;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.TimeUnit;
@@ -40,7 +39,7 @@
*
* @author kevin
*/
-public abstract class AbstractManagedLifecycle implements ManagedLifecycle, Serializable
+public abstract class AbstractManagedLifecycle implements ManagedLifecycle
{
/**
* The logger for this class.
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/lifecycle/LifecycleController.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -216,7 +216,7 @@
if (name.equals(LIFECYCLESTATE_ATTRIB)) {
value = m_lifecycle.getState().toString();
} else if (name.equals(STARTTIME_ATTRIB)) {
- value = m_startTime.toString();
+ value = m_startTime;
} else if (name.equals(XML_ATTRIB)) {
value = getListenerXMLAsHtml();
} else {
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageAwareListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -64,11 +64,6 @@
public class MessageAwareListener extends AbstractThreadedManagedLifecycle
{
/**
- * serial version uid for this class
- */
- private static final long serialVersionUID = -9198018611828254359L;
-
- /**
* The minimum error delay.
*/
private static final long MIN_ERROR_DELAY = 1000 ;
@@ -602,7 +597,7 @@
private ExecutorService _execService;
- private Object _synchThreads = new Short((short) -1);
+ private byte[] _synchThreads = new byte[0];
private int _qRunningThreads;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterStatistics.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterStatistics.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/MessageCounterStatistics.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -21,7 +21,6 @@
package org.jboss.soa.esb.listeners.message;
import java.sql.Timestamp;
-import java.util.Observable;
/**
* Extraction of core from MessageCounter bean.
@@ -106,14 +105,12 @@
public synchronized void update(MessageStatusBean msb) {
if (msb.getMessageStatus().equals(MessageStatusBean.MESSAGE_SENT)) {
successMessageCount++;
- Timestamp ts = new Timestamp(msb.getMessageTime());
if (msb.getMessageTime() > lastSuccessfulMessageDate) {
lastSuccessfulMessageDate = msb.getMessageTime();
}
bytesProcessed += msb.getMessageBytes();
} else if (msb.getMessageStatus().equals(MessageStatusBean.MESSAGE_FAILED)) {
failedMessageCount++;
- Timestamp ts = new Timestamp(msb.getMessageTime());
if (msb.getMessageTime() > lastFailedMessageDate) {
lastFailedMessageDate = msb.getMessageTime();
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/message/ServiceMessageCounter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -272,10 +272,10 @@
}
actionNames[count] = actionId ;
}
- serviceCount = new Integer(0);
- bytesProcessed = new Long(0);
- bytesFailed = new Long(0);
- bytesOverall = new Long(0);
+ serviceCount = Integer.valueOf(0);
+ bytesProcessed = Long.valueOf(0);
+ bytesFailed = Long.valueOf(0);
+ bytesOverall = Long.valueOf(0);
timeProcessed = new Long (0);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -52,11 +52,11 @@
* DO NOT reorder this list. New types may be added as required.
*/
- public static URI JBOSS_XML = null;
+ public static final URI JBOSS_XML ;
- public static URI JAVA_SERIALIZED = null;
+ public static final URI JAVA_SERIALIZED ;
- public static URI DEFAULT_TYPE = null;
+ public static final URI DEFAULT_TYPE ;
static
{
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -69,7 +69,7 @@
public class ObjectMapper
{
/** Name to get the byte[] content */
- public static String BODY_CONTENT = "BODY_CONTENT";
+ public static final String BODY_CONTENT = "BODY_CONTENT";
private Logger logger = Logger.getLogger(this.getClass());
/**
@@ -86,8 +86,8 @@
private static final char EXPRESSION_SEPARATOR = '.' ;
private MessagePayloadProxy payloadProxy;
- private static String[] legacyGetPayloadLocations = new String[] {BytesBody.BYTES_LOCATION};
- private static String[] legacySetPayloadLocations = new String[] {BytesBody.BYTES_LOCATION};
+ private static final String[] legacyGetPayloadLocations = new String[] {BytesBody.BYTES_LOCATION};
+ private static final String[] legacySetPayloadLocations = new String[] {BytesBody.BYTES_LOCATION};
public ObjectMapper() {
// Unconfigurable payload proxy...
@@ -176,10 +176,9 @@
throws ObjectMappingException
{
if (expressionAndObject!=null) {
- for (Object object: expressionAndObject.keySet())
- {
- String expression = expressionAndObject.get(object);
- setObjectOnMessage(message, expression, object);
+ for (Map.Entry<Object, String> entry: expressionAndObject.entrySet())
+ {
+ setObjectOnMessage(message, entry.getValue(), entry.getKey());
}
}
return message;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/mock/MockListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/mock/MockListener.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/mock/MockListener.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -31,11 +31,6 @@
*/
public class MockListener extends AbstractManagedLifecycle {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
public MockListener(ConfigTree config) throws ConfigurationException {
super(config);
}
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -62,7 +62,7 @@
private String m_sType;
- protected static Logger _logger = Logger.getLogger(NotificationList.class);
+ protected static final Logger _logger = Logger.getLogger(NotificationList.class);
/**
* Instantiate an object according to the contents of <arg 1>
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -255,7 +255,7 @@
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
- private class NotificationFile extends File
+ private static class NotificationFile extends File
{
private static final long serialVersionUID = 1L;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -238,13 +238,12 @@
* Blah. We do this for backward compatibility.
*/
- NativeMessage defaultType = NativeMessage.text;
+ NativeMessage defaultType;
- if (esbMessage != null)
- {
- if (esbMessage.getType().equals(MessageType.JAVA_SERIALIZED))
+ if (MessageType.JAVA_SERIALIZED.equals(esbMessage.getType()))
defaultType = NativeMessage.object;
- }
+ else
+ defaultType = NativeMessage.text;
/*
* http://jira.jboss.com/jira/browse/JBESB-1606
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/CertificateLoginModule.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/CertificateLoginModule.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/CertificateLoginModule.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -243,13 +243,12 @@
else
{
InputStream resourceAsStream = getResourceAsStream(roleProperties, getClass());
+ if (resourceAsStream == null )
+ {
+ throw new LoginException(ROLE_PROPERTIES + " was specified as '" + roleProperties + "' but could not be located on the local file system or on the classpath. Please check the configuration.");
+ }
try
{
- resourceAsStream = getResourceAsStream(roleProperties, getClass());
- if (resourceAsStream == null )
- {
- throw new LoginException(ROLE_PROPERTIES + " was specified as '" + roleProperties + "' but could not be located on the local file system or on the classpath. Please check the configuration.");
- }
final Properties roles = new Properties();
// load the roles properties file
roles.load(resourceAsStream);
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocator.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocator.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocator.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -60,6 +60,16 @@
: false;
} //__________________________________
+ /**
+ * Return a hash code for this element.
+ * @return the element hash code.
+ */
+ @Override
+ public int hashCode()
+ {
+ return (int)(m_lUid ^ (m_lUid >>> 32)) ;
+ }
+
public static ObjLocator find(long p_l, ObjLocator[] p_ola)
{ ObjLocator oRet;
if (null != p_ola)
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocatorSorter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocatorSorter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/ObjLocatorSorter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -22,6 +22,7 @@
package org.jboss.soa.esb.util;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Comparator;
public class ObjLocatorSorter
@@ -34,7 +35,11 @@
{ m_iQcols = (null==p_oa) ? 0
: p_oa.length<1 ? 0
: p_oa[0].getColumnCount();
- m_olRows = Arrays.asList(p_oa);
+ if (p_oa == null) {
+ m_olRows = Collections.emptyList() ;
+ } else {
+ m_olRows = Arrays.asList(p_oa);
+ }
} //________________________________
public ObjLocator[] sort (int p_iCol)
@@ -64,7 +69,7 @@
// ---------------------------------------------------------
// Comparator for Table Columns
// ---------------------------------------------------------
- private class RowCmp implements Comparator<ObjLocator>
+ private static class RowCmp implements Comparator<ObjLocator>
{
int m_iCol;
boolean m_bAsc;
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/Util.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -305,7 +305,7 @@
try
{
- factory.setAttribute("indent-number", new Integer(4));
+ factory.setAttribute("indent-number", Integer.valueOf(4));
}
catch (Exception e)
{
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tx/JBESB_2866_UnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tx/JBESB_2866_UnitTest.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tx/JBESB_2866_UnitTest.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -48,7 +48,7 @@
Message message = MessageFactory.getInstance().getMessage();
epr.setPassByValue(passByVal);
- MockInVMXAResource resource = new MockInVMXAResource(epr, InVMTransport.toDeliveryObject(message, epr.getPassByValue()), InVMXAResource.operation.REMOVE);
+ MockInVMXAResource resource = new MockInVMXAResource(epr, InVMTransport.toDeliveryObject(message, epr.getPassByValue()), InVMXAResource.Operation.REMOVE);
// In reality, a new XAResource would be created for each retry, but it's the underlying
// message that matters, so we just need to create 1 instance of MockInVMXAResource and
@@ -73,7 +73,7 @@
private int deliveryCount;
private boolean deliveredToDQL;
- public MockInVMXAResource(final InVMEpr inVMEpr, final Object msgObject, final operation op) {
+ public MockInVMXAResource(final InVMEpr inVMEpr, final Object msgObject, final Operation op) {
super(inVMEpr, msgObject, op);
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/CachingRegistryInterceptorUnitTest.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -19,11 +19,13 @@
*/
package org.jboss.internal.soa.esb.services.registry;
+import java.net.URI;
import java.util.List;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase;
@@ -33,7 +35,6 @@
import org.jboss.soa.esb.services.registry.RegistryInterceptor;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
/**
* Unit tests for the caching registry interceptor
@@ -52,6 +53,7 @@
final String name = "name" ;
final EPR epr1 = new EPR() ;
final EPR epr2 = new EPR() ;
+ final EPR epr3 = new EPR(URI.create("urn:test")) ;
final CachingRegistryInterceptor interceptor = new CachingRegistryInterceptor() ;
final CacheRegistryStatsInterceptor stats = new CacheRegistryStatsInterceptor() ;
@@ -94,6 +96,12 @@
assertEquals("Original EPR count", 1, registerOrigEPRs.size()) ;
interceptor.registerEPR(category, name, "Description", epr2, "EPR description") ;
assertEquals("registerEPR count", 1, stats.getRegisterEPRCount()) ;
+ final List<EPR> duplicateEPRs = interceptor.findEPRs(category, name) ;
+ assertEquals("findEPRs count", 1, stats.getFindEPRsCount()) ;
+ assertNotNull("Duplicate EPRs", duplicateEPRs) ;
+ assertEquals("Duplicate EPR count", 1, duplicateEPRs.size()) ;
+ interceptor.registerEPR(category, name, "Description", epr3, "EPR description") ;
+ assertEquals("registerEPR count", 2, stats.getRegisterEPRCount()) ;
final List<EPR> registerNewEPRs = interceptor.findEPRs(category, name) ;
assertEquals("findEPRs count", 1, stats.getFindEPRsCount()) ;
assertNotNull("New EPRs", registerNewEPRs) ;
@@ -106,14 +114,20 @@
assertEquals("findEPRs count", 1, stats.getFindEPRsCount()) ;
assertNotNull("Original EPRs", unRegisterOrigEPRs) ;
assertEquals("Original EPR count", 2, unRegisterOrigEPRs.size()) ;
- interceptor.unRegisterEPR(category, name, epr2) ;
+ interceptor.unRegisterEPR(category, name, epr3) ;
assertEquals("unRegisterEPR count", 1, stats.getUnRegisterEPRCount()) ;
final List<EPR> unRegisterNewEPRs = interceptor.findEPRs(category, name) ;
assertEquals("findEPRs count", 1, stats.getFindEPRsCount()) ;
assertNotNull("New EPRs", unRegisterNewEPRs) ;
assertEquals("New EPR count", 1, unRegisterNewEPRs.size()) ;
+ interceptor.unRegisterEPR(category, name, epr2) ;
+ assertEquals("unRegisterEPR count", 2, stats.getUnRegisterEPRCount()) ;
+ final List<EPR> unRegisterDuplicateEPRs = interceptor.findEPRs(category, name) ;
+ assertEquals("findEPRs count", 1, stats.getFindEPRsCount()) ;
+ assertNotNull("Duplicate EPRs", unRegisterDuplicateEPRs) ;
+ assertEquals("Duplicate EPR count", 1, unRegisterDuplicateEPRs.size()) ;
interceptor.unRegisterEPR(category, name, epr1) ;
- assertEquals("unRegisterEPR count", 2, stats.getUnRegisterEPRCount()) ;
+ assertEquals("unRegisterEPR count", 3, stats.getUnRegisterEPRCount()) ;
final List<EPR> finalEPRs = interceptor.findEPRs(category, name) ;
assertEquals("findEPRs count", 1, stats.getFindEPRsCount()) ;
assertNotNull("Final EPRs", finalEPRs) ;
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/MockRegistry.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/MockRegistry.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/MockRegistry.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -21,6 +21,7 @@
package org.jboss.internal.soa.esb.services.registry;
+import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -104,7 +105,7 @@
* @param courier EPR Courier.
*/
public static void register(String category, String service, MockCourier courier) {
- EPR epr = new EPR();
+ EPR epr = new EPR(URI.create("urn:test:"+category+":"+service));
register(category, service, epr, courier);
}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GroovyGatewayUnitTest.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -100,8 +100,6 @@
}
private class MockGroovyGateway extends GroovyGateway {
-
- private static final long serialVersionUID = 1L;
private boolean stopped = false;
protected MockGroovyGateway(ConfigTree config) throws ConfigurationException {
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/ReadOnlyRemoteGatewayListenerIntegrationTest.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -262,8 +262,6 @@
*/
class RemoteGatewayListenerMock extends ReadOnlyRemoteGatewayListener
{
- private static final long serialVersionUID = 1L;
-
private boolean finishedOneRun;
/**
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerUnitTest.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerUnitTest.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -496,8 +496,6 @@
*/
class RemoteGatewayListenerMock extends RemoteGatewayListener
{
- private static final long serialVersionUID = 1L;
-
private boolean finishedOneRun;
/**
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ServiceInvokerCallUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ServiceInvokerCallUnitTest.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ServiceInvokerCallUnitTest.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -60,8 +60,8 @@
MockCourierFactory.install() ;
MockRegistry.install() ;
- deliverEPR = new EPR(new URI("test:deliver")) ;
- failEPR = new EPR(new URI("test:fail")) ;
+ deliverEPR = new JMSEpr(JMSEpr.QUEUE_TYPE, "test:deliver", "ConnectionFactory") ;
+ failEPR = new JMSEpr(JMSEpr.QUEUE_TYPE, "test:fail", "ConnectionFactory") ;
pickupEPR = new EPR(new URI("test:pickup")) ;
jmsDeliverEPR = new JMSEpr(JMSEpr.QUEUE_TYPE, "deliver", "ConnectionFactory") ;
@@ -106,14 +106,14 @@
throws Exception
{
final Message message = MessageFactory.getInstance().getMessage() ;
- message.getHeader().getCall().setTo(deliverEPR) ;
+ message.getHeader().getCall().setTo(failEPR) ;
final ServiceInvoker si = new ServiceInvoker("test", "jmsdeliver") ;
final Message resp = si.deliverSync(message, 10) ;
assertEquals("Response message", resp, responseMessage) ;
- assertEquals("Call To EPR", deliverEPR, message.getHeader().getCall().getTo()) ;
+ assertEquals("Call To EPR", failEPR, message.getHeader().getCall().getTo()) ;
assertNull("Call ReplyTo EPR", message.getHeader().getCall().getReplyTo()) ;
}
@@ -122,7 +122,7 @@
throws Exception
{
final Message message = MessageFactory.getInstance().getMessage() ;
- message.getHeader().getCall().setTo(deliverEPR) ;
+ message.getHeader().getCall().setTo(failEPR) ;
message.getHeader().getCall().setReplyTo(pickupEPR) ;
final ServiceInvoker si = new ServiceInvoker("test", "jmsdeliver") ;
@@ -130,7 +130,7 @@
assertEquals("Response message", resp, responseMessage) ;
- assertEquals("Call To EPR", deliverEPR, message.getHeader().getCall().getTo()) ;
+ assertEquals("Call To EPR", failEPR, message.getHeader().getCall().getTo()) ;
assertEquals("Call ReplyTo EPR", pickupEPR, message.getHeader().getCall().getReplyTo()) ;
}
@@ -152,12 +152,12 @@
throws Exception
{
final Message message = MessageFactory.getInstance().getMessage() ;
- message.getHeader().getCall().setTo(deliverEPR) ;
+ message.getHeader().getCall().setTo(failEPR) ;
final ServiceInvoker si = new ServiceInvoker("test", "jmsdeliver") ;
si.deliverAsync(message) ;
- assertEquals("Call To EPR", deliverEPR, message.getHeader().getCall().getTo()) ;
+ assertEquals("Call To EPR", failEPR, message.getHeader().getCall().getTo()) ;
assertNull("Call ReplyTo EPR", message.getHeader().getCall().getReplyTo()) ;
}
@@ -166,13 +166,13 @@
throws Exception
{
final Message message = MessageFactory.getInstance().getMessage() ;
- message.getHeader().getCall().setTo(deliverEPR) ;
+ message.getHeader().getCall().setTo(failEPR) ;
message.getHeader().getCall().setReplyTo(pickupEPR) ;
final ServiceInvoker si = new ServiceInvoker("test", "jmsdeliver") ;
si.deliverAsync(message) ;
- assertEquals("Call To EPR", deliverEPR, message.getHeader().getCall().getTo()) ;
+ assertEquals("Call To EPR", failEPR, message.getHeader().getCall().getTo()) ;
assertEquals("Call ReplyTo EPR", pickupEPR, message.getHeader().getCall().getReplyTo()) ;
}
@@ -240,12 +240,7 @@
final Message message = MessageFactory.getInstance().getMessage() ;
final ServiceInvoker si = new ServiceInvoker("test", "fail") ;
- try
- {
- si.deliverAsync(message) ;
- fail("Expected MessageDeliveryException") ;
- }
- catch (final MessageDeliverException mde) {} // expected
+ si.deliverAsync(message) ;
assertNull("Call To EPR", message.getHeader().getCall().getTo()) ;
assertNull("Call ReplyTo EPR", message.getHeader().getCall().getReplyTo()) ;
@@ -259,12 +254,7 @@
message.getHeader().getCall().setTo(deliverEPR) ;
final ServiceInvoker si = new ServiceInvoker("test", "fail") ;
- try
- {
- si.deliverAsync(message) ;
- fail("Expected MessageDeliveryException") ;
- }
- catch (final MessageDeliverException mde) {} // expected
+ si.deliverAsync(message) ;
assertEquals("Call To EPR", deliverEPR, message.getHeader().getCall().getTo()) ;
assertNull("Call ReplyTo EPR", message.getHeader().getCall().getReplyTo()) ;
@@ -279,12 +269,7 @@
message.getHeader().getCall().setReplyTo(pickupEPR) ;
final ServiceInvoker si = new ServiceInvoker("test", "fail") ;
- try
- {
- si.deliverAsync(message) ;
- fail("Expected MessageDeliveryException") ;
- }
- catch (final MessageDeliverException mde) {} // expected
+ si.deliverAsync(message) ;
assertEquals("Call To EPR", deliverEPR, message.getHeader().getCall().getTo()) ;
assertEquals("Call ReplyTo EPR", pickupEPR, message.getHeader().getCall().getReplyTo()) ;
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -27,7 +27,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
@@ -184,8 +183,15 @@
try {
conn = mgr.getConnection();
PreparedStatement ps = conn.prepareStatement(sql);
- ps.setString(1, uid.toString());
- ps.execute();
+ try
+ {
+ ps.setString(1, uid.toString());
+ ps.execute();
+ }
+ finally
+ {
+ ps.close();
+ }
} catch (Exception e) {
throw new MessageStoreException(e);
} finally {
@@ -200,8 +206,15 @@
try {
conn = mgr.getConnection();
PreparedStatement ps = conn.prepareStatement(sql);
- ps.setString(1, "FALSE");
- ps.execute();
+ try
+ {
+ ps.setString(1, "FALSE");
+ ps.execute();
+ }
+ finally
+ {
+ ps.close() ;
+ }
} catch (Exception e) {
throw new MessageStoreException(e);
} finally {
@@ -219,18 +232,22 @@
HashMap<URI, Message> messages = new HashMap<URI, Message>();
String sql = "select uuid from "+tableName+" where delivered='FALSE'";
if (classification!=null) {
- sql += " and classification='" + classification + "'";
+ sql += " and classification=?";
}
Connection conn=null;
try
{
conn = mgr.getConnection();
- Statement stmt = null;
+ PreparedStatement stmt = null;
ResultSet rs = null;
try
{
- stmt = conn.createStatement();
- rs = stmt.executeQuery(sql);
+ stmt = conn.prepareStatement(sql);
+ if (classification != null)
+ {
+ stmt.setString(1, classification) ;
+ }
+ rs = stmt.executeQuery();
while (rs.next()) {
URI uid = new URI(rs.getString(1));
@@ -285,19 +302,23 @@
HashMap<URI, Message> messages = new HashMap<URI, Message>();
String sql = "select uuid, message from "+tableName;
if (classification!=null) {
- sql += " where classification='" + classification + "'";
+ sql += " where classification=?";
}
Connection conn=null;
try
{
conn = mgr.getConnection();
- Statement stmt = null;
+ PreparedStatement stmt = null;
ResultSet rs = null;
try
{
- stmt = conn.createStatement();
- rs = stmt.executeQuery(sql);
+ stmt = conn.prepareStatement(sql);
+ if (classification != null)
+ {
+ stmt.setString(1, classification) ;
+ }
+ rs = stmt.executeQuery();
while (rs.next()) {
URI uid = new URI(rs.getString(1));
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CommandExecutor.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -137,7 +137,7 @@
}
};
- protected static Map<Constants.OpCode,Command> _values = new HashMap<Constants.OpCode,Command>();
+ protected static final Map<Constants.OpCode,Command> _values = new HashMap<Constants.OpCode,Command>();
static
{
_values.put(Constants.OpCode.CallbackCommand ,CALLBACK_EXECUTOR);
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageHelper.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageHelper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/MessageHelper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -19,7 +19,7 @@
public static String argumentException(String str)
{
- return new String("Missing or invalid <"+str+"> object in Message body");
+ return "Missing or invalid <"+str+"> object in Message body";
}
public static Message commandMessageTemplate()
@@ -111,9 +111,9 @@
Object obj = msg.getBody().get(key);
if (null==obj) return dflt;
if (obj instanceof Boolean) return (Boolean)obj;
- if (obj instanceof String) return Boolean.parseBoolean((String)obj);
+ if (obj instanceof String) return Boolean.valueOf((String)obj);
_logger.error(argumentException(key));
- return null;
+ return dflt;
}
public static String getStringValue(Message msg,String key)
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsJobService.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsJobService.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsJobService.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -150,7 +150,7 @@
}
if (timer) {
message.setLongProperty("timerId", job.getId());
- message.setLongProperty(JMS_JBOSS_SCHEDULED_DELIVERY_PROP_NAME, new Long(job.getDueDate().getTime())) ;
+ message.setLongProperty(JMS_JBOSS_SCHEDULED_DELIVERY_PROP_NAME, job.getDueDate().getTime()) ;
} else {
message.setLongProperty("jobId", job.getId());
}
Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -55,7 +55,7 @@
* @author Tom Baeyens
* @author Alejandro Guizar
*/
-public class JmsMessageServiceFactory implements ServiceFactory
+public final class JmsMessageServiceFactory implements ServiceFactory
{
private static final long serialVersionUID = 1L;
Modified: labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBRulesCounter.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBRulesCounter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBRulesCounter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -81,7 +81,7 @@
actionCounterHash = new HashMap<String, Integer>();
actionFailedCounterHash = new HashMap<String, Integer>();
actionProcessTimeHash = new HashMap<String, Long>();
- serviceCount = new Integer(0);
+ serviceCount = Integer.valueOf(0);
m_config = f_config;
}
@@ -90,14 +90,14 @@
* Increment the total message count of this service.
*/
public void incrementTotalCount() {
- serviceCount = new Integer(serviceCount.intValue() + 1);
+ serviceCount = Integer.valueOf(serviceCount.intValue() + 1);
}
/**
* Initialize the hashes by setting the counts and the processing time to an initial value of 0.
*/
public void initHashes() {
- serviceCount = new Integer(0);
+ serviceCount = Integer.valueOf(0);
}
/**
@@ -105,18 +105,18 @@
* and in the action process time hash to zero.
*/
public void resetCounter() {
- serviceCount = new Integer(0);
+ serviceCount = Integer.valueOf(0);
for (String key : actionCounterHash.keySet()) {
- actionCounterHash.put(key, new Integer(0));
+ actionCounterHash.put(key, Integer.valueOf(0));
}
for (String key : actionFailedCounterHash.keySet()) {
- actionFailedCounterHash.put(key, new Integer(0));
+ actionFailedCounterHash.put(key, Integer.valueOf(0));
}
for (String key : actionProcessTimeHash.keySet()) {
- actionProcessTimeHash.put(key, new Long(0));
+ actionProcessTimeHash.put(key, Long.valueOf(0));
}
}
@@ -295,13 +295,13 @@
*/
public void initMessageProfile(String messageProfile) {
if (!actionProcessTimeHash.containsKey(messageProfile + " " + PROCESSING_TIME)) {
- actionProcessTimeHash.put(messageProfile, new Long(0));
+ actionProcessTimeHash.put(messageProfile, Long.valueOf(0));
}
if (!actionCounterHash.containsKey(messageProfile + " " + MESSAGE_COUNTER)) {
- actionCounterHash.put(messageProfile, new Integer(0));
+ actionCounterHash.put(messageProfile, Integer.valueOf(0));
}
if (!actionFailedCounterHash.containsKey(messageProfile + " " + FAILED_MESSAGE_COUNTER)) {
- actionCounterHash.put(messageProfile, new Integer(0));
+ actionCounterHash.put(messageProfile, Integer.valueOf(0));
}
}
Modified: labs/jbossesb/trunk/product/services/slsb/src/main/java/org/jboss/soa/esb/actions/EJBProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/services/slsb/src/main/java/org/jboss/soa/esb/actions/EJBProcessor.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/slsb/src/main/java/org/jboss/soa/esb/actions/EJBProcessor.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -429,7 +429,7 @@
// Helper inner class for method arguments and where to find it in the esb
// message
- class Argument
+ private static class Argument
{
private String type;
Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksMessageCounter.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksMessageCounter.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksMessageCounter.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -83,7 +83,7 @@
actionCounterHash = new HashMap<String, Integer>();
actionFailedCounterHash = new HashMap<String, Integer>();
actionProcessTimeHash = new HashMap<String, Long>();
- serviceCount = new Integer(0);
+ serviceCount = Integer.valueOf(0);
m_config = f_config;
}
@@ -99,7 +99,7 @@
* Initialize the hashes by setting the counts and the processing time to an initial value of 0.
*/
public void initHashes() {
- serviceCount = new Integer(0);
+ serviceCount = Integer.valueOf(0);
}
/**
@@ -107,18 +107,18 @@
* and in the action process time hash to zero.
*/
public void resetCounter() {
- serviceCount = new Integer(0);
+ serviceCount = Integer.valueOf(0);
for (String key : actionCounterHash.keySet()) {
- actionCounterHash.put(key, new Integer(0));
+ actionCounterHash.put(key, Integer.valueOf(0));
}
for (String key : actionFailedCounterHash.keySet()) {
- actionFailedCounterHash.put(key, new Integer(0));
+ actionFailedCounterHash.put(key, Integer.valueOf(0));
}
for (String key : actionProcessTimeHash.keySet()) {
- actionProcessTimeHash.put(key, new Long(0));
+ actionProcessTimeHash.put(key, Long.valueOf(0));
}
}
@@ -298,15 +298,15 @@
public void initMessageProfile(String messageProfile) {
String processTimeKey = messageProfile + " " + PROCESSING_TIME;
if (!actionProcessTimeHash.containsKey(processTimeKey)) {
- actionProcessTimeHash.put(processTimeKey, new Long(0));
+ actionProcessTimeHash.put(processTimeKey, Long.valueOf(0));
}
String messageCounterKey = messageProfile + " " + MESSAGE_COUNTER;
if (!actionCounterHash.containsKey(messageCounterKey)) {
- actionCounterHash.put(messageCounterKey, new Integer(0));
+ actionCounterHash.put(messageCounterKey, Integer.valueOf(0));
}
String failedCounterKey = messageProfile + " " + FAILED_MESSAGE_COUNTER;
if (!actionFailedCounterHash.containsKey(failedCounterKey)) {
- actionCounterHash.put(failedCounterKey, new Integer(0));
+ actionCounterHash.put(failedCounterKey, Integer.valueOf(0));
}
}
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/AbstractWsdlContractPublisher.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -252,7 +252,7 @@
return writer.toString().trim();
}
- private class HttpServletRequestHandler implements InvocationHandler {
+ private static class HttpServletRequestHandler implements InvocationHandler {
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
if(method.getName().equals("getRequestURL")) {
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -309,7 +309,7 @@
return operation;
}
- private class OperationFinder extends DefaultHandler
+ private static class OperationFinder extends DefaultHandler
{
private boolean insideEnvelope = false;
@@ -334,7 +334,7 @@
}
@SuppressWarnings("serial")
- private class OperationFound extends RuntimeException
+ private static class OperationFound extends RuntimeException
{
private QName operation;
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java 2009-11-02 09:54:29 UTC (rev 29885)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java 2009-11-02 10:24:16 UTC (rev 29886)
@@ -18,15 +18,12 @@
import java.io.IOException;
import java.util.Map;
-import javax.xml.transform.Source;
-
import org.jboss.soa.esb.lifecycle.LifecycleResourceException;
import org.jboss.soa.esb.smooks.resource.SmooksResource;
import org.milyn.Smooks;
import org.milyn.container.ExecutionContext;
import org.milyn.container.plugin.PayloadProcessor;
import org.milyn.event.report.HtmlReportGenerator;
-import org.milyn.payload.JavaResult;
import org.milyn.resource.URIResourceLocator;
import org.xml.sax.SAXException;
@@ -94,8 +91,6 @@
public Map<String, Object> applyMapping(Object originalObjects) throws Exception {
ExecutionContext executionContext = smooks.createExecutionContext();
- Source source;
- JavaResult result = new JavaResult();
// Configure the execution context to generate a report...
if (this.getSmooksReport() != null) {
executionContext.setEventListener(new HtmlReportGenerator(this.getSmooksReport()));
More information about the jboss-svn-commits
mailing list