[rhmessaging-commits] rhmessaging commits: r4460 - in store/branches/java/0.5.x-dev: src/tools/java/org/apache/qpid/server/util and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: rgemmell
Date: 2011-05-19 12:11:13 -0400 (Thu, 19 May 2011)
New Revision: 4460

Modified:
   store/branches/java/0.5.x-dev/build.xml
   store/branches/java/0.5.x-dev/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java
Log:
update to account for changes to main broker codebase

Applied patch from Oleksandr Rudyy <orudyy at gmail.com>

Modified: store/branches/java/0.5.x-dev/build.xml
===================================================================
--- store/branches/java/0.5.x-dev/build.xml	2011-05-13 13:49:52 UTC (rev 4459)
+++ store/branches/java/0.5.x-dev/build.xml	2011-05-19 16:11:13 UTC (rev 4460)
@@ -133,8 +133,8 @@
       <sysproperty key="BDB_WORK" value="${qpid.work.dir}/bdbstore"/>
       <sysproperty key="BDB_HOME" value="${project.root}"/>
       <sysproperty key="test.excludes" value="false"/>
+      <sysproperty key="broker.config" value="${project.root}/etc/config.xml" />
 
-
       <formatter type="plain"/>
       <formatter type="xml"/>
 

Modified: store/branches/java/0.5.x-dev/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java
===================================================================
--- store/branches/java/0.5.x-dev/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java	2011-05-13 13:49:52 UTC (rev 4459)
+++ store/branches/java/0.5.x-dev/src/tools/java/org/apache/qpid/server/util/NullApplicationRegistry.java	2011-05-19 16:11:13 UTC (rev 4460)
@@ -68,7 +68,7 @@
 
         _accessManager = new ACLManager(_configuration.getSecurityConfiguration(), _pluginManager, AllowAll.FACTORY);
 
-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
+        _authenticationManager = new PrincipalDatabaseAuthenticationManager();
 
         _managedObjectRegistry = new NoopManagedObjectRegistry();
         _virtualHostRegistry = new VirtualHostRegistry(this);