Author: clebert.suconic(a)jboss.com Date: 2010-06-15 16:06:30 -0400 (Tue, 15 Jun 2010) New Revision: 9333 Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java Log: fixing compilation errors Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-06-15 20:00:45 UTC (rev 9332) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-06-15 20:06:30 UTC (rev 9333) @@ -1196,37 +1196,8 @@ raProperties.setUseLocalTx(localTx); } - /** - * Get the use XA flag - * - * @return The value - */ - public Boolean getUseXA() - { - if (HornetQResourceAdapter.trace) - { - HornetQResourceAdapter.log.trace("getUseXA()"); - } - return raProperties.getUseXA(); - } - /** - * Set the use XA flag - * - * @param xa The value - */ - public void setUseXA(final Boolean xa) - { - if (HornetQResourceAdapter.trace) - { - HornetQResourceAdapter.log.trace("setUseXA(" + xa + ")"); - } - - raProperties.setUseXA(xa); - } - - /** * Indicates whether some other object is "equal to" this one. * * @param obj Object with which to compare @@ -1368,10 +1339,13 @@ */ protected void setup() throws HornetQException { + + defaultHornetQConnectionFactory = createHornetQConnectionFactory(raProperties); sessionFactory = defaultHornetQConnectionFactory.getCoreFactory(); } + public HornetQConnectionFactory getDefaultHornetQConnectionFactory() throws ResourceException { if (!configured.getAndSet(true)) @@ -1410,13 +1384,13 @@ : new TransportConfiguration(backUpCOnnectorClassname, backupConnectionParams); - cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(transportConf, backup); + cf = HornetQJMSClient.createConnectionFactory(transportConf, backup); } else if (discoveryAddress != null) { Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort() : getDiscoveryPort(); - cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); + cf = HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); } else { @@ -1425,6 +1399,7 @@ setParams(cf, overrideProperties); return cf; } + public Map<String, Object> overrideConnectionParameters(final Map<String, Object> connectionParams, final Map<String, Object> overrideConnectionParams) {