diff options
Diffstat (limited to 'java/broker-plugins/firewall')
| -rw-r--r-- | java/broker-plugins/firewall/build.xml | 6 | ||||
| -rw-r--r-- | java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java | 17 |
2 files changed, 5 insertions, 18 deletions
diff --git a/java/broker-plugins/firewall/build.xml b/java/broker-plugins/firewall/build.xml index 2be844e1fc..576435de7f 100644 --- a/java/broker-plugins/firewall/build.xml +++ b/java/broker-plugins/firewall/build.xml @@ -17,8 +17,8 @@ - under the License. --> <project name="Qpid Broker-Plugins Firewall" default="build"> - <property name="module.depends" value="common management/common broker broker-plugins" /> - <property name="module.test.depends" value="junit-toolkit broker/test common/test" /> + <property name="module.depends" value="common broker broker-plugins" /> + <property name="module.test.depends" value="test broker/test common/test management/common" /> <property name="module.manifest" value="MANIFEST.MF" /> <property name="module.plugin" value="true" /> @@ -26,4 +26,4 @@ <import file="../../module.xml" /> <target name="bundle" depends="bundle-tasks" /> -</project>
\ No newline at end of file +</project> diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java b/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java index ab340ab849..89dba035e4 100644 --- a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java +++ b/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java @@ -27,7 +27,7 @@ import java.net.InetSocketAddress; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; -import org.apache.qpid.server.registry.ApplicationRegistry; +import org.apache.qpid.server.configuration.ServerConfiguration; import org.apache.qpid.server.security.Result; import org.apache.qpid.server.security.access.plugins.Firewall; import org.apache.qpid.server.security.access.plugins.FirewallConfiguration; @@ -73,18 +73,7 @@ public class FirewallPluginTest extends InternalBrokerBaseCase } // IP address - private String _address; - - @Override - public void setUp() throws Exception - { - super.setUp(); - - _address = "127.0.0.1"; - - // Create new ApplicationRegistry - ApplicationRegistry.getInstance(); - } + private String _address= "127.0.0.1"; private Firewall initialisePlugin(String defaultAction, RuleInfo[] rules) throws IOException, ConfigurationException @@ -93,7 +82,6 @@ public class FirewallPluginTest extends InternalBrokerBaseCase File confFile = File.createTempFile(getClass().getSimpleName()+"conffile", null); confFile.deleteOnExit(); BufferedWriter buf = new BufferedWriter(new FileWriter(confFile)); - buf.write("<security>\n"); buf.write("<firewall default-action=\""+defaultAction+"\">\n"); if (rules != null) { @@ -113,7 +101,6 @@ public class FirewallPluginTest extends InternalBrokerBaseCase } } buf.write("</firewall>"); - buf.write("</security>\n"); buf.close(); // Configure plugin |