Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java Thu Nov 1 09:48:52 2012 @@ -38,14 +38,6 @@ public interface NetworkTransportConfigu // The amount of memory in bytes to allocate to the outgoing buffer Integer getSendBufferSize(); - Integer getPort(); - - String getHost(); - - String getTransport(); - - Integer getConnectorProcessors(); - InetSocketAddress getAddress(); boolean needClientAuth();
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Thu Nov 1 09:48:52 2012 @@ -248,14 +248,14 @@ public class IoNetworkTransport implemen } catch(RuntimeException e) { - LOGGER.error("Error in Acceptor thread on port " + _config.getPort(), e); + LOGGER.error("Error in Acceptor thread on address " + _config.getAddress(), e); closeSocketIfNecessary(socket); } catch(IOException e) { if(!_closed) { - LOGGER.error("Error in Acceptor thread on port " + _config.getPort(), e); + LOGGER.error("Error in Acceptor thread on address " + _config.getAddress(), e); closeSocketIfNecessary(socket); try { @@ -275,7 +275,7 @@ public class IoNetworkTransport implemen { if(LOGGER.isDebugEnabled()) { - LOGGER.debug("Acceptor exiting, no new connections will be accepted on port " + _config.getPort()); + LOGGER.debug("Acceptor exiting, no new connections will be accepted on address " + _config.getAddress()); } } } Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml Thu Nov 1 09:48:52 2012 @@ -48,7 +48,9 @@ <property name="module.api" location="${build.api}/${module}/"/> <property name="module.test.api" location="${build.test.api}/${module}"/> <property name="module.test.classes" location="${module.build}/test/classes"/> + <property name="module.test.metainf" location="${module.build}/test/META-INF"/> <property name="module.test.resources" location="${module.build}/test/resources"/> + <property name="module.test.resources.metainf" location="src/test/resources/META-INF"/> <property name="module.results" location="${build.results}/${module}"/> <property name="module.failed" location="${module.results}/FAILED"/> <property name="module.src" location="src/main/java"/> @@ -314,7 +316,12 @@ </copy> </target> - <target name="precompile-tests" if="module.test.src.exists"/> + <target name="precompile-tests" if="module.test.src.exists"> + <mkdir dir="${module.test.resources}"/> + <copy todir="${module.test.resources}" failonerror="false"> + <fileset dir="src/test/resources"/> + </copy> + </target> <target name="compile-tests" depends="compile,precompile-tests" if="module.test.src.exists" description="compilte unit tests"> @@ -515,7 +522,13 @@ <target name="jar" depends="jar.manifest,jar.nomanifest" description="create jar"/> <target name="jar-tests" depends="compile-tests" description="create unit test jar"> - <jar destfile="${module.test.jar}" basedir="${module.test.classes}"/> + <mkdir dir="${module.test.metainf}"/> + <copy todir="${module.test.metainf}" failonerror="false"> + <fileset dir="${module.test.resources.metainf}"/> + </copy> + <jar destfile="${module.test.jar}" basedir="${module.test.classes}"> + <metainf dir="${module.test.metainf}" /> + </jar> </target> <target name="jar-sources" depends="prepare" description="create sources jar"> Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java Thu Nov 1 09:48:52 2012 @@ -68,7 +68,7 @@ public class VirtualHostLoggingTest exte try { - List<String> vhosts = Arrays.asList(getServerConfig().getVirtualHosts()); + List<String> vhosts = Arrays.asList(getServerConfig().getVirtualHostsNames()); assertEquals("Each vhost did not create a store.", vhosts.size(), results.size()); @@ -119,7 +119,7 @@ public class VirtualHostLoggingTest exte // Load VirtualHost list from file. ServerConfiguration configuration = new ServerConfiguration(_configFile); configuration.initialise(); - List<String> vhosts = Arrays.asList(configuration.getVirtualHosts()); + List<String> vhosts = Arrays.asList(configuration.getVirtualHostsNames()); assertEquals("Each vhost did not close their store.", vhosts.size(), results.size()); } Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java Thu Nov 1 09:48:52 2012 @@ -107,6 +107,8 @@ public class BrokerManagementTest extend { String defaultExchangeName = ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString(); + ManagedExchange defaultExchange = _jmxUtils.getManagedExchange(defaultExchangeName); + assertNotNull("Exchange should exist", defaultExchange); try { _managedBroker.unregisterExchange(defaultExchangeName); @@ -117,7 +119,7 @@ public class BrokerManagementTest extend // PASS assertEquals("'<<default>>' is a reserved exchange and can't be deleted", e.getMessage()); } - final ManagedExchange defaultExchange = _jmxUtils.getManagedExchange(defaultExchangeName); + defaultExchange = _jmxUtils.getManagedExchange(defaultExchangeName); assertNotNull("Exchange should exist", defaultExchange); } Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Thu Nov 1 09:48:52 2012 @@ -180,7 +180,7 @@ public class Asserts public static void assertPortAttributes(Map<String, Object> port) { - assertAttributesPresent(port, Port.AVAILABLE_ATTRIBUTES, Port.CREATED, Port.UPDATED); + assertAttributesPresent(port, Port.AVAILABLE_ATTRIBUTES, Port.CREATED, Port.UPDATED, Port.AUTHENTICATION_MANAGER); assertNotNull("Unexpected value of attribute " + Port.ID, port.get(Port.ID)); assertEquals("Unexpected value of attribute " + Port.DURABLE, Boolean.FALSE, port.get(Port.DURABLE)); Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java Thu Nov 1 09:48:52 2012 @@ -90,11 +90,13 @@ public class StructureRestTest extends Q } } + /* @SuppressWarnings("unchecked") List<Map<String, Object>> aliases = (List<Map<String, Object>>) host.get("virtualhostaliases"); - assertNotNull("Host " + hostName + " aliaces are not found ", aliases); - assertEquals("Unexpected aliaces size", 1, aliases.size()); + assertNotNull("Host " + hostName + " aliases are not found ", aliases); + assertEquals("Unexpected aliases size", 1, aliases.size()); assertNode(aliases.get(0), hostName); + */ } int[] expectedPorts = { getPort(), getRestTestHelper().getHttpPort() }; Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java Thu Nov 1 09:48:52 2012 @@ -20,25 +20,22 @@ */ package org.apache.qpid.test.utils; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadInfo; -import java.lang.management.ThreadMXBean; import java.util.Set; import org.apache.log4j.Logger; -import org.apache.qpid.server.Broker; +import org.apache.qpid.server.BrokerLauncher; public class InternalBrokerHolder implements BrokerHolder { private static final Logger LOGGER = Logger.getLogger(InternalBrokerHolder.class); - private final Broker _broker; + private final BrokerLauncher _broker; private final String _workingDirectory; private Set<Integer> _portsUsedByBroker; - public InternalBrokerHolder(final Broker broker, String workingDirectory, Set<Integer> portsUsedByBroker) + public InternalBrokerHolder(final BrokerLauncher broker, String workingDirectory, Set<Integer> portsUsedByBroker) { if(broker == null) { Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1404521&r1=1404520&r2=1404521&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Nov 1 09:48:52 2012 @@ -57,7 +57,7 @@ import org.apache.qpid.client.AMQTopic; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.jms.BrokerDetails; import org.apache.qpid.jms.ConnectionURL; -import org.apache.qpid.server.Broker; +import org.apache.qpid.server.BrokerLauncher; import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.ProtocolExclusion; import org.apache.qpid.server.ProtocolInclusion; @@ -413,7 +413,7 @@ public class QpidBrokerTestCase extends //set on the JVM by the JUnit runner task in module.xml. options.setLogConfigFile(_logConfigFile.getAbsolutePath()); - Broker broker = new Broker(); + BrokerLauncher broker = new BrokerLauncher(); _logger.info("starting internal broker (same JVM)"); broker.startup(options); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
