qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r764418 - in /qpid/branches/0.5-fix/qpid: ./ java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/ java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/ java/broker/src/test/java/org/apache/qp...
Date Mon, 13 Apr 2009 11:45:25 GMT
Author: ritchiem
Date: Mon Apr 13 11:45:24 2009
New Revision: 764418

URL: http://svn.apache.org/viewvc?rev=764418&view=rev
Log:
Merge branch 'QPID-1583'
merged from trunk r743304

Added:
    qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java
      - copied unchanged from r743304, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractACLPlugin.java
    qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/
      - copied from r743304, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/
    qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java
      - copied unchanged from r743304, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java
    qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
      - copied unchanged from r743304, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallPlugin.java
    qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/
      - copied from r743304, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/
    qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/
      - copied from r743304, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/
    qpid/branches/0.5-fix/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java
      - copied unchanged from r743304, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/FirewallPluginTest.java
Modified:
    qpid/branches/0.5-fix/qpid/   (props changed)
    qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 11:45:24 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028-743029
+/qpid/trunk/qpid:742626,743015,743028-743029,743304

Modified: qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java?rev=764418&r1=764417&r2=764418&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
(original)
+++ qpid/branches/0.5-fix/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
Mon Apr 13 11:45:24 2009
@@ -18,9 +18,8 @@
 package org.apache.qpid.util;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 
 public class NetMatcher



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message