You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/07/29 16:25:10 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac2 Machine.java
andreas 2003/07/29 07:25:10
Modified: src/java/org/apache/lenya/cms/ac Machine.java
Removed: src/java/org/apache/lenya/cms/ac2 Machine.java
Log:
removed ac2.Machine
added IPRange handling to ac.Machine
Revision Changes Path
1.5 +21 -3 cocoon-lenya/src/java/org/apache/lenya/cms/ac/Machine.java
Index: Machine.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/Machine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Machine.java 23 Jul 2003 19:18:17 -0000 1.4
+++ Machine.java 29 Jul 2003 14:25:10 -0000 1.5
@@ -56,7 +56,8 @@
package org.apache.lenya.cms.ac;
import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.lenya.cms.ac2.Accreditable;
import org.apache.lenya.cms.ac2.Identifiable;
@@ -104,7 +105,12 @@
* @see org.apache.lenya.cms.ac2.Accreditable#getAccreditables()
*/
public Accreditable[] getAccreditables() {
- Accreditable[] accreditables = { this };
+ Accreditable[] ranges = getIPRanges();
+ Accreditable[] accreditables = new Accreditable[ranges.length + 1];
+ accreditables[0] = this;
+ for (int i = 0; i < ranges.length; i++) {
+ accreditables[i+1] = ranges[i];
+ }
return accreditables;
}
@@ -169,4 +175,16 @@
this.address = address;
}
+ private List ipRanges = new ArrayList();
+
+ public void addIPRange(IPRange range) {
+ assert range != null;
+ assert !ipRanges.contains(range);
+ ipRanges.add(range);
+ }
+
+ public IPRange[] getIPRanges() {
+ return (IPRange[]) ipRanges.toArray(new IPRange[ipRanges.size()]);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org