From 15ce2fee8ec8b1b463917e4fd4de23779696be03 Mon Sep 17 00:00:00 2001
From: Ronald Roskens <ronald.roskens@gmail.com>
Date: Sun, 12 Aug 2012 21:13:36 -0500
Subject: [PATCH] NMS-3872: Add a unique id attribute for outages, and use
 that instead of the outage name for identification.

---
 .../src/test/resources/poller-configuration.xml    |    2 +-
 .../etc/examples/collectd-configuration.xml        |    4 +-
 .../main/filtered/etc/examples/poll-outages.xml    |    6 +-
 .../filtered/etc/examples/poller-configuration.xml |    4 +-
 .../etc/examples/threshd-configuration.xml         |    2 +-
 .../src/main/castor/collectd-configuration.xsd     |   15 +-
 .../src/main/castor/notifd-configuration.xsd       |   10 +-
 .../src/main/castor/poller-configuration.xsd       |   12 +-
 .../src/main/castor/threshd-configuration.xsd      |   12 +-
 .../netmgt/config/poller/BasicSchedule.java        |   29 +++-
 .../descriptors/BasicScheduleDescriptor.java       |   44 +++++
 .../src/main/resources/xsds/poll-outages.xsd       |    6 +
 .../opennms/netmgt/config/poller/OutageTest.java   |    3 +-
 .../opennms/netmgt/config/poller/OutagesTest.java  |    3 +-
 .../opennms/netmgt/config/NotifdConfigManager.java |    6 +-
 .../opennms/netmgt/config/PollOutagesConfig.java   |   25 ++--
 .../netmgt/config/PollOutagesConfigManager.java    |   78 ++++++---
 .../config/PollOutagesConfigManagerTest.java       |   30 ++--
 .../opennms/netmgt/config/collectd-testdata.xml    |    4 +-
 .../config/poller-configuration.testdata.xml       |    4 +-
 .../opennms-home/etc/collectd-configuration.xml    |    2 +-
 .../test/opennms-home/etc/poller-configuration.xml |    2 +-
 .../opennms-home/etc/collectd-configuration.xml    |    2 +-
 .../test/opennms-home/etc/poller-configuration.xml |    2 +-
 .../resources/collectdconfiguration-testdata.xml   |    2 +-
 .../opennms-home/etc/collectd-configuration.xml    |    2 +-
 .../test/opennms-home/etc/poller-configuration.xml |    2 +-
 .../netmgt/collectd/CollectionSpecification.java   |   10 +-
 .../netmgt/notifd/BroadcastEventProcessor.java     |   20 +-
 .../poller/pollables/PollableServiceConfig.java    |   12 +-
 .../netmgt/threshd/ThresholdableService.java       |    8 +-
 .../opennms/netmgt/threshd/ThresholdingSet.java    |   24 ++--
 .../org/opennms/netmgt/mock/MockNetworkTest.java   |   33 ++--
 .../org/opennms/netmgt/mock/MockPollerConfig.java  |   40 +++--
 .../test/resources/etc/threshd-configuration.xml   |    4 +-
 .../opennms/netmgt/capsd/poller-configuration.xml  |    2 +-
 .../opennms/netmgt/config/collectd-testdata.xml    |    4 +-
 .../netmgt/poller/remote/poller-configuration.xml  |    4 +-
 .../netmgt/threshd/threshd-configuration.xml       |    2 +-
 .../resources/threshd-configuration-bug3390.xml    |    2 +-
 .../resources/threshd-configuration-bug3554.xml    |   18 +-
 .../resources/threshd-configuration-bug3575.xml    |    2 +-
 .../resources/threshd-configuration-bug3748.xml    |    2 +-
 .../resources/threshd-configuration-outages.xml    |    2 +-
 .../src/test/resources/threshd-configuration.xml   |    2 +-
 .../src/main/groovy/fastProvisioner.groovy         |    4 +-
 .../web/rest/ScheduledOutagesRestService.java      |  188 ++++++++++----------
 .../main/webapp/admin/sched-outages/editoutage.jsp |   95 ++++++----
 .../src/main/webapp/admin/sched-outages/index.jsp  |   81 +++++----
 .../opennms-home/etc/collectd-configuration.xml    |    4 +-
 .../test/opennms-home/etc/poller-configuration.xml |    2 +-
 51 files changed, 525 insertions(+), 353 deletions(-)

diff --git a/features/remote-poller-gwt/src/test/resources/poller-configuration.xml b/features/remote-poller-gwt/src/test/resources/poller-configuration.xml
index 35d0645..a97bb00 100644
--- a/features/remote-poller-gwt/src/test/resources/poller-configuration.xml
+++ b/features/remote-poller-gwt/src/test/resources/poller-configuration.xml
@@ -19,7 +19,7 @@
 			<parameter key="rrd-repository" value="target/test-data"/>
 			<parameter key="ds-name" value="http"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
diff --git a/opennms-base-assembly/src/main/filtered/etc/examples/collectd-configuration.xml b/opennms-base-assembly/src/main/filtered/etc/examples/collectd-configuration.xml
index 824021c..ad6f77c 100644
--- a/opennms-base-assembly/src/main/filtered/etc/examples/collectd-configuration.xml
+++ b/opennms-base-assembly/src/main/filtered/etc/examples/collectd-configuration.xml
@@ -86,7 +86,7 @@
 			<parameter key="thresholding-enabled" value="true"/>
 		</service>
 		
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 	<!-- 
@@ -113,7 +113,7 @@
 			<parameter key="thresholding-enabled" value="true"/>
 		</service>
 
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	-->
 
diff --git a/opennms-base-assembly/src/main/filtered/etc/examples/poll-outages.xml b/opennms-base-assembly/src/main/filtered/etc/examples/poll-outages.xml
index 8702b37..2d2d729 100644
--- a/opennms-base-assembly/src/main/filtered/etc/examples/poll-outages.xml
+++ b/opennms-base-assembly/src/main/filtered/etc/examples/poll-outages.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <outages>
-	<outage name="global" type="weekly">
+	<outage outage-id="1" name="global" type="weekly">
 		<time day="sunday" begins="12:30:00" ends="12:45:00"/>
 		<time day="sunday" begins="13:30:00" ends="14:45:00"/>
 		<time day="monday" begins="13:30:00" ends="14:45:00"/>
@@ -10,7 +10,7 @@
 		<interface address="192.168.0.38"/>
 	</outage>
 
-	<outage name="hub maintaince" type="monthly">
+	<outage outage-id="2" name="hub maintaince" type="monthly">
 		<time day="1" begins="23:30:00" ends="23:45:00"/>
 		<time day="15" begins="21:30:00" ends="21:45:00"/>
 		<time day="15" begins="23:30:00" ends="23:45:00"/>
@@ -24,7 +24,7 @@
 		<interface address="192.168.107.254"/>
 	</outage>
 
-	<outage name="proxy server tuning" type="specific">
+	<outage outage-id="3" name="proxy server tuning" type="specific">
 		<time begins="10-Nov-2001 17:30:00" ends="11-Nov-2001 08:00:00"/>
 		<interface address="192.168.0.1"/>
 	</outage>
diff --git a/opennms-base-assembly/src/main/filtered/etc/examples/poller-configuration.xml b/opennms-base-assembly/src/main/filtered/etc/examples/poller-configuration.xml
index 930de51..270e7fa 100644
--- a/opennms-base-assembly/src/main/filtered/etc/examples/poller-configuration.xml
+++ b/opennms-base-assembly/src/main/filtered/etc/examples/poller-configuration.xml
@@ -382,7 +382,7 @@
       <parameter key="is-supported" value="true" />
     </service>
     -->
-    <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+    <outage-id>1</outage-id>
 
     <downtime interval="30000" begin="0" end="300000" /><!-- 30s, 0, 5m -->
     <downtime interval="300000" begin="300000" end="43200000" /><!-- 5m, 5m, 12h -->
@@ -454,7 +454,7 @@
       <parameter key="ds-name" value="http" />
     </service>
 
-    <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+    <outage-id>1</outage-id>
 
     <downtime interval="30000" begin="0" end="300000" /><!-- 30s, 0, 5m -->
     <downtime interval="300000" begin="300000" end="43200000" /><!-- 5m, 5m, 12h -->
diff --git a/opennms-base-assembly/src/main/filtered/etc/examples/threshd-configuration.xml b/opennms-base-assembly/src/main/filtered/etc/examples/threshd-configuration.xml
index 05f3169..5150819 100644
--- a/opennms-base-assembly/src/main/filtered/etc/examples/threshd-configuration.xml
+++ b/opennms-base-assembly/src/main/filtered/etc/examples/threshd-configuration.xml
@@ -45,7 +45,7 @@
                         <parameter key="thresholding-group" value="dhcp-latency"/>
                 </service>
 
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 	<thresholder service="SNMP" 	class-name="org.opennms.netmgt.threshd.SnmpThresholder"/>
diff --git a/opennms-config-model/src/main/castor/collectd-configuration.xsd b/opennms-config-model/src/main/castor/collectd-configuration.xsd
index e84cdaa..321fdd9 100644
--- a/opennms-config-model/src/main/castor/collectd-configuration.xsd
+++ b/opennms-config-model/src/main/castor/collectd-configuration.xsd
@@ -177,13 +177,7 @@
           </annotation>
         </element>
 
-        <element maxOccurs="unbounded" minOccurs="0" name="outage-calendar"
-                 type="string">
-          <annotation>
-            <documentation>Scheduled outages - data collection is not
-            performed during scheduled outages</documentation>
-          </annotation>
-        </element>
+        <element maxOccurs="unbounded" minOccurs="0" ref="this:outage-id" />
       </sequence>
 
       <attribute name="name" type="string" use="required">
@@ -321,4 +315,11 @@
       <attribute name="value" type="string" use="required"/>
     </complexType>
   </element>
+
+  <element name="outage-id" type="long">
+    <annotation>
+      <documentation>Scheduled outage id</documentation>
+    </annotation>
+  </element>
+
 </schema>
diff --git a/opennms-config-model/src/main/castor/notifd-configuration.xsd b/opennms-config-model/src/main/castor/notifd-configuration.xsd
index 4e6acdf..9e50ad6 100644
--- a/opennms-config-model/src/main/castor/notifd-configuration.xsd
+++ b/opennms-config-model/src/main/castor/notifd-configuration.xsd
@@ -25,8 +25,7 @@
 
         <element maxOccurs="unbounded" minOccurs="1" ref="this:queue"/>
 
-        <element maxOccurs="unbounded" minOccurs="0" name="outage-calendar"
-                 type="string"/>
+        <element maxOccurs="unbounded" minOccurs="0" ref="this:outage-id"/>
       </sequence>
 
       <attribute name="status" type="string" use="required"/>
@@ -103,4 +102,11 @@
       </sequence>
     </complexType>
   </element>
+
+  <element name="outage-id" type="long">
+    <annotation>
+      <documentation>Scheduled outage id</documentation>
+    </annotation>
+  </element>
+
 </schema>
diff --git a/opennms-config-model/src/main/castor/poller-configuration.xsd b/opennms-config-model/src/main/castor/poller-configuration.xsd
index a470b45..c4abae1 100644
--- a/opennms-config-model/src/main/castor/poller-configuration.xsd
+++ b/opennms-config-model/src/main/castor/poller-configuration.xsd
@@ -253,10 +253,9 @@
           </annotation>
         </element>
 
-        <element maxOccurs="unbounded" minOccurs="0" name="outage-calendar"
-                 type="string">
+        <element maxOccurs="unbounded" minOccurs="0" ref="this:outage-id">
           <annotation>
-            <documentation>Scheduled outages. If a service is found down
+            <documentation>Scheduled outage id. If a service is found down
             during this period, it is not reported as down.</documentation>
           </annotation>
         </element>
@@ -490,4 +489,11 @@
       </attribute>
     </complexType>
   </element>
+
+  <element name="outage-id" type="long">
+    <annotation>
+      <documentation>Scheduled outage id</documentation>
+    </annotation>
+  </element>
+
 </schema>
diff --git a/opennms-config-model/src/main/castor/threshd-configuration.xsd b/opennms-config-model/src/main/castor/threshd-configuration.xsd
index 368be6c..0076ef3 100644
--- a/opennms-config-model/src/main/castor/threshd-configuration.xsd
+++ b/opennms-config-model/src/main/castor/threshd-configuration.xsd
@@ -127,10 +127,9 @@
           </annotation>
         </element>
 
-        <element maxOccurs="unbounded" minOccurs="0" name="outage-calendar"
-                 type="string">
+        <element maxOccurs="unbounded" minOccurs="0" ref="this:outage-id">
           <annotation>
-            <documentation>Scheduled outages. Thresholding is not performed
+            <documentation>Scheduled outage id. Thresholding is not performed
             during scheduled outages.</documentation>
           </annotation>
         </element>
@@ -272,4 +271,11 @@
       <attribute name="value" type="string" use="required"/>
     </complexType>
   </element>
+
+  <element name="outage-id" type="long">
+    <annotation>
+      <documentation>Scheduled outage id</documentation>
+    </annotation>
+  </element>
+
 </schema>
diff --git a/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/BasicSchedule.java b/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/BasicSchedule.java
index ccab3ca..7f5ccb9 100644
--- a/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/BasicSchedule.java
+++ b/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/BasicSchedule.java
@@ -61,7 +61,13 @@ import org.xml.sax.ContentHandler;
 @XmlAccessorType(XmlAccessType.FIELD)
 @ValidateUsing("poll-outages.xsd")
 public class BasicSchedule implements java.io.Serializable {
-    private static final long serialVersionUID = 8140458365613931426L;
+    private static final long serialVersionUID = 8140458365613931427L;
+
+    /**
+     * outage id
+     */
+    @XmlAttribute(name="id")
+    private long _id;
 
     /**
      * outage name
@@ -85,6 +91,7 @@ public class BasicSchedule implements java.io.Serializable {
     public BasicSchedule() {
         super();
         this._timeList = new ArrayList<Time>();
+        this._id = 0;
     }
 
     /**
@@ -234,6 +241,16 @@ public class BasicSchedule implements java.io.Serializable {
     }
 
     /**
+     * Returns the value of field 'id'. The field 'id' has the
+     * following description: outage id
+     *
+     * @return the value of field 'Id'.
+     */
+    public long getId() {
+        return this._id;
+    }
+
+    /**
      * Overrides the java.lang.Object.hashCode method.
      * <p>
      * The following steps came from <b>Effective Java Programming
@@ -413,6 +430,16 @@ public class BasicSchedule implements java.io.Serializable {
     }
 
     /**
+     * Sets the value of field 'id'. The field 'id' has the
+     * following description: outage id
+     *
+     * @param name the value of field 'id'.
+     */
+    public void setId(final long id) {
+        this._id = id;
+    }
+
+    /**
      * Method unmarshal.
      * 
      * @param reader
diff --git a/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/descriptors/BasicScheduleDescriptor.java b/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/descriptors/BasicScheduleDescriptor.java
index 6513509..b67fdc9 100644
--- a/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/descriptors/BasicScheduleDescriptor.java
+++ b/opennms-config-model/src/main/java/org/opennms/netmgt/config/poller/descriptors/BasicScheduleDescriptor.java
@@ -68,6 +68,50 @@ import org.opennms.netmgt.config.poller.BasicSchedule;
         org.exolab.castor.xml.FieldValidator               fieldValidator = null;
         //-- initialize attribute descriptors
         
+        //-- _id
+        desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.Long.class, "_id", "id", org.exolab.castor.xml.NodeType.Attribute);
+        desc.setImmutable(true);
+        handler = new org.exolab.castor.xml.XMLFieldHandler() {
+            @Override
+            public java.lang.Object getValue( java.lang.Object object )
+                throws IllegalStateException
+            {
+                BasicSchedule target = (BasicSchedule) object;
+                return target.getId();
+            }
+            @Override
+            public void setValue( java.lang.Object object, java.lang.Object value)
+                throws IllegalStateException, IllegalArgumentException
+            {
+                try {
+                    BasicSchedule target = (BasicSchedule) object;
+                    target.setId( (java.lang.Long) value);
+                } catch (java.lang.Exception ex) {
+                    throw new IllegalStateException(ex.toString());
+                }
+            }
+            @Override
+            @SuppressWarnings("unused")
+            public java.lang.Object newInstance(java.lang.Object parent) {
+                return null;
+            }
+        };
+        desc.setSchemaType("long");
+        desc.setHandler(handler);
+        desc.setRequired(true);
+        desc.setMultivalued(false);
+        addFieldDescriptor(desc);
+
+        //-- validation code for: _id
+        fieldValidator = new org.exolab.castor.xml.FieldValidator();
+        fieldValidator.setMinOccurs(1);
+        { //-- local scope
+            org.exolab.castor.xml.validators.LongValidator typeValidator;
+            typeValidator = new org.exolab.castor.xml.validators.LongValidator();
+            fieldValidator.setValidator(typeValidator);
+        }
+        desc.setValidator(fieldValidator);
+
         //-- _name
         desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(java.lang.String.class, "_name", "name", org.exolab.castor.xml.NodeType.Attribute);
         desc.setImmutable(true);
diff --git a/opennms-config-model/src/main/resources/xsds/poll-outages.xsd b/opennms-config-model/src/main/resources/xsds/poll-outages.xsd
index 640dd54..901ec99 100644
--- a/opennms-config-model/src/main/resources/xsds/poll-outages.xsd
+++ b/opennms-config-model/src/main/resources/xsds/poll-outages.xsd
@@ -97,6 +97,12 @@
       </element>
     </sequence>
 
+    <attribute name="id" type="long" use="required">
+      <annotation>
+        <documentation>outage name</documentation>
+      </annotation>
+    </attribute>
+
     <attribute name="name" type="string" use="required">
       <annotation>
         <documentation>outage name</documentation>
diff --git a/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutageTest.java b/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutageTest.java
index c5ceeb3..52cafc7 100644
--- a/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutageTest.java
+++ b/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutageTest.java
@@ -44,6 +44,7 @@ public class OutageTest extends XmlTest<Outage> {
     @Parameters
     public static Collection<Object[]> data() throws ParseException {
         final Outage outage = new Outage();
+        outage.setId(1);
         outage.setName("junit test");
         outage.setType("weekly");
         final Interface intf = new Interface();
@@ -58,7 +59,7 @@ public class OutageTest extends XmlTest<Outage> {
         return Arrays.asList(new Object[][] {
             {
                 outage,
-                "<outage name='junit test' type='weekly'>\n" +
+                "<outage id='1' name='junit test' type='weekly'>\n" +
                 "    <time day='monday' begins='13:30:00' ends='14:45:00'/>\n" +
                 "    <interface address='match-any'/>\n" +
                 "</outage>\n",
diff --git a/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutagesTest.java b/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutagesTest.java
index 0c6da82..235051c 100644
--- a/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutagesTest.java
+++ b/opennms-config-model/src/test/java/org/opennms/netmgt/config/poller/OutagesTest.java
@@ -44,6 +44,7 @@ public class OutagesTest extends XmlTest<Outages> {
     @Parameters
     public static Collection<Object[]> data() throws ParseException {
         final Outage outage = new Outage();
+        outage.setId(1);
         outage.setName("junit test");
         outage.setType("weekly");
         final Interface intf = new Interface();
@@ -60,7 +61,7 @@ public class OutagesTest extends XmlTest<Outages> {
             {
                 outages,
                 "<outages>\n" +
-                "  <outage name='junit test' type='weekly'>\n" +
+                "  <outage id='1' name='junit test' type='weekly'>\n" +
                 "    <time day='monday' begins='13:30:00' ends='14:45:00'/>\n" +
                 "    <interface address='match-any'/>\n" +
                 "  </outage>\n" +
diff --git a/opennms-config/src/main/java/org/opennms/netmgt/config/NotifdConfigManager.java b/opennms-config/src/main/java/org/opennms/netmgt/config/NotifdConfigManager.java
index b199a71..7f8e7ae 100644
--- a/opennms-config/src/main/java/org/opennms/netmgt/config/NotifdConfigManager.java
+++ b/opennms-config/src/main/java/org/opennms/netmgt/config/NotifdConfigManager.java
@@ -264,14 +264,14 @@ public abstract class NotifdConfigManager {
     }
 
     /**
-     * <p>getOutageCalendarNames</p>
+     * <p>getOutageIds</p>
      *
      * @return a {@link java.util.Collection} object.
      * @throws org.exolab.castor.xml.MarshalException if any.
      * @throws org.exolab.castor.xml.ValidationException if any.
      * @throws java.io.IOException if any.
      */
-    public Collection<String> getOutageCalendarNames() throws MarshalException, ValidationException, IOException {
-        return getConfiguration().getOutageCalendarCollection();
+    public Collection<Long> getOutageIds() throws MarshalException, ValidationException, IOException {
+        return getConfiguration().getOutageIdCollection();
     }
 }
diff --git a/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfig.java b/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfig.java
index 1c69971..d9c336e 100644
--- a/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfig.java
+++ b/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfig.java
@@ -28,7 +28,6 @@
 
 package org.opennms.netmgt.config;
 
-
 /**
  * <p>PollOutagesConfig interface.</p>
  *
@@ -45,42 +44,42 @@ public interface PollOutagesConfig {
      *
      * @param lnodeid
      *            the nodeid to be checked
-     * @param outName
-     *            the outage name
+     * @param outageId
+     *            the outage id
      * @return the node is part of the specified outage
      */
-    public abstract boolean isNodeIdInOutage(long lnodeid, String outName);
+    public abstract boolean isNodeIdInOutage(long lnodeid, long outageId);
 
     /**
      * Return if interfaces is part of specified outage.
      *
      * @param linterface
      *            the interface to be looked up
-     * @param outName
-     *            the outage name
+     * @param outageId
+     *            the outage id
      * @return the interface is part of the specified outage
      */
-    public abstract boolean isInterfaceInOutage(String linterface, String outName);
+    public abstract boolean isInterfaceInOutage(String linterface, long outageId);
 
     /**
      * Return if current time is part of specified outage.
      *
-     * @param outName
-     *            the outage name
+     * @param outageId
+     *            the outage id
      * @return true if current time is in outage
      */
-    public abstract boolean isCurTimeInOutage(String outName);
+    public abstract boolean isCurTimeInOutage(long outageId);
     
     /**
      * Return if time is part of specified outage.
      *
      * @param time
      *            the time in millis to look up
-     * @param outName
-     *            the outage name
+     * @param outageId
+     *            the outage id
      * @return true if time is in outage
      */
-    public abstract boolean isTimeInOutage(long time, String outName);
+    public abstract boolean isTimeInOutage(long time, long outageId);
 
     /**
      * <p>update</p>
diff --git a/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfigManager.java b/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfigManager.java
index 263beb7..0ffeeaf 100644
--- a/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfigManager.java
+++ b/opennms-config/src/main/java/org/opennms/netmgt/config/PollOutagesConfigManager.java
@@ -53,6 +53,11 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
     private final Lock m_readLock = m_globalLock.readLock();
     private final Lock m_writeLock = m_globalLock.writeLock();
     
+    /**
+     * The next poll-outage id
+     */
+    private long m_outageIdNext = 0;
+
     public PollOutagesConfigManager() {
         super(Outages.class, "poll outage configuration");
     }
@@ -118,17 +123,35 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
     }
 
     /**
+     * Return next outage id.
+     *
+     * @return next outage id
+     */
+    public long getNextPollOutageId() {
+        if (m_outageIdNext == 0) {
+            for(Outage out : getConfig().getOutageCollection()) {
+                if (out.getId() > m_outageIdNext) {
+                    m_outageIdNext = out.getId();
+                }
+            }
+        }
+        m_outageIdNext = m_outageIdNext + 1;
+
+        return m_outageIdNext;
+    }
+
+    /**
      * Return the specified outage.
      *
-     * @param name
+     * @param outageId
      *            the outage that is to be looked up
      * @return the specified outage, null if not found
      */
-    public Outage getOutage(final String name) {
+    public Outage getOutage(final long outageId) {
         getReadLock().lock();
         try {
             for (final Outage out : getConfig().getOutageCollection()) {
-                if (BasicScheduleUtils.getBasicOutageSchedule(out).getName().equals(name)) {
+                if (out.getId() == outageId) {
                     return out;
                 }
             }
@@ -141,12 +164,12 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
     /**
      * Return the type for specified outage.
      *
-     * @param name
+     * @param id
      *            the outage that is to be looked up
      * @return the type for the specified outage, null if not found
      */
-    public String getOutageType(final String name) {
-        final Outage out = getOutage(name);
+    public String getOutageType(final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return null;
         return out.getType();
     }
@@ -158,8 +181,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *            the outage that is to be looked up
      * @return the outage times for the specified outage, null if not found
      */
-    public Time[] getOutageTimes(final String name) {
-        final Outage out = getOutage(name);
+    public Time[] getOutageTimes(final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return null;
         return out.getTime();
     }
@@ -171,8 +194,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *            the outage that is to be looked up
      * @return the interfaces for the specified outage, null if not found
      */
-    public Interface[] getInterfaces(final String name) {
-        final Outage out = getOutage(name);
+    public Interface[] getInterfaces(final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return null;
         return out.getInterface();
     }
@@ -182,8 +205,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *
      * Return if interfaces is part of specified outage.
      */
-    public boolean isInterfaceInOutage(final String linterface, final String outName) {
-        final Outage out = getOutage(outName);
+    public boolean isInterfaceInOutage(final String linterface, final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return false;
         return isInterfaceInOutage(linterface, out);
     }
@@ -214,8 +237,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *
      * Return if time is part of specified outage.
      */
-    public boolean isTimeInOutage(final Calendar cal, final String outName) {
-        final Outage out = getOutage(outName);
+    public boolean isTimeInOutage(final Calendar cal, final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return false;
 
         return isTimeInOutage(cal, out);
@@ -226,8 +249,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *
      * Return if time is part of specified outage.
      */
-    public boolean isTimeInOutage(final long time, final String outName) {
-        final Outage out = getOutage(outName);
+    public boolean isTimeInOutage(final long time, final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return false;
 
         final Calendar cal = Calendar.getInstance();
@@ -254,8 +277,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *
      * Return if current time is part of specified outage.
      */
-    public boolean isCurTimeInOutage(final String outName) {
-        return isTimeInOutage(new GregorianCalendar(), outName);
+    public boolean isCurTimeInOutage(final long outageId) {
+        return isTimeInOutage(new GregorianCalendar(), outageId);
     }
 
     /**
@@ -275,6 +298,9 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      * @param getOutageSchedule(newOutage) a {@link org.opennms.netmgt.config.poller.Outage} object.
      */
     public void addOutage(final Outage newOutage) {
+        if (newOutage.getId() == 0) {
+            newOutage.setId(getNextPollOutageId());
+        }
         getConfig().addOutage(newOutage);
     }
 
@@ -283,8 +309,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      *
      * @param outageName a {@link java.lang.String} object.
      */
-    public void removeOutage(final String outageName) {
-        getConfig().removeOutage(getOutage(outageName));
+    public void removeOutage(final long outageId) {
+        getConfig().removeOutage(getOutage(outageId));
     }
 
     /**
@@ -325,8 +351,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      * @param name a {@link java.lang.String} object.
      * @return an array of {@link org.opennms.netmgt.config.poller.Node} objects.
      */
-    public Node[] getNodeIds(final String name) {
-        final Outage out = getOutage(name);
+    public Node[] getNodeIds(final long outageId) {
+        final Outage out = getOutage(outageId);
         if (BasicScheduleUtils.getBasicOutageSchedule(out) == null) return null;
         return out.getNode();
     }
@@ -338,8 +364,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      * Return if nodeid is part of specified outage
      * </p>
      */
-    public boolean isNodeIdInOutage(final long lnodeid, final String outName) {
-        final Outage out = getOutage(outName);
+    public boolean isNodeIdInOutage(final long lnodeid, final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return false;
         return isNodeIdInOutage(lnodeid, out);
     }
@@ -350,8 +376,8 @@ abstract public class PollOutagesConfigManager extends AbstractJaxbConfigDao<Out
      * @param outName a {@link java.lang.String} object.
      * @return a {@link java.util.Calendar} object.
      */
-    public Calendar getEndOfOutage(final String outName) {
-        final Outage out = getOutage(outName);
+    public Calendar getEndOfOutage(final long outageId) {
+        final Outage out = getOutage(outageId);
         if (out == null) return null;
         return getEndOfOutage(out);
     }
diff --git a/opennms-config/src/test/java/org/opennms/netmgt/config/PollOutagesConfigManagerTest.java b/opennms-config/src/test/java/org/opennms/netmgt/config/PollOutagesConfigManagerTest.java
index 65acaa5..764b9d4 100644
--- a/opennms-config/src/test/java/org/opennms/netmgt/config/PollOutagesConfigManagerTest.java
+++ b/opennms-config/src/test/java/org/opennms/netmgt/config/PollOutagesConfigManagerTest.java
@@ -53,7 +53,7 @@ public class PollOutagesConfigManagerTest extends TestCase {
         
         String xml = "<?xml version=\"1.0\"?>\n" + 
                 "<outages>\n" + 
-                "   <outage name=\"one\" type=\"weekly\">\n" + 
+                "   <outage id=\"1\" name=\"one\" type=\"weekly\">\n" +
                 "       <time day=\"sunday\" begins=\"12:30:00\" ends=\"12:45:00\"/>\n" + 
                 "       <time day=\"sunday\" begins=\"13:30:00\" ends=\"14:45:00\"/>\n" + 
                 "       <time day=\"monday\" begins=\"13:30:00\" ends=\"14:45:00\"/>\n" + 
@@ -63,7 +63,7 @@ public class PollOutagesConfigManagerTest extends TestCase {
                 "       <interface address=\"192.168.0.38\"/>\n" + 
                 "   </outage>\n" + 
                 "\n" + 
-                "   <outage name=\"two\" type=\"monthly\">\n" + 
+                "   <outage id=\"2\" name=\"two\" type=\"monthly\">\n" +
                 "       <time day=\"1\" begins=\"23:30:00\" ends=\"23:45:00\"/>\n" + 
                 "       <time day=\"15\" begins=\"21:30:00\" ends=\"21:45:00\"/>\n" + 
                 "       <time day=\"15\" begins=\"23:30:00\" ends=\"23:45:00\"/>\n" + 
@@ -77,7 +77,7 @@ public class PollOutagesConfigManagerTest extends TestCase {
                 "       <interface address=\"192.168.107.254\"/>\n" + 
                 "   </outage>\n" + 
                 "\n" + 
-                "   <outage name=\"three\" type=\"specific\">\n" + 
+                "   <outage id=\"3\" name=\"three\" type=\"specific\">\n" +
                 "       <time begins=\"21-Feb-2005 05:30:00\" ends=\"21-Feb-2005 15:00:00\"/>\n" + 
                 "       <interface address=\"192.168.0.1\"/>\n" + 
                 "   </outage>\n" + 
@@ -103,21 +103,21 @@ public class PollOutagesConfigManagerTest extends TestCase {
     
     public void testIsTimeInOutageWeekly() throws Exception {
 
-        assertTrue(m_manager.isTimeInOutage(getTime("21-FEB-2005 14:00:00"), "one"));
-        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 14:00:00"), "two"));
-        assertTrue(m_manager.isTimeInOutage(getTime("21-FEB-2005 14:00:00"), "three"));
+        assertTrue(m_manager.isTimeInOutage(getTime("21-FEB-2005 14:00:00"), 1));
+        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 14:00:00"), 2));
+        assertTrue(m_manager.isTimeInOutage(getTime("21-FEB-2005 14:00:00"), 3));
         
-        assertTrue(m_manager.isTimeInOutage(getTime("15-FEB-2005 14:00:00"), "one"));
-        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 14:00:00"), "two"));
-        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 14:00:00"), "three"));
+        assertTrue(m_manager.isTimeInOutage(getTime("15-FEB-2005 14:00:00"), 1));
+        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 14:00:00"), 2));
+        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 14:00:00"), 3));
         
-        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 23:37:00"), "one"));
-        assertTrue(m_manager.isTimeInOutage(getTime("15-FEB-2005 23:37:00"), "two"));
-        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 23:37:00"), "three"));
+        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 23:37:00"), 1));
+        assertTrue(m_manager.isTimeInOutage(getTime("15-FEB-2005 23:37:00"), 2));
+        assertFalse(m_manager.isTimeInOutage(getTime("15-FEB-2005 23:37:00"), 3));
         
-        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 16:00:00"), "one"));
-        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 16:00:00"), "two"));
-        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 16:00:00"), "three"));
+        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 16:00:00"), 1));
+        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 16:00:00"), 2));
+        assertFalse(m_manager.isTimeInOutage(getTime("21-FEB-2005 16:00:00"), 3));
         
         
     }
diff --git a/opennms-config/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml b/opennms-config/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml
index aa4d18a..8d56d62 100644
--- a/opennms-config/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml
+++ b/opennms-config/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml
@@ -50,7 +50,7 @@
 			<parameter key="ds-name" value="jmx"/>
 			<parameter key="friendly-name" value="jvm"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 
@@ -106,7 +106,7 @@
 			<parameter key="ds-name" value="jmx"/>
 			<parameter key="friendly-name" value="jvm"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 
 	<collector service="JBoss4"     class-name="org.opennms.netmgt.collectd.JBossCollector"/>
diff --git a/opennms-config/src/test/resources/org/opennms/netmgt/config/poller-configuration.testdata.xml b/opennms-config/src/test/resources/org/opennms/netmgt/config/poller-configuration.testdata.xml
index d63c8ed..358fbd7 100644
--- a/opennms-config/src/test/resources/org/opennms/netmgt/config/poller-configuration.testdata.xml
+++ b/opennms-config/src/test/resources/org/opennms/netmgt/config/poller-configuration.testdata.xml
@@ -121,7 +121,7 @@
       <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
       <parameter key="ds-name" value="pop3" />
     </service>
-    <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+    <outage-id>1</outage-id>
 
     <downtime interval="30000" begin="0" end="300000" /><!-- 30s, 0, 5m -->
     <downtime interval="300000" begin="300000" end="43200000" /><!-- 5m, 5m, 12h -->
@@ -146,7 +146,7 @@
       <parameter key="url" value="/" />
     </service>
 
-    <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+    <outage-id>1</outage-id>
 
     <downtime interval="30000" begin="0" end="300000" /><!-- 30s, 0, 5m -->
     <downtime interval="300000" begin="300000" end="43200000" /><!-- 5m, 5m, 12h -->
diff --git a/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/collectd-configuration.xml b/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/collectd-configuration.xml
index 8d01556..f7c6248 100644
--- a/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/collectd-configuration.xml
+++ b/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/collectd-configuration.xml
@@ -16,7 +16,7 @@
 			<parameter key="timeout" value="3000"/>
 		</service>
 
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 	<collector service="SNMP"         class-name="org.opennms.netmgt.collectd.SnmpCollector"/>
diff --git a/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/poller-configuration.xml b/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/poller-configuration.xml
index e036e9f..a292a56 100644
--- a/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/poller-configuration.xml
+++ b/opennms-correlation/drools-correlation-engine/src/test/opennms-home/etc/poller-configuration.xml
@@ -131,7 +131,7 @@
 			<parameter key="rrd-repository" value="/Users/brozow/svn/trunk/target/opennms-1.3.3-SNAPSHOT/share/rrd/response"/>
 			<parameter key="ds-name" value="pop3"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
diff --git a/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/collectd-configuration.xml b/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/collectd-configuration.xml
index 8b223bb..61cee44 100644
--- a/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/collectd-configuration.xml
+++ b/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/collectd-configuration.xml
@@ -16,7 +16,7 @@
 			<parameter key="timeout" value="3000"/>
 		</service>
 
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 	<collector service="SNMP"         class-name="org.opennms.netmgt.collectd.SnmpCollector"/>
diff --git a/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/poller-configuration.xml b/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/poller-configuration.xml
index e036e9f..a292a56 100644
--- a/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/poller-configuration.xml
+++ b/opennms-correlation/opennms-correlator/src/test/opennms-home/etc/poller-configuration.xml
@@ -131,7 +131,7 @@
 			<parameter key="rrd-repository" value="/Users/brozow/svn/trunk/target/opennms-1.3.3-SNAPSHOT/share/rrd/response"/>
 			<parameter key="ds-name" value="pop3"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
diff --git a/opennms-dao/src/test/resources/collectdconfiguration-testdata.xml b/opennms-dao/src/test/resources/collectdconfiguration-testdata.xml
index f9c0436..be0c67a 100644
--- a/opennms-dao/src/test/resources/collectdconfiguration-testdata.xml
+++ b/opennms-dao/src/test/resources/collectdconfiguration-testdata.xml
@@ -51,7 +51,7 @@
 			<parameter key="ds-name" value="jmx"/>
 			<parameter key="friendly-name" value="jvm"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 	<collector service="JBoss4"     class-name="org.opennms.netmgt.collectd.JBossCollector"/>
diff --git a/opennms-reporting/src/test/opennms-home/etc/collectd-configuration.xml b/opennms-reporting/src/test/opennms-home/etc/collectd-configuration.xml
index 8b223bb..61cee44 100644
--- a/opennms-reporting/src/test/opennms-home/etc/collectd-configuration.xml
+++ b/opennms-reporting/src/test/opennms-home/etc/collectd-configuration.xml
@@ -16,7 +16,7 @@
 			<parameter key="timeout" value="3000"/>
 		</service>
 
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 	<collector service="SNMP"         class-name="org.opennms.netmgt.collectd.SnmpCollector"/>
diff --git a/opennms-reporting/src/test/opennms-home/etc/poller-configuration.xml b/opennms-reporting/src/test/opennms-home/etc/poller-configuration.xml
index e036e9f..a292a56 100644
--- a/opennms-reporting/src/test/opennms-home/etc/poller-configuration.xml
+++ b/opennms-reporting/src/test/opennms-home/etc/poller-configuration.xml
@@ -131,7 +131,7 @@
 			<parameter key="rrd-repository" value="/Users/brozow/svn/trunk/target/opennms-1.3.3-SNAPSHOT/share/rrd/response"/>
 			<parameter key="ds-name" value="pop3"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/collectd/CollectionSpecification.java b/opennms-services/src/main/java/org/opennms/netmgt/collectd/CollectionSpecification.java
index 1a496d5..2168b1a 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/collectd/CollectionSpecification.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/collectd/CollectionSpecification.java
@@ -285,15 +285,15 @@ public class CollectionSpecification {
          * interface then break and return true. Otherwise process the
          * next outage.
          */ 
-        for (String outageName : m_package.getPackage().getOutageCalendarCollection()) {
+        for (long outageId : m_package.getPackage().getOutageIdCollection()) {
             // Does the outage apply to the current time?
-            if (outageFactory.isCurTimeInOutage(outageName)) {
+            if (outageFactory.isCurTimeInOutage(outageId)) {
                 // Does the outage apply to this interface?
-                if ((outageFactory.isNodeIdInOutage(agent.getNodeId(), outageName)) ||
-                        (outageFactory.isInterfaceInOutage(agent.getHostAddress(), outageName)))
+                if ((outageFactory.isNodeIdInOutage(agent.getNodeId(), outageId)) ||
+                        (outageFactory.isInterfaceInOutage(agent.getHostAddress(), outageId)))
                 {
                     if (log().isDebugEnabled()) {
-                        log().debug("scheduledOutage: configured outage '" + outageName + "' applies, interface " + agent.getHostAddress() + " will not be collected for " + this);
+                        log().debug("scheduledOutage: configured outage id '" + outageId + "' applies, interface " + agent.getHostAddress() + " will not be collected for " + this);
                     }
                     outageFound = true;
                     break;
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/notifd/BroadcastEventProcessor.java b/opennms-services/src/main/java/org/opennms/netmgt/notifd/BroadcastEventProcessor.java
index dcd1f57..80c70b7 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/notifd/BroadcastEventProcessor.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/notifd/BroadcastEventProcessor.java
@@ -563,8 +563,8 @@ public final class BroadcastEventProcessor implements EventListener {
                         long startTime = System.currentTimeMillis() + TimeConverter.convertToMillis(initialDelay);
                         // Find the first outage which applies at this time
 
-                        String scheduledOutageName = scheduledOutage(nodeid, ipaddr);
-                        if (scheduledOutageName != null) {
+                        Long scheduledOutageId = scheduledOutage(nodeid, ipaddr);
+                        if (scheduledOutageId != null) {
                             // This event occurred during a scheduled outage.
                             // Must decide what to do
                             if (autoAckExistsForEvent(event.getUei())) {
@@ -572,7 +572,7 @@ public final class BroadcastEventProcessor implements EventListener {
                                 // if the auto ack catches the other event
                                 // before then,
                                 // then the page will not be sent
-                                Calendar endOfOutage = getPollOutagesConfigManager().getEndOfOutage(scheduledOutageName);
+                                Calendar endOfOutage = getPollOutagesConfigManager().getEndOfOutage(scheduledOutageId);
                                 startTime = endOfOutage.getTime().getTime();
                             } else {
                                 // No auto-ack exists - there's no point
@@ -958,7 +958,7 @@ public final class BroadcastEventProcessor implements EventListener {
      * @param nodeId a long.
      * @param theInterface a {@link java.lang.String} object.
      */
-    public String scheduledOutage(long nodeId, String theInterface) {
+    public Long scheduledOutage(long nodeId, String theInterface) {
         try {
 
             PollOutagesConfigManager outageFactory = getPollOutagesConfigManager();
@@ -969,18 +969,18 @@ public final class BroadcastEventProcessor implements EventListener {
             // interface then break and return true. Otherwise process the
             // next outage.
             //
-            Collection<String> outageCalendarNames = getNotifdConfigManager().getOutageCalendarNames();
-            for (String outageName : outageCalendarNames) {
+            Collection<Long> outageIds = getNotifdConfigManager().getOutageIds();
+            for (long outageId : outageIds) {
 
                 // Does the outage apply to the current time?
-                if (outageFactory.isCurTimeInOutage(outageName)) {
+                if (outageFactory.isCurTimeInOutage(outageId)) {
                     // Does the outage apply to this interface or node?
 
-                    if ((outageFactory.isNodeIdInOutage(nodeId, outageName)) || (outageFactory.isInterfaceInOutage(theInterface, outageName)) || (outageFactory.isInterfaceInOutage("match-any", outageName))) {
+                    if ((outageFactory.isNodeIdInOutage(nodeId, outageId)) || (outageFactory.isInterfaceInOutage(theInterface, outageId)) || (outageFactory.isInterfaceInOutage("match-any", outageId))) {
                         if (log().isDebugEnabled()) {
-                            log().debug("scheduledOutage: configured outage '" + outageName + "' applies, notification for interface " + theInterface + " on node " + nodeId + " will not be sent");
+                            log().debug("scheduledOutage: configured outage id '" + outageId + "' applies, notification for interface " + theInterface + " on node " + nodeId + " will not be sent");
                         }
-                        return outageName;
+                        return outageId;
                     }
                 }
             }
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PollableServiceConfig.java b/opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PollableServiceConfig.java
index 052cdc6..eeb85f8 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PollableServiceConfig.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PollableServiceConfig.java
@@ -235,16 +235,16 @@ public class PollableServiceConfig implements PollConfig, ScheduleInterval {
      */
     public boolean scheduledSuspension() {
         long nodeId=m_service.getNodeId();
-        for (String outageName : m_pkg.getOutageCalendarCollection()) {
+        for (Long outageId : m_pkg.getOutageIdCollection()) {
             // Does the outage apply to the current time?
-            if (m_pollOutagesConfig.isTimeInOutage(m_timer.getCurrentTime(), outageName)) {
+            if (m_pollOutagesConfig.isTimeInOutage(m_timer.getCurrentTime(), outageId)) {
                 // Does the outage apply to this interface?
     
-                if (m_pollOutagesConfig.isNodeIdInOutage(nodeId, outageName) || 
-                    (m_pollOutagesConfig.isInterfaceInOutage(m_service.getIpAddr(), outageName)) || 
-                        (m_pollOutagesConfig.isInterfaceInOutage("match-any", outageName))) {
+                if (m_pollOutagesConfig.isNodeIdInOutage(nodeId, outageId) ||
+                    (m_pollOutagesConfig.isInterfaceInOutage(m_service.getIpAddr(), outageId)) ||
+                        (m_pollOutagesConfig.isInterfaceInOutage("match-any", outageId))) {
                     if (ThreadCategory.getInstance(getClass()).isDebugEnabled())
-                        ThreadCategory.getInstance(getClass()).debug("scheduledOutage: configured outage '" + outageName + "' applies, " + m_configService + " will not be polled.");
+                        ThreadCategory.getInstance(getClass()).debug("scheduledOutage: configured outage id '" + outageId + "' applies, " + m_configService + " will not be polled.");
                     return true;
                 }
             }
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdableService.java b/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdableService.java
index 64ec94c..6ae0496 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdableService.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdableService.java
@@ -404,12 +404,12 @@ final class ThresholdableService extends InetNetworkInterface implements Thresho
         // interface then break and return true. Otherwise process the
         // next outage.
         // 
-        for (final String outageName : m_package.getOutageCalendarCollection()) {
+        for (final long outageId : m_package.getOutageIdCollection()) {
             // Does the outage apply to the current time?
-            if (outageFactory.isCurTimeInOutage(outageName)) {
+            if (outageFactory.isCurTimeInOutage(outageId)) {
                 // Does the outage apply to this interface?
-                if ((outageFactory.isNodeIdInOutage((long) m_nodeId, outageName)) || (outageFactory.isInterfaceInOutage(getHostAddress(), outageName))) {
-                    LogUtils.debugf(this, "scheduledOutage: configured outage '%s' applies, interface %s will not be thresholded for %s", outageName, getHostAddress(), m_service);
+                if ((outageFactory.isNodeIdInOutage((long) m_nodeId, outageId)) || (outageFactory.isInterfaceInOutage(getHostAddress(), outageId))) {
+                    LogUtils.debugf(this, "scheduledOutage: configured outage id %d applies, interface %s will not be thresholded for %s", outageId, getHostAddress(), m_service);
                     outageFound = true;
                     break;
                 }
diff --git a/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdingSet.java b/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdingSet.java
index e97ca50..cf477d7 100644
--- a/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdingSet.java
+++ b/opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdingSet.java
@@ -71,7 +71,7 @@ public class ThresholdingSet {
     protected boolean m_hasThresholds = false;
     
     protected List<ThresholdGroup> m_thresholdGroups = new LinkedList<ThresholdGroup>();
-    protected final List<String> m_scheduledOutages = new ArrayList<String>();
+    protected final List<Long> m_scheduledOutages = new ArrayList<Long>();
 
     /**
      * <p>Constructor for ThresholdingSet.</p>
@@ -226,11 +226,11 @@ public class ThresholdingSet {
     public boolean isNodeInOutage() {
         PollOutagesConfigFactory outageFactory = PollOutagesConfigFactory.getInstance();
         boolean outageFound = false;
-        for (String outageName : m_scheduledOutages) {
-            if (outageFactory.isCurTimeInOutage(outageName)) {
-                log().debug("isNodeInOutage[node=" + m_nodeId + "]: current time is on outage using '" + outageName + "'; checking the node with IP " + m_hostAddress);
-                if (outageFactory.isNodeIdInOutage(m_nodeId, outageName) || outageFactory.isInterfaceInOutage(m_hostAddress, outageName)) {
-                    log().debug("isNodeInOutage[node=" + m_nodeId + "]: configured outage '" + outageName + "' applies, interface " + m_hostAddress + " will be ignored for threshold processing");
+        for (long outageId : m_scheduledOutages) {
+            if (outageFactory.isCurTimeInOutage(outageId)) {
+                log().debug("isNodeInOutage[node=" + m_nodeId + "]: current time is on outage using '" + outageId + "'; checking the node with IP " + m_hostAddress);
+                if (outageFactory.isNodeIdInOutage(m_nodeId, outageId) || outageFactory.isInterfaceInOutage(m_hostAddress, outageId)) {
+                    log().debug("isNodeInOutage[node=" + m_nodeId + "]: configured outage '" + outageId + "' applies, interface " + m_hostAddress + " will be ignored for threshold processing");
                     outageFound = true;
                     break;
                 }
@@ -424,18 +424,18 @@ public class ThresholdingSet {
         m_scheduledOutages.clear();
         ThreshdConfigManager configManager = ThreshdConfigFactory.getInstance();
         for (org.opennms.netmgt.config.threshd.Package pkg : configManager.getConfiguration().getPackage()) {
-            for (String outageCal : pkg.getOutageCalendarCollection()) {
-                log().info("updateScheduledOutages[node=" + m_nodeId + "]: checking scheduled outage '" + outageCal + "'");
+            for (long outageId : pkg.getOutageIdCollection()) {
+                log().info("updateScheduledOutages[node=" + m_nodeId + "]: checking scheduled outage '" + outageId + "'");
                 try {
-                    Outage outage = PollOutagesConfigFactory.getInstance().getOutage(outageCal);
+                    Outage outage = PollOutagesConfigFactory.getInstance().getOutage(outageId);
                     if (outage == null) {
-                        log().info("updateScheduledOutages[node=" + m_nodeId + "]: scheduled outage '" + outageCal + "' is not defined.");
+                        log().info("updateScheduledOutages[node=" + m_nodeId + "]: scheduled outage '" + outageId + "' is not defined.");
                     } else {
                         log().debug("updateScheduledOutages[node=" + m_nodeId + "]: outage calendar '" + outage.getName() + "' found on package '" + pkg.getName() + "'");
-                        m_scheduledOutages.add(outageCal);
+                        m_scheduledOutages.add(outageId);
                     }
                 } catch (Exception e) {
-                    log().info("updateScheduledOutages[node=" + m_nodeId + "]: scheduled outage '" + outageCal + "' does not exist.");                    
+                    log().info("updateScheduledOutages[node=" + m_nodeId + "]: scheduled outage '" + outageId + "' does not exist.");
                 }
             }
         }
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/mock/MockNetworkTest.java b/opennms-services/src/test/java/org/opennms/netmgt/mock/MockNetworkTest.java
index 6476cf4..753ebc5 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/mock/MockNetworkTest.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/mock/MockNetworkTest.java
@@ -40,6 +40,7 @@ import org.opennms.core.utils.InetAddressUtils;
 import org.opennms.netmgt.EventConstants;
 import org.opennms.netmgt.config.PollOutagesConfig;
 import org.opennms.netmgt.config.PollerConfig;
+import org.opennms.netmgt.config.poller.Outage;
 import org.opennms.netmgt.config.poller.Package;
 import org.opennms.netmgt.config.poller.Service;
 import org.opennms.netmgt.eventd.mock.EventAnticipator;
@@ -528,34 +529,34 @@ public class MockNetworkTest extends TestCase {
         long now = System.currentTimeMillis();
         long tenMinutes = 600000L;
 
-        m_pollerConfig.addScheduledOutage("outage1", now - tenMinutes, now + tenMinutes, "192.168.1.1");
-        m_pollerConfig.addScheduledOutage("outage2", now - tenMinutes, now, "192.168.1.2");
-        m_pollerConfig.addScheduledOutage("outage3", now - tenMinutes, now, 1);
-        m_pollerConfig.addScheduledOutage("outage4", now - tenMinutes, now, 2);
+        long outage1_id = m_pollerConfig.addScheduledOutage("outage1", now - tenMinutes, now + tenMinutes, "192.168.1.1");
+        long outage2_id = m_pollerConfig.addScheduledOutage("outage2", now - tenMinutes, now, "192.168.1.2");
+        long outage3_id = m_pollerConfig.addScheduledOutage("outage3", now - tenMinutes, now, 1);
+        long outage4_id = m_pollerConfig.addScheduledOutage("outage4", now - tenMinutes, now, 2);
         
         try { Thread.sleep(1000); } catch (InterruptedException e) {}
 
         Package pkg = m_pollerConfig.getPackage("TestPackage");
         assertNotNull(pkg);
 
-        Collection<String> outages = pkg.getOutageCalendarCollection();
-        assertTrue(outages.contains("outage1"));
-        assertTrue(outages.contains("outage2"));
+        Collection<Long> outages = pkg.getOutageIdCollection();
+        assertTrue(outages.contains(outage1_id));
+        assertTrue(outages.contains(outage2_id));
 
         // test isInterfaceInOutage
-        assertTrue(m_pollerConfig.isInterfaceInOutage("192.168.1.1", "outage1"));
-        assertFalse(m_pollerConfig.isInterfaceInOutage("192.168.1.2", "outage1"));
-        assertTrue(m_pollerConfig.isInterfaceInOutage("192.168.1.2", "outage2"));
-        assertFalse(m_pollerConfig.isInterfaceInOutage("192.168.1.1", "outage2"));
+        assertTrue(m_pollerConfig.isInterfaceInOutage("192.168.1.1", outage1_id));
+        assertFalse(m_pollerConfig.isInterfaceInOutage("192.168.1.2", outage1_id));
+        assertTrue(m_pollerConfig.isInterfaceInOutage("192.168.1.2", outage2_id));
+        assertFalse(m_pollerConfig.isInterfaceInOutage("192.168.1.1", outage2_id));
 
         // test isCurTimeInOutage
-        assertTrue(m_pollerConfig.isCurTimeInOutage("outage1"));
-        assertFalse(m_pollerConfig.isCurTimeInOutage("outage2"));
+        assertTrue(m_pollerConfig.isCurTimeInOutage(outage1_id));
+        assertFalse(m_pollerConfig.isCurTimeInOutage(outage2_id));
 
         // test isNodeIdInOutage
-        assertFalse(m_pollerConfig.isNodeIdInOutage(1, "outage1"));
-        assertTrue(m_pollerConfig.isNodeIdInOutage(1, "outage3"));
-        assertFalse(m_pollerConfig.isNodeIdInOutage(1, "outage4"));
+        assertFalse(m_pollerConfig.isNodeIdInOutage(1, outage1_id));
+        assertTrue(m_pollerConfig.isNodeIdInOutage(1, outage3_id));
+        assertFalse(m_pollerConfig.isNodeIdInOutage(1, outage4_id));
     }
 
     private void testServicePoll(MockElement element) throws UnknownHostException {
diff --git a/opennms-services/src/test/java/org/opennms/netmgt/mock/MockPollerConfig.java b/opennms-services/src/test/java/org/opennms/netmgt/mock/MockPollerConfig.java
index 1be5168..57ec6e2 100644
--- a/opennms-services/src/test/java/org/opennms/netmgt/mock/MockPollerConfig.java
+++ b/opennms-services/src/test/java/org/opennms/netmgt/mock/MockPollerConfig.java
@@ -127,7 +127,7 @@ public class MockPollerConfig extends PollOutagesConfigManager implements Poller
      * @param end - time, in seconds since the epoch, when the outage ends
      * @param nodeid - the node the outage applies to
      */
-    public void addScheduledOutage(Package pkg, String outageName, long begin, long end, int nodeid) {
+    public long addScheduledOutage(Package pkg, String outageName, long begin, long end, int nodeid) {
 
         Outage outage = new Outage();
         outage.setName(outageName);
@@ -144,9 +144,12 @@ public class MockPollerConfig extends PollOutagesConfigManager implements Poller
     
         outage.addTime(time);
     
+        synchronized (this) {
+             outage.setId(getNextPollOutageId());
         getConfig().addOutage(outage);
-    
-        pkg.addOutageCalendar(outageName);
+             pkg.addOutageId(outage.getId());
+        }
+        return outage.getId();
     }
     
     /**
@@ -156,12 +159,12 @@ public class MockPollerConfig extends PollOutagesConfigManager implements Poller
      * @param end - time, in seconds since the epoch, when the outage ends
      * @param nodeid - the node the outage applies to
      */
-    public void addScheduledOutage(String outageName, long begin, long end, int nodeid) {
-        addScheduledOutage(m_currentPkg, outageName, begin, end, nodeid);
+    public long addScheduledOutage(String outageName, long begin, long end, int nodeid) {
+        return addScheduledOutage(m_currentPkg, outageName, begin, end, nodeid);
     }
     
     
-    public void addScheduledOutage(Package pkg, String outageName, long begin, long end, String ipAddr) {
+    public long addScheduledOutage(Package pkg, String outageName, long begin, long end, String ipAddr) {
         Outage outage = new Outage();
         outage.setName(outageName);
 
@@ -178,17 +181,19 @@ public class MockPollerConfig extends PollOutagesConfigManager implements Poller
 
         outage.addTime(time);
 
+        synchronized (this) {
+            outage.setId(getNextPollOutageId());
         getConfig().addOutage(outage);
-
-        pkg.addOutageCalendar(outageName);
-
+            pkg.addOutageId(outage.getId());
+       }
+       return outage.getId();
     }
 
-    public void addScheduledOutage(String outageName, long begin, long end, String ipAddr) {
-        addScheduledOutage(m_currentPkg, outageName, begin, end, ipAddr);
+    public long addScheduledOutage(String outageName, long begin, long end, String ipAddr) {
+        return addScheduledOutage(m_currentPkg, outageName, begin, end, ipAddr);
     }
 
-    public void addScheduledOutage(Package pkg, String outageName, String dayOfWeek, String beginTime, String endTime, String ipAddr) {
+    public long addScheduledOutage(Package pkg, String outageName, String dayOfWeek, String beginTime, String endTime, String ipAddr) {
         Outage outage = new Outage();
         outage.setName(outageName);
         outage.setType("weekly");
@@ -205,13 +210,16 @@ public class MockPollerConfig extends PollOutagesConfigManager implements Poller
 
         outage.addTime(time);
 
+        synchronized (this) {
+            outage.setId(getNextPollOutageId());
         getConfig().addOutage(outage);
-
-        pkg.addOutageCalendar(outageName);
+            pkg.addOutageId(outage.getId());
+       }
+       return outage.getId();
     }
 
-    public void addScheduledOutage(String outageName, String dayOfWeek, String beginTime, String endTime, String ipAddr) {
-        addScheduledOutage(m_currentPkg, outageName, dayOfWeek, beginTime, endTime, ipAddr);
+    public long addScheduledOutage(String outageName, String dayOfWeek, String beginTime, String endTime, String ipAddr) {
+        return addScheduledOutage(m_currentPkg, outageName, dayOfWeek, beginTime, endTime, ipAddr);
     }
 
 
diff --git a/opennms-services/src/test/resources/etc/threshd-configuration.xml b/opennms-services/src/test/resources/etc/threshd-configuration.xml
index 8aa6e6d..8f538ff 100644
--- a/opennms-services/src/test/resources/etc/threshd-configuration.xml
+++ b/opennms-services/src/test/resources/etc/threshd-configuration.xml
@@ -36,8 +36,8 @@
                         <parameter key="thresholding-group" value="dhcp-latency"/>
                 </service>
 
-       <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
-       <outage-calendar>junit outage</outage-calendar>
+       <outage-id>1</outage-id>
+       <outage-id>2</outage-id>
    </package>
    
    <thresholder service="SNMP"   class-name="org.opennms.netmgt.threshd.SnmpThresholder"/>
diff --git a/opennms-services/src/test/resources/org/opennms/netmgt/capsd/poller-configuration.xml b/opennms-services/src/test/resources/org/opennms/netmgt/capsd/poller-configuration.xml
index 08ec645..08979d4 100644
--- a/opennms-services/src/test/resources/org/opennms/netmgt/capsd/poller-configuration.xml
+++ b/opennms-services/src/test/resources/org/opennms/netmgt/capsd/poller-configuration.xml
@@ -23,7 +23,7 @@
            <parameter key="timeout" value="3000"/>
            <parameter key="ds-name" value="icmp"/>
        </service>
-       <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+       <outage-id>1</outage-id>
 
        <downtime interval="30000" begin="0" end="300000"/>       <!-- 30s, 0, 5m -->
        <downtime interval="300000" begin="300000" end="43200000"/>   <!-- 5m, 5m, 12h -->
diff --git a/opennms-services/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml b/opennms-services/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml
index aa4d18a..8d56d62 100644
--- a/opennms-services/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml
+++ b/opennms-services/src/test/resources/org/opennms/netmgt/config/collectd-testdata.xml
@@ -50,7 +50,7 @@
 			<parameter key="ds-name" value="jmx"/>
 			<parameter key="friendly-name" value="jvm"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 	
 
@@ -106,7 +106,7 @@
 			<parameter key="ds-name" value="jmx"/>
 			<parameter key="friendly-name" value="jvm"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 
 	<collector service="JBoss4"     class-name="org.opennms.netmgt.collectd.JBossCollector"/>
diff --git a/opennms-services/src/test/resources/org/opennms/netmgt/poller/remote/poller-configuration.xml b/opennms-services/src/test/resources/org/opennms/netmgt/poller/remote/poller-configuration.xml
index 76a01d3..08a62f6 100644
--- a/opennms-services/src/test/resources/org/opennms/netmgt/poller/remote/poller-configuration.xml
+++ b/opennms-services/src/test/resources/org/opennms/netmgt/poller/remote/poller-configuration.xml
@@ -118,7 +118,7 @@
 			<parameter key="rrd-repository" value="target/test-data"/>
 			<parameter key="ds-name" value="pop3"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
@@ -144,7 +144,7 @@
 			<parameter key="rrd-repository" value="target/test-data"/>
 			<parameter key="ds-name" value="http"/>
         </service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
diff --git a/opennms-services/src/test/resources/org/opennms/netmgt/threshd/threshd-configuration.xml b/opennms-services/src/test/resources/org/opennms/netmgt/threshd/threshd-configuration.xml
index 0f0d50c..9121c05 100644
--- a/opennms-services/src/test/resources/org/opennms/netmgt/threshd/threshd-configuration.xml
+++ b/opennms-services/src/test/resources/org/opennms/netmgt/threshd/threshd-configuration.xml
@@ -35,7 +35,7 @@
                         <parameter key="thresholding-group" value="dhcp-latency"/>
                 </service>
 
-       <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+       <outage-id>1</outage-id>
    </package>
    
    <thresholder service="SNMP"   class-name="org.opennms.netmgt.threshd.SnmpThresholder"/>
diff --git a/opennms-services/src/test/resources/threshd-configuration-bug3390.xml b/opennms-services/src/test/resources/threshd-configuration-bug3390.xml
index 530f3ef..79043bb 100644
--- a/opennms-services/src/test/resources/threshd-configuration-bug3390.xml
+++ b/opennms-services/src/test/resources/threshd-configuration-bug3390.xml
@@ -12,7 +12,7 @@
            <parameter key="thresholding-group" value="netsnmp-mem8"/>
            <parameter key="thresholding-group" value="netsnmp-swap10"/>
        </service>
-       <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+       <outage-id>1</outage-id>
    </package>
 
 </threshd-configuration>
diff --git a/opennms-services/src/test/resources/threshd-configuration-bug3554.xml b/opennms-services/src/test/resources/threshd-configuration-bug3554.xml
index 883ee1a..ee8c1c7 100644
--- a/opennms-services/src/test/resources/threshd-configuration-bug3554.xml
+++ b/opennms-services/src/test/resources/threshd-configuration-bug3554.xml
@@ -7,7 +7,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="mib2"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="hrstorage">
         <filter>IPADDR != '0.0.0.0' &amp; (nodeSysOID LIKE '.1.3.6.1.4.1.311.%' | nodeSysOID LIKE '.1.3.6.1.4.1.2.3.1.2.1.1.3.%')</filter>
@@ -15,7 +15,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="hrstorage"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="cisco">
         <filter>IPADDR != '0.0.0.0' &amp; nodeSysOID LIKE '.1.3.6.1.4.1.9.%'</filter>
@@ -23,7 +23,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="cisco"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="ciscoIPRA">
         <filter>catincIPRA &amp; nodeSysOID LIKE '.1.3.6.1.4.1.9.%'</filter>
@@ -31,7 +31,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="ciscoIPRA"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="ciscoIPBA">
         <filter>catincIPBA &amp; nodeSysOID LIKE '.1.3.6.1.4.1.9.%'</filter>
@@ -39,7 +39,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="ciscoIPBA"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="ciscoNAS">
         <filter>catincNAS &amp; nodeSysOID LIKE '.1.3.6.1.4.1.9.%'</filter>
@@ -47,7 +47,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="ciscoNAS"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="extreme">
         <filter>catincManExtreme &amp; nodeSysOID LIKE '.1.3.6.1.4.1.1916.%'</filter>
@@ -55,7 +55,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="extreme"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="netsnmp">
         <filter>IPADDR != '0.0.0.0' &amp; (nodeSysOID LIKE '.1.3.6.1.4.1.2021.%' | nodeSysOID LIKE '.1.3.6.1.4.1.8072.%')</filter>
@@ -63,7 +63,7 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="netsnmp"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
     <package name="TestThresholds">
         <filter>catincBackBone &amp; (nodeSysOID LIKE '.1.3.6.1.4.1.9.1.385%' | nodeSysOID LIKE '.1.3.6.1.4.1.2636.1.1.1.2.%')</filter>
@@ -71,6 +71,6 @@
         <service name="SNMP" interval="300000" user-defined="false" status="on">
             <parameter key="thresholding-group" value="TestThresholds"/>
         </service>
-        <outage-calendar xmlns="">RMCC-B02</outage-calendar>
+        <outage-id xmlns="">1</outage-id>
     </package>
 </threshd-configuration>
diff --git a/opennms-services/src/test/resources/threshd-configuration-bug3575.xml b/opennms-services/src/test/resources/threshd-configuration-bug3575.xml
index 33b7929..844c399 100644
--- a/opennms-services/src/test/resources/threshd-configuration-bug3575.xml
+++ b/opennms-services/src/test/resources/threshd-configuration-bug3575.xml
@@ -8,7 +8,7 @@
 		<service name="StrafePing" interval="300000" user-defined="false" status="on">
 			<parameter key="thresholding-group" value="strafe" />
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 	</package>
 
 </threshd-configuration>
diff --git a/opennms-services/src/test/resources/threshd-configuration-bug3748.xml b/opennms-services/src/test/resources/threshd-configuration-bug3748.xml
index 7f47318..f5d4dc1 100644
--- a/opennms-services/src/test/resources/threshd-configuration-bug3748.xml
+++ b/opennms-services/src/test/resources/threshd-configuration-bug3748.xml
@@ -9,7 +9,7 @@
        <service name="SNMP" interval="300000" user-defined="false" status="on">
            <parameter key="thresholding-group" value="absolute-test"/>
        </service>
-       <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+       <outage-id>1</outage-id>
    </package>
 
 </threshd-configuration>
diff --git a/opennms-services/src/test/resources/threshd-configuration-outages.xml b/opennms-services/src/test/resources/threshd-configuration-outages.xml
index 6c06971..6d99b1f 100644
--- a/opennms-services/src/test/resources/threshd-configuration-outages.xml
+++ b/opennms-services/src/test/resources/threshd-configuration-outages.xml
@@ -12,7 +12,7 @@
        <service name="HTTP" interval="300000" user-defined="false" status="on">
            <parameter key="thresholding-group" value="http-latency"/>
        </service>       
-       <outage-calendar>junit outage</outage-calendar>
+       <outage-id>1</outage-id>
    </package>
 
 </threshd-configuration>
diff --git a/opennms-services/src/test/resources/threshd-configuration.xml b/opennms-services/src/test/resources/threshd-configuration.xml
index 391b035..627d8a7 100644
--- a/opennms-services/src/test/resources/threshd-configuration.xml
+++ b/opennms-services/src/test/resources/threshd-configuration.xml
@@ -13,7 +13,7 @@
        <service name="HTTP" interval="300000" user-defined="false" status="on">
            <parameter key="thresholding-group" value="http-latency"/>
        </service>       
-       <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+       <outage-id>1</outage-id>
    </package>
 
 </threshd-configuration>
diff --git a/opennms-tools/groovy-tools/src/main/groovy/fastProvisioner.groovy b/opennms-tools/groovy-tools/src/main/groovy/fastProvisioner.groovy
index b86957a..a500e7f 100755
--- a/opennms-tools/groovy-tools/src/main/groovy/fastProvisioner.groovy
+++ b/opennms-tools/groovy-tools/src/main/groovy/fastProvisioner.groovy
@@ -277,7 +277,7 @@ class ThreshdConfiguration extends XMLConfigurationFile {
             specific("0.0.0.0")
             'include-range'(begin:"1.1.1.1", end:"254.254.254.254")
             'include-url'("file:/space/svn/trunk/target/opennms-1.3.3-SNAPSHOT/etc/include")
-            'outage-calendar'("zzz from poll-outages.xml zzz")
+            'outage-id'("1")
         }
     }
 
@@ -480,7 +480,7 @@ class CollectdConfiguration extends XMLConfigurationFile {
             specific("0.0.0.0")
             'include-range'(begin:"1.1.1.1", end:"254.254.254.254")
             'include-url'("file:/space/svn/trunk/target/opennms-1.3.3-SNAPSHOT/etc/include")
-            'outage-calendar'("zzz from poll-outages.xml zzz")
+            'outage-id'("1")
         }
     }
     
diff --git a/opennms-webapp/src/main/java/org/opennms/web/rest/ScheduledOutagesRestService.java b/opennms-webapp/src/main/java/org/opennms/web/rest/ScheduledOutagesRestService.java
index ec22743..6a32cdc 100644
--- a/opennms-webapp/src/main/java/org/opennms/web/rest/ScheduledOutagesRestService.java
+++ b/opennms-webapp/src/main/java/org/opennms/web/rest/ScheduledOutagesRestService.java
@@ -66,22 +66,22 @@ import com.sun.jersey.spi.resource.PerRequest;
  * <ul>
  * <li><b>GET /sched-outages</b><br>to get a list of configured scheduled outages.</li>
  * <li><b>POST /sched-outages</b><br>to add a new outage (or update an existing one).</li>
- * <li><b>GET /sched-outages/{outageName}</b><br>to get the details of a specific outage.</li>
- * <li><b>DELETE /sched-outages/{outageName}</b><br>to delete a specific outage.</li>
- * <li><b>PUT /sched-outages/{outageName}/collectd/{package}</b><br>to add a specific outage to a collectd's package.</li>
- * <li><b>PUT /sched-outages/{outageName}/pollerd/{package}</b><br>to add a specific outage to a pollerd's package.</li>
- * <li><b>PUT /sched-outages/{outageName}/threshd/{package}</b><br>to add a specific outage to a threshd's package.</li>
- * <li><b>PUT /sched-outages/{outageName}/notifd</b><br>to add a specific outage to the notifications.</li>
- * <li><b>DELETE /sched-outages/{outageName}/collectd/{package}</b><br>to remove a specific outage from a collectd's package.</li>
- * <li><b>DELETE /sched-outages/{outageName}/pollerd/{package}</b><br>to remove a specific outage from a pollerd's package.</li>
- * <li><b>DELETE /sched-outages/{outageName}/threshd/{package}</b><br>to remove a specific outage from a threshd's package.</li>
- * <li><b>DELETE /sched-outages/{outageName}/notifd</b><br>to remove a specific outage from the notifications.</li>
+ * <li><b>GET /sched-outages/{outageId}</b><br>to get the details of a specific outage.</li>
+ * <li><b>DELETE /sched-outages/{outageId}</b><br>to delete a specific outage.</li>
+ * <li><b>PUT /sched-outages/{outageId}/collectd/{package}</b><br>to add a specific outage to a collectd's package.</li>
+ * <li><b>PUT /sched-outages/{outageId}/pollerd/{package}</b><br>to add a specific outage to a pollerd's package.</li>
+ * <li><b>PUT /sched-outages/{outageId}/threshd/{package}</b><br>to add a specific outage to a threshd's package.</li>
+ * <li><b>PUT /sched-outages/{outageId}/notifd</b><br>to add a specific outage to the notifications.</li>
+ * <li><b>DELETE /sched-outages/{outageId}/collectd/{package}</b><br>to remove a specific outage from a collectd's package.</li>
+ * <li><b>DELETE /sched-outages/{outageId}/pollerd/{package}</b><br>to remove a specific outage from a pollerd's package.</li>
+ * <li><b>DELETE /sched-outages/{outageId}/threshd/{package}</b><br>to remove a specific outage from a threshd's package.</li>
+ * <li><b>DELETE /sched-outages/{outageId}/notifd</b><br>to remove a specific outage from the notifications.</li>
  * </ul>
  * 
  * <p>Node and Interface status (the requests return true or false):</p>
  * <ul>
- * <li><b>GET /sched-outages/{outageName}/nodeInOutage/{nodeId}</b><br>to check if a node (with a specific nodeId) is currently on outage for a specific scheduled outage calendar.</li>
- * <li><b>GET /sched-outages/{outageName}/interfaceInOutage/{ipAddr}</b><br>to check if an interface (with a specific IP address) is currently on outage for a specific scheduled outage calendar.</li>
+ * <li><b>GET /sched-outages/{outageId}/nodeInOutage/{nodeId}</b><br>to check if a node (with a specific nodeId) is currently on outage for a specific scheduled outage calendar.</li>
+ * <li><b>GET /sched-outages/{outageId}/interfaceInOutage/{ipAddr}</b><br>to check if an interface (with a specific IP address) is currently on outage for a specific scheduled outage calendar.</li>
  * <li><b>GET /sched-outages/nodeInOutage/{nodeId}</b><br>to check if a node (with a specific nodeId) is currently in outage.</li>
  * <li><b>GET /sched-outages/interfaceInOutage/{ipAddr}</b><br>to check if an interface (with a specific IP address) is currently on outage.</li>
  * </ul>
@@ -119,13 +119,13 @@ public class ScheduledOutagesRestService extends OnmsRestService {
     }
 
     @GET
-    @Path("{outageName}")
+    @Path("{outageId}")
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Outage getOutage(@PathParam("outageName") String outageName) throws IllegalArgumentException {
+    public Outage getOutage(@PathParam("outageId") Long outageId) throws IllegalArgumentException {
         readLock();
         try {
-            Outage outage = m_configFactory.getOutage(outageName);
-            if (outage == null) throw new IllegalArgumentException("Scheduled outage " + outageName + " does not exist.");
+            Outage outage = m_configFactory.getOutage(outageId);
+            if (outage == null) throw new IllegalArgumentException("Scheduled outage " + outageId + " does not exist.");
             return outage;
         } finally {
             readUnlock();
@@ -138,177 +138,177 @@ public class ScheduledOutagesRestService extends OnmsRestService {
         writeLock();
         try {
             if (newOutage == null) throw getException(Status.BAD_REQUEST, "Outage object can't be null");
-            Outage oldOutage = m_configFactory.getOutage(newOutage.getName());
+            Outage oldOutage = m_configFactory.getOutage(newOutage.getId());
             if (oldOutage == null) {
-                log().debug("saveOrUpdateOutage: adding outage " + newOutage.getName());
+                log().debug("saveOrUpdateOutage: adding outage " + newOutage.getId());
                 m_configFactory.addOutage(newOutage);
             } else {
-                log().debug("saveOrUpdateOutage: updating outage " + newOutage.getName());
+                log().debug("saveOrUpdateOutage: updating outage " + newOutage.getId());
                 m_configFactory.replaceOutage(oldOutage, newOutage);
             }
             m_configFactory.saveCurrent();
             sendConfigChangedEvent();
-            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(newOutage.getName())).build();
+            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(newOutage.getId())).build();
             // return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't save or update the scheduled outage " + newOutage.getName() + " because, " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't save or update the scheduled outage " + newOutage.getId() + " because, " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @DELETE
-    @Path("{outageName}")
-    public Response deleteOutage(@PathParam("outageName") String outageName) {
+    @Path("{outageId}")
+    public Response deleteOutage(@PathParam("outageId") Long outageId) {
         writeLock();
         try {
-            log().debug("deleteOutage: deleting outage " + outageName);
-            updateCollectd(ConfigAction.REMOVE_FROM_ALL, outageName, null);
-            updatePollerd(ConfigAction.REMOVE_FROM_ALL, outageName, null);
-            updateThreshd(ConfigAction.REMOVE_FROM_ALL, outageName, null);
-            updateNotifd(ConfigAction.REMOVE, outageName);
-            m_configFactory.removeOutage(outageName);
+            log().debug("deleteOutage: deleting outage " + outageId);
+            updateCollectd(ConfigAction.REMOVE_FROM_ALL, outageId, null);
+            updatePollerd(ConfigAction.REMOVE_FROM_ALL, outageId, null);
+            updateThreshd(ConfigAction.REMOVE_FROM_ALL, outageId, null);
+            updateNotifd(ConfigAction.REMOVE, outageId);
+            m_configFactory.removeOutage(outageId);
             m_configFactory.saveCurrent();
             sendConfigChangedEvent();
             return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't delete the scheduled outage " + outageName + " because, " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't delete the scheduled outage " + outageId + " because, " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @PUT
-    @Path("{outageName}/collectd/{packageName}")
-    public Response addOutageToCollector(@PathParam("outageName") String outageName, @PathParam("packageName") String packageName) {
+    @Path("{outageId}/collectd/{packageName}")
+    public Response addOutageToCollector(@PathParam("outageId") Long outageId, @PathParam("packageName") String packageName) {
         writeLock();
         try {
-            updateCollectd(ConfigAction.ADD, outageName, packageName);
+            updateCollectd(ConfigAction.ADD, outageId, packageName);
             sendConfigChangedEvent();
-            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageName)).build();
+            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageId)).build();
             // return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageName + " to collector package " + packageName + ", because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageId + " to collector package " + packageName + ", because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @DELETE
-    @Path("{outageName}/collectd/{packageName}")
-    public Response removeOutageFromCollector(@PathParam("outageName") String outageName, @PathParam("packageName") String packageName) {
+    @Path("{outageId}/collectd/{packageName}")
+    public Response removeOutageFromCollector(@PathParam("outageId") Long outageId, @PathParam("packageName") String packageName) {
         writeLock();
         try {
-            updateCollectd(ConfigAction.REMOVE, outageName, packageName);
+            updateCollectd(ConfigAction.REMOVE, outageId, packageName);
             sendConfigChangedEvent();
             return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageName + " from collector package " + packageName + ", because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageId + " from collector package " + packageName + ", because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @PUT
-    @Path("{outageName}/pollerd/{packageName}")
-    public Response addOutageToPoller(@PathParam("outageName") String outageName, @PathParam("packageName") String packageName) {
+    @Path("{outageId}/pollerd/{packageName}")
+    public Response addOutageToPoller(@PathParam("outageId") Long outageId, @PathParam("packageName") String packageName) {
         writeLock();
         try {
-            updatePollerd(ConfigAction.ADD, outageName, packageName);
+            updatePollerd(ConfigAction.ADD, outageId, packageName);
             sendConfigChangedEvent();
-            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageName)).build();
+            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageId)).build();
             // return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageName + " to poller package " + packageName  + ", because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageId + " to poller package " + packageName  + ", because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @DELETE
-    @Path("{outageName}/pollerd/{packageName}")
-    public Response removeOutageFromPoller(@PathParam("outageName") String outageName, @PathParam("packageName") String packageName) {
+    @Path("{outageId}/pollerd/{packageName}")
+    public Response removeOutageFromPoller(@PathParam("outageId") Long outageId, @PathParam("packageName") String packageName) {
         writeLock();
         try {
-            updatePollerd(ConfigAction.REMOVE, outageName, packageName);
+            updatePollerd(ConfigAction.REMOVE, outageId, packageName);
             sendConfigChangedEvent();
             return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageName + " from poller package " + packageName + ", because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageId + " from poller package " + packageName + ", because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @PUT
-    @Path("{outageName}/threshd/{packageName}")
-    public Response addOutageToThresholder(@PathParam("outageName") String outageName, @PathParam("packageName") String packageName) {
+    @Path("{outageId}/threshd/{packageName}")
+    public Response addOutageToThresholder(@PathParam("outageId") Long outageId, @PathParam("packageName") String packageName) {
         writeLock();
         try {
-            updateThreshd(ConfigAction.ADD, outageName, packageName);
+            updateThreshd(ConfigAction.ADD, outageId, packageName);
             sendConfigChangedEvent();
-            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageName)).build();
+            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageId)).build();
             // return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageName + " to threshold package " + packageName + ", because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageId + " to threshold package " + packageName + ", because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @DELETE
-    @Path("{outageName}/threshd/{packageName}")
-    public Response removeOutageFromThresholder(@PathParam("outageName") String outageName, @PathParam("packageName") String packageName) {
+    @Path("{outageId}/threshd/{packageName}")
+    public Response removeOutageFromThresholder(@PathParam("outageId") Long outageId, @PathParam("packageName") String packageName) {
         writeLock();
         try {
-            updateThreshd(ConfigAction.REMOVE, outageName, packageName);
+            updateThreshd(ConfigAction.REMOVE, outageId, packageName);
             sendConfigChangedEvent();
             return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageName + " from threshold package " + packageName + ", because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageId + " from threshold package " + packageName + ", because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @PUT
-    @Path("{outageName}/notifd")
-    public Response addOutageToNotifications(@PathParam("outageName") String outageName) {
+    @Path("{outageId}/notifd")
+    public Response addOutageToNotifications(@PathParam("outageId") Long outageId) {
         writeLock();
         try {
-            updateNotifd(ConfigAction.ADD, outageName);
+            updateNotifd(ConfigAction.ADD, outageId);
             sendConfigChangedEvent();
-            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageName)).build();
+            return Response.seeOther(m_uriInfo.getBaseUriBuilder().path(this.getClass(), "getOutage").build(outageId)).build();
             // return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageName + " to notifications because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't add scheduled outage " + outageId + " to notifications because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @DELETE
-    @Path("{outageName}/notifd")
-    public Response removeOutageFromNotifications(@PathParam("outageName") String outageName) {
+    @Path("{outageId}/notifd")
+    public Response removeOutageFromNotifications(@PathParam("outageId") Long outageId) {
         writeLock();
         try {
-            updateNotifd(ConfigAction.REMOVE, outageName);
+            updateNotifd(ConfigAction.REMOVE, outageId);
             sendConfigChangedEvent();
             return Response.ok().build();
         } catch (Exception e) {
-            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageName + " from notifications because: " + e.getMessage());
+            throw getException(Status.BAD_REQUEST, "Can't remove scheduled outage " + outageId + " from notifications because: " + e.getMessage());
         } finally {
             writeUnlock();
         }
     }
 
     @GET
-    @Path("{outageName}/nodeInOutage/{nodeId}")
+    @Path("{outageId}/nodeInOutage/{nodeId}")
     @Produces(MediaType.TEXT_PLAIN)
-    public String isNodeInOutage(@PathParam("outageName") String outageName, @PathParam("nodeId") Integer nodeId) {
+    public String isNodeInOutage(@PathParam("outageId") Long outageId, @PathParam("nodeId") Integer nodeId) {
         readLock();
         try {
-            Outage outage = getOutage(outageName);
+            Outage outage = getOutage(outageId);
             Boolean inOutage = m_configFactory.isNodeIdInOutage(nodeId, outage) && m_configFactory.isCurTimeInOutage(outage);
             return inOutage.toString();
         } finally {
@@ -334,13 +334,13 @@ public class ScheduledOutagesRestService extends OnmsRestService {
     }
 
     @GET
-    @Path("{outageName}/interfaceInOutage/{ipAddr}")
+    @Path("{outageId}/interfaceInOutage/{ipAddr}")
     @Produces(MediaType.TEXT_PLAIN)
-    public String isInterfaceInOutage(@PathParam("outageName") String outageName, @PathParam("ipAddr") String ipAddr) {
+    public String isInterfaceInOutage(@PathParam("outageId") Long outageId, @PathParam("ipAddr") String ipAddr) {
         readLock();
         try {
             validateAddress(ipAddr);
-            Outage outage = getOutage(outageName);
+            Outage outage = getOutage(outageId);
             Boolean inOutage = m_configFactory.isInterfaceInOutage(ipAddr, outage) && m_configFactory.isCurTimeInOutage(outage);
             return inOutage.toString();
         } finally {
@@ -377,20 +377,20 @@ public class ScheduledOutagesRestService extends OnmsRestService {
         }
     }
 
-    private void updateCollectd(ConfigAction action, String outageName, String packageName) throws Exception {
-        getOutage(outageName); // Validate if outageName exists.
+    private void updateCollectd(ConfigAction action, Long outageId, String packageName) throws Exception {
+        getOutage(outageId); // Validate if outageName exists.
         if (action.equals(ConfigAction.ADD)) {
             CollectdPackage pkg = getCollectdPackage(packageName);
-            if (!pkg.getPackage().getOutageCalendarCollection().contains(outageName))
-                pkg.getPackage().addOutageCalendar(outageName);
+            if (!pkg.getPackage().getOutageIdCollection().contains(outageId))
+                pkg.getPackage().addOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE)) {
             CollectdPackage pkg = getCollectdPackage(packageName);
-            pkg.getPackage().removeOutageCalendar(outageName);
+            pkg.getPackage().addOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE_FROM_ALL)) {
             for (CollectdPackage pkg : CollectdConfigFactory.getInstance().getCollectdConfig().getPackages()) {
-                pkg.getPackage().removeOutageCalendar(outageName);
+                pkg.getPackage().addOutageId(outageId);
             }
         }
         CollectdConfigFactory.getInstance().saveCurrent();
@@ -402,20 +402,20 @@ public class ScheduledOutagesRestService extends OnmsRestService {
         return pkg;
     }
 
-    private void updatePollerd(ConfigAction action, String outageName, String packageName) throws Exception {
-        getOutage(outageName); // Validate if outageName exists.
+    private void updatePollerd(ConfigAction action, Long outageId, String packageName) throws Exception {
+        getOutage(outageId); // Validate if outageName exists.
         if (action.equals(ConfigAction.ADD)) {
             org.opennms.netmgt.config.poller.Package pkg = getPollerdPackage(packageName);
-            if (!pkg.getOutageCalendarCollection().contains(outageName))
-                pkg.addOutageCalendar(outageName);
+            if (!pkg.getOutageIdCollection().contains(outageId))
+                pkg.addOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE)) {
             org.opennms.netmgt.config.poller.Package pkg = getPollerdPackage(packageName);
-            pkg.removeOutageCalendar(outageName);
+            pkg.removeOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE_FROM_ALL)) {
             for (org.opennms.netmgt.config.poller.Package pkg : PollerConfigFactory.getInstance().getConfiguration().getPackage()) {
-                pkg.removeOutageCalendar(outageName);
+                pkg.removeOutageId(outageId);
             }
         }
         PollerConfigFactory.getInstance().save();
@@ -427,20 +427,20 @@ public class ScheduledOutagesRestService extends OnmsRestService {
         return pkg;
     }
 
-    private void updateThreshd(ConfigAction action, String outageName, String packageName) throws Exception {
-        getOutage(outageName); // Validate if outageName exists.
+    private void updateThreshd(ConfigAction action, Long outageId, String packageName) throws Exception {
+        getOutage(outageId); // Validate if outageName exists.
         if (action.equals(ConfigAction.ADD)) {
             org.opennms.netmgt.config.threshd.Package pkg = getThreshdPackage(packageName);
-            if (!pkg.getOutageCalendarCollection().contains(outageName))
-                pkg.addOutageCalendar(outageName);
+            if (!pkg.getOutageIdCollection().contains(outageId))
+                pkg.addOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE)) {
             org.opennms.netmgt.config.threshd.Package pkg = getThreshdPackage(packageName);
-            pkg.removeOutageCalendar(outageName);
+            pkg.addOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE_FROM_ALL)) {
             for (org.opennms.netmgt.config.threshd.Package pkg : ThreshdConfigFactory.getInstance().getConfiguration().getPackage()) {
-                pkg.removeOutageCalendar(outageName);
+                pkg.addOutageId(outageId);
             }
         }
         ThreshdConfigFactory.getInstance().saveCurrent();
@@ -452,14 +452,14 @@ public class ScheduledOutagesRestService extends OnmsRestService {
         return pkg;
     }
 
-    private void updateNotifd(ConfigAction action, String outageName) throws Exception {
-        getOutage(outageName); // Validate if outageName exists.
+    private void updateNotifd(ConfigAction action, Long outageId) throws Exception {
+        getOutage(outageId); // Validate if outageName exists.
         NotifdConfigFactory factory = NotifdConfigFactory.getInstance();
         if (action.equals(ConfigAction.ADD)) {
-            factory.getConfiguration().addOutageCalendar(outageName);
+            factory.getConfiguration().addOutageId(outageId);
         }
         if (action.equals(ConfigAction.REMOVE) || action.equals(ConfigAction.REMOVE_FROM_ALL)) {
-            factory.getConfiguration().removeOutageCalendar(outageName);
+            factory.getConfiguration().removeOutageId(outageId);
         }
         factory.saveCurrent();
     }
diff --git a/opennms-webapp/src/main/webapp/admin/sched-outages/editoutage.jsp b/opennms-webapp/src/main/webapp/admin/sched-outages/editoutage.jsp
index 8b7a8bb..73fc369 100644
--- a/opennms-webapp/src/main/webapp/admin/sched-outages/editoutage.jsp
+++ b/opennms-webapp/src/main/webapp/admin/sched-outages/editoutage.jsp
@@ -198,16 +198,32 @@
 		return;
 	}
 
-	String nameParam = request.getParameter("name");
-	if (nameParam != null) {
+	Long outageId = null;
+	String idParam = request.getParameter("id");
+	if (idParam != null) {
+
+	try {
+		outageId = Long.valueOf(idParam);
+	} catch (NumberFormatException e) {
+%>
+<html>
+<body>
+Invalid outage id parameter <%= idParam %>, could not convert to long integer.
+<br />
+</body>
+</html>
+<%
+		return;
+	}
+
 		//first time in - name is passed as a param.  Find the outage, copy it, and shove it in the session
 		//Also keep a copy of the name, for later saving (replacing the original with the edited copy)
-		Outage tempOutage = pollFactory.getOutage(nameParam);
+		Outage tempOutage = pollFactory.getOutage(outageId);
 		CharArrayWriter writer = new CharArrayWriter();
 		tempOutage.marshal(writer);
 		theOutage = (Outage) Outage.unmarshal(new CharArrayReader(writer.toCharArray()));
 		request.getSession().setAttribute("opennms.editoutage", theOutage);
-		request.getSession().setAttribute("opennms.editoutage.origname", nameParam);
+		request.getSession().setAttribute("opennms.editoutage.origid", idParam);
 	} else if ("true".equals(request.getParameter("addNew"))) {
 		theOutage = new Outage();
 		String nodes[] = request.getParameterValues("nodeID");
@@ -218,7 +234,7 @@
 		theOutage.setName(request.getParameter("newName").trim());
 		
 		request.getSession().setAttribute("opennms.editoutage", theOutage);
-		request.getSession().removeAttribute("opennms.editoutage.origname");
+		request.getSession().removeAttribute("opennms.editoutage.origid");
 		if (nodes != null) {
 			for(int i = 0 ; i < nodes.length; i++ ) {
 				int node = WebSecurityUtils.safeParseInt(nodes[i]);
@@ -248,7 +264,6 @@ Could not find an outage to edit because no outage name parameter was specified
 </html>
 <%
 	return;
-
 		}
 	}
 	//Load the initial set of enabled outages from the external configurations
@@ -257,42 +272,46 @@ Could not find an outage to edit because no outage name parameter was specified
 	Set<String> enabledOutages = new HashSet<String>();
 
 	// ******* Notification outages config *********
-	Collection<String> notificationOutages = NotifdConfigFactory.getInstance().getConfiguration().getOutageCalendarCollection();
-	if (notificationOutages.contains(theOutage.getName())) {
+	Set<Long> notificationOutages = new HashSet<Long>(NotifdConfigFactory.getInstance().getConfiguration().getOutageIdCollection());
+	if (notificationOutages.contains(theOutage.getId())) {
 		enabledOutages.add("notifications");
 	}
 
+%><%
 	// ******* Threshd outages config *********
 	ThreshdConfigFactory.init();
-	Map<org.opennms.netmgt.config.threshd.Package, List<String>> thresholdOutages = new HashMap<org.opennms.netmgt.config.threshd.Package, List<String>>();
+	Map<org.opennms.netmgt.config.threshd.Package, HashSet<Long>> thresholdOutages = new HashMap<org.opennms.netmgt.config.threshd.Package, HashSet<Long>>();
 	for (org.opennms.netmgt.config.threshd.Package thisPackage : ThreshdConfigFactory.getInstance().getConfiguration().getPackage()) {
-		thresholdOutages.put(thisPackage, thisPackage.getOutageCalendarCollection());
-		if (thisPackage.getOutageCalendarCollection().contains(theOutage.getName())) {
+		thresholdOutages.put(thisPackage, new HashSet<Long>(thisPackage.getOutageIdCollection()));
+		if (thisPackage.getOutageIdCollection().contains(theOutage.getId())) {
 			enabledOutages.add("threshold-" + thisPackage.getName());
 		}
 	}
 
+%><%
 	// ******* Polling outages config *********
 	PollerConfigFactory.init();
-	Map<org.opennms.netmgt.config.poller.Package, List<String>> pollingOutages = new HashMap<org.opennms.netmgt.config.poller.Package, List<String>>();
+	Map<org.opennms.netmgt.config.poller.Package, HashSet<Long>> pollingOutages = new HashMap<org.opennms.netmgt.config.poller.Package, HashSet<Long>>();
 	for (org.opennms.netmgt.config.poller.Package thisPackage : PollerConfigFactory.getInstance().getConfiguration().getPackage()) {
-		pollingOutages.put(thisPackage, thisPackage.getOutageCalendarCollection());
-		if (thisPackage.getOutageCalendarCollection().contains(theOutage.getName())) {
+		pollingOutages.put(thisPackage, new HashSet<Long>(thisPackage.getOutageIdCollection()));
+		if (thisPackage.getOutageIdCollection().contains(theOutage.getId())) {
 			enabledOutages.add("polling-" + thisPackage.getName());
 		}
 	}
 
+%><%
 	// ******* Collectd outages config *********
 	CollectdConfigFactory.init();
-	Map<org.opennms.netmgt.config.collectd.Package, List<String>> collectionOutages = new HashMap<org.opennms.netmgt.config.collectd.Package, List<String>>();
+	Map<org.opennms.netmgt.config.collectd.Package, HashSet<Long>> collectionOutages = new HashMap<org.opennms.netmgt.config.collectd.Package, HashSet<Long>>();
 	for (CollectdPackage pkg : CollectdConfigFactory.getInstance().getCollectdConfig().getPackages()) {
 		org.opennms.netmgt.config.collectd.Package thisPackage = pkg.getPackage();
-		collectionOutages.put(thisPackage, thisPackage.getOutageCalendarCollection());
-		if (thisPackage.getOutageCalendarCollection().contains(theOutage.getName())) {
+		collectionOutages.put(thisPackage, new HashSet<Long>(thisPackage.getOutageIdCollection()));
+		if (thisPackage.getOutageIdCollection().contains(theOutage.getId())) {
 			enabledOutages.add("collect-" + thisPackage.getName());
 		}
 	}
 
+%><%
 	if (request.getParameter("deleteOutageType") != null) {
 		theOutage.setType(null);
 		theOutage.removeAllTime();
@@ -302,6 +321,7 @@ Could not find an outage to edit because no outage name parameter was specified
 	    }
 	}
 	
+%><%
 	String isFormSubmission = request.getParameter("formSubmission");
 	if ("true".equals(isFormSubmission)) {
 
@@ -315,6 +335,7 @@ Could not find an outage to edit because no outage name parameter was specified
 	
 			//Now handle any buttons that were clicked.  There should be only one
 			//If there is more than one, we use the first and ignore the rest.
+%><%
 			if (request.getParameter("saveButton") != null) {
 				//Save was clicked - save 
 	
@@ -359,64 +380,63 @@ Could not find an outage to edit because no outage name parameter was specified
 				}
 	
 				//Check if the outage is a new one, or an edited old one
-				String origname = (String) request.getSession().getAttribute("opennms.editoutage.origname");
-				if (origname == null) {
+				if (theOutage.getId() == 0) {
 					//A new outage - just plonk it in place
 					pollFactory.addOutage(theOutage);
 				} else {
 					//An edited outage - replace the old one
-					pollFactory.replaceOutage(pollFactory.getOutage(origname), theOutage);
+					pollFactory.replaceOutage(pollFactory.getOutage(theOutage.getId()), theOutage);
 				}
 				//Push the enabledOutages into the actual configuration of the various packages
 				//Don't do until after we've successfully put the outage into the polloutages configuration (for coherency)
 				if (enabledOutages.contains("notifications")) {
 					if (!notificationOutages.contains(theOutage.getName())) {
-						NotifdConfigFactory.getInstance().getConfiguration().addOutageCalendar(theOutage.getName());
+						NotifdConfigFactory.getInstance().getConfiguration().addOutageId(theOutage.getId());
 					}
 				} else {
 					if (notificationOutages.contains(theOutage.getName())) {
-						NotifdConfigFactory.getInstance().getConfiguration().removeOutageCalendar(theOutage.getName());
+						NotifdConfigFactory.getInstance().getConfiguration().removeOutageId(theOutage.getId());
 					}
 				}
 	
 				for (org.opennms.netmgt.config.poller.Package thisKey : pollingOutages.keySet()) {
-					Collection<String> pollingPackage = pollingOutages.get(thisKey);
+					Collection<Long> pollingPackage = pollingOutages.get(thisKey);
 					String name = "polling-" + thisKey.getName();
 					if (enabledOutages.contains(name)) {
-						if (!pollingPackage.contains(theOutage.getName())) {
-							thisKey.addOutageCalendar(theOutage.getName());
+						if (!pollingPackage.contains(theOutage.getId())) {
+							thisKey.addOutageId(theOutage.getId());
 						}
 					} else {
-						if (pollingPackage.contains(theOutage.getName())) {
-							thisKey.removeOutageCalendar(theOutage.getName());
+						if (pollingPackage.contains(theOutage.getId())) {
+							thisKey.removeOutageId(theOutage.getId());
 						}
 					}
 				}
 	
 				for (org.opennms.netmgt.config.threshd.Package thisKey : thresholdOutages.keySet()) {
-					Collection<String> thresholdPackage = thresholdOutages.get(thisKey);
+					Collection<Long> thresholdPackage = thresholdOutages.get(thisKey);
 					String name = "threshold-" + thisKey.getName();
 					if (enabledOutages.contains(name)) {
-						if (!thresholdPackage.contains(theOutage.getName())) {
-							thisKey.addOutageCalendar(theOutage.getName());
+						if (!thresholdPackage.contains(theOutage.getId())) {
+							thisKey.addOutageId(theOutage.getId());
 						}
 					} else {
-						if (thresholdPackage.contains(theOutage.getName())) {
-							thisKey.removeOutageCalendar(theOutage.getName());
+						if (thresholdPackage.contains(theOutage.getId())) {
+							thisKey.removeOutageId(theOutage.getId());
 						}
 					}
 				}
 	
 				for (org.opennms.netmgt.config.collectd.Package thisKey : collectionOutages.keySet()) {
-					Collection<String> collectPackage = collectionOutages.get(thisKey);
+					Collection<Long> collectPackage = collectionOutages.get(thisKey);
 					String name = "collect-" + thisKey.getName();
 					if (enabledOutages.contains(name)) {
-						if (!collectPackage.contains(theOutage.getName())) {
-							thisKey.addOutageCalendar(theOutage.getName());
+						if (!collectPackage.contains(theOutage.getId())) {
+							thisKey.addOutageId(theOutage.getId());
 						}
 					} else {
-						if (collectPackage.contains(theOutage.getName())) {
-							thisKey.removeOutageCalendar(theOutage.getName());
+						if (collectPackage.contains(theOutage.getId())) {
+							thisKey.removeOutageId(theOutage.getId());
 						}
 					}
 				}
@@ -434,6 +454,7 @@ Could not find an outage to edit because no outage name parameter was specified
 				response.sendRedirect("index.jsp");
 				// dispatcher.forward(request, response);
 				return;
+%><%
 			} else if (request.getParameter("addNodeButton") != null) {
 				String newNode = request.getParameter("newNode");
 				if (newNode == null || "".equals(newNode.trim())) {
diff --git a/opennms-webapp/src/main/webapp/admin/sched-outages/index.jsp b/opennms-webapp/src/main/webapp/admin/sched-outages/index.jsp
index 92b1202..25c1991 100644
--- a/opennms-webapp/src/main/webapp/admin/sched-outages/index.jsp
+++ b/opennms-webapp/src/main/webapp/admin/sched-outages/index.jsp
@@ -64,30 +64,47 @@
 	NotifdConfigFactory.init(); //Must do this early on - if it fails, then just throw the exception to the web gui
 	PollOutagesConfigFactory.init(); // Only init - do *not* reload
 	PollOutagesConfigFactory pollFactory = PollOutagesConfigFactory.getInstance();
-	String deleteName = request.getParameter("deleteOutage");
-	if (deleteName != null) {
+	String idParam = request.getParameter("deleteOutage");
+	if (idParam != null) {
+        Long outageId = null;
+
+        try {
+            outageId = Long.valueOf(idParam);
+        } catch (NumberFormatException e) {
+%>
+<html>
+<body>
+	Invalid outage id parameter
+	<%=idParam%>, could not convert to Long.
+	<br />
+</body>
+</html>
+<%
+            return;
+        }
+
 		pollFactory.getWriteLock().lock();
 		try {
-			pollFactory.removeOutage(deleteName);
+            pollFactory.removeOutage(outageId);
 			//Remove from all the package configurations as well
 			org.opennms.netmgt.config.threshd.Package[] thresholdingPackages = ThreshdConfigFactory.getInstance().getConfiguration().getPackage();
 			for (int i = 0; i < thresholdingPackages.length; i++) {
 				org.opennms.netmgt.config.threshd.Package thisPackage = thresholdingPackages[i];
-				thisPackage.removeOutageCalendar(deleteName); //Will quietly do nothing if outage doesn't exist
+                thisPackage.removeOutageId(outageId); //Will quietly do nothing if outage doesn't exist
 			}
 	
 			org.opennms.netmgt.config.poller.Package[] pollingPackages = PollerConfigFactory.getInstance().getConfiguration().getPackage();
 			for (int i = 0; i < pollingPackages.length; i++) {
 				org.opennms.netmgt.config.poller.Package thisPackage = pollingPackages[i];
-				thisPackage.removeOutageCalendar(deleteName); //Will quietly do nothing if outage doesn't exist
+                thisPackage.removeOutageId(outageId); //Will quietly do nothing if outage doesn't exist
 			}
 	
 			for (Iterator iter = CollectdConfigFactory.getInstance().getCollectdConfig().getPackages().iterator(); iter.hasNext();) {
 				org.opennms.netmgt.config.collectd.Package thisPackage = ((CollectdPackage) iter.next()).getPackage();
-				thisPackage.removeOutageCalendar(deleteName); //Will quietly do nothing if outage doesn't exist
+                thisPackage.removeOutageId(outageId); //Will quietly do nothing if outage doesn't exist
 			}
 	
-			NotifdConfigFactory.getInstance().getConfiguration().removeOutageCalendar(deleteName);
+            NotifdConfigFactory.getInstance().getConfiguration().removeOutageId(outageId);
 	
 			pollFactory.saveCurrent();
 			NotifdConfigFactory.getInstance().saveCurrent();
@@ -115,11 +132,12 @@
 
 <table id="outages" border="1" cellpadding="5">
 	<tr>
-		<th colspan="4">&nbsp;</th>
+		<th colspan="5">&nbsp;</th>
 		<th colspan="4">Affects...</th>
 		<th colspan="2"></th>
 	</tr>
 	<tr>
+		<th>Id</th>
 		<th>Name</th>
 		<th>Type</th>
 		<th>Nodes/Interfaces</th>
@@ -149,47 +167,48 @@
 		try {
 			Outage[] outages = pollFactory.getOutages();
 	
-			Collection<String> notificationOutages = NotifdConfigFactory.getInstance().getConfiguration().getOutageCalendarCollection();
+			Collection<Long> notificationOutages = NotifdConfigFactory.getInstance().getConfiguration().getOutageIdCollection();
 	
 			PollerConfigFactory.init(); //Force init
 	
-			List<String> pollingOutages = new ArrayList<String>();
+			List<Long> pollingOutages = new ArrayList<Long>();
 			org.opennms.netmgt.config.poller.Package[] pollingPackages = PollerConfigFactory.getInstance().getConfiguration().getPackage();
 			for (int i = 0; i < pollingPackages.length; i++) {
-				pollingOutages.addAll(pollingPackages[i].getOutageCalendarCollection());
+				pollingOutages.addAll(pollingPackages[i].getOutageIdCollection());
 			}
 	
 			ThreshdConfigFactory.init();
-			List<String> thresholdingOutages = new ArrayList<String>();
+			List<Long> thresholdingOutages = new ArrayList<Long>();
 			org.opennms.netmgt.config.threshd.Package[] thresholdingPackages = ThreshdConfigFactory.getInstance().getConfiguration().getPackage();
 			for (int i = 0; i < thresholdingPackages.length; i++) {
-				thresholdingOutages.addAll(thresholdingPackages[i].getOutageCalendarCollection());
+				thresholdingOutages.addAll(thresholdingPackages[i].getOutageIdCollection());
 			}
 	
 			CollectdConfigFactory.init();
-			List<String> collectionOutages = new ArrayList<String>();
+			List<Long> collectionOutages = new ArrayList<Long>();
 	
 			for (Iterator iter = CollectdConfigFactory.getInstance().getCollectdConfig().getPackages().iterator(); iter.hasNext();) {
 				org.opennms.netmgt.config.collectd.Package thisPackage = ((CollectdPackage) iter.next()).getPackage();
-				collectionOutages.addAll(thisPackage.getOutageCalendarCollection());
+				collectionOutages.addAll(thisPackage.getOutageIdCollection());
 			}
 	
 			for (int i = 0; i < outages.length; i++) {
 				Outage thisOutage = outages[i];
+				Long outageId = thisOutage.getId();
 				String outageName = thisOutage.getName();
 	%>
 	<tr valign="top">
 		<td><%=outageName%></td>
-		<td><%=pollFactory.getOutageType(outageName)%></td>
+		<td><%=pollFactory.getOutageType(outageId)%></td>
 		<td>
 		<%
-			org.opennms.netmgt.config.poller.Node[] nodeList = pollFactory.getNodeIds(outageName);
+			org.opennms.netmgt.config.poller.Node[] nodeList = pollFactory.getNodeIds(outageId);
 				for (int j = 0; j < nodeList.length; j++) {
 					OnmsNode elementNode = NetworkElementFactory.getInstance(getServletContext()).getNode(nodeList[j].getId());
 		%> <%=elementNode == null || elementNode.getType().charAt(0) == 'D' ? "Node: Node ID " + nodeList[j].getId() + " Not Found" : "Node: " + elementNode.getLabel()%><br/>
 		<%
 			}
-				org.opennms.netmgt.config.poller.Interface[] interfaceList = pollFactory.getInterfaces(outageName);
+				org.opennms.netmgt.config.poller.Interface[] interfaceList = pollFactory.getInterfaces(outageId);
 				for (int j = 0; j < interfaceList.length; j++) {
 					StringBuffer display;
 					String rawAddress = interfaceList[j].getAddress();
@@ -226,35 +245,35 @@
 		</td>
 		<td noWrap>
 		<%
-			org.opennms.netmgt.config.poller.Time[] outageTimes = pollFactory.getOutageTimes(outageName);
+			org.opennms.netmgt.config.poller.Time[] outageTimes = pollFactory.getOutageTimes(outageId);
 				for (int j = 0; j < outageTimes.length; j++) {
 					org.opennms.netmgt.config.poller.Time thisOutageTime = outageTimes[j];
 					String rawDay = thisOutageTime.getDay();
 					String day = rawDay;
-					if ("daily".equals(pollFactory.getOutageType(outageName)))
+					if ("daily".equals(pollFactory.getOutageType(outageId)))
 						day = "";
-					if ("weekly".equals(pollFactory.getOutageType(outageName)))
+					if ("weekly".equals(pollFactory.getOutageType(outageId)))
 						day = (rawDay == null) ? "" : (String) shortDayNames.get(rawDay);
-					if ("specific".equals(pollFactory.getOutageType(outageName)))
+					if ("specific".equals(pollFactory.getOutageType(outageId)))
 						day = "";
-		%><%=day%> <%=thisOutageTime.getBegins()%> -<%="specific".equals(pollFactory.getOutageType(outageName)) ? "<br/>" : ""%>
+		%><%=day%> <%=thisOutageTime.getBegins()%> -<%="specific".equals(pollFactory.getOutageType(outageId)) ? "<br/>" : ""%>
 		<%=thisOutageTime.getEnds()%><br/>
 		<%
 			}
 		%>
 		</td>
 		<td align="center"><img
-			src="<%=(notificationOutages.contains(outageName))?outageOnImageUrl:outageOffImageUrl%>"></td>
+			src="<%=(notificationOutages.contains(outageId))?outageOnImageUrl:outageOffImageUrl%>"></td>
 		<td align="center"><img
-			src="<%=(pollingOutages.contains(outageName))?outageOnImageUrl:outageOffImageUrl%>"></td>
+			src="<%=(pollingOutages.contains(outageId))?outageOnImageUrl:outageOffImageUrl%>"></td>
 		<td align="center"><img
-			src="<%=(thresholdingOutages.contains(outageName))?outageOnImageUrl:outageOffImageUrl%>"></td>
+			src="<%=(thresholdingOutages.contains(outageId))?outageOnImageUrl:outageOffImageUrl%>"></td>
 		<td align="center"><img
-			src="<%=(collectionOutages.contains(outageName))?outageOnImageUrl:outageOffImageUrl%>"></td>
-		<td><a id="<%=outageName%>.edit"
-			href="admin/sched-outages/editoutage.jsp?name=<%=java.net.URLEncoder.encode(outageName, "UTF-8")%>">Edit</a></td>
-		<td><a id="<%=outageName%>.delete"
-			href="admin/sched-outages/index.jsp?deleteOutage=<%=java.net.URLEncoder.encode(outageName, "UTF-8")%>"
+			src="<%=(collectionOutages.contains(outageId))?outageOnImageUrl:outageOffImageUrl%>"></td>
+		<td><a id="<%=outageId%>.edit"
+			href="admin/sched-outages/editoutage.jsp?id=<%=outageId%>">Edit</a></td>
+		<td><a id="<%=outageId%>.delete"
+			href="admin/sched-outages/index.jsp?deleteOutage=<%=outageId%>"
 			onClick="if(!confirm('Are you sure you wish to delete this outage?')) {return false;}">Delete</a></td>
 	</tr>
 
diff --git a/opennms-webapp/src/test/opennms-home/etc/collectd-configuration.xml b/opennms-webapp/src/test/opennms-home/etc/collectd-configuration.xml
index 6e40a3c..1372be7 100644
--- a/opennms-webapp/src/test/opennms-home/etc/collectd-configuration.xml
+++ b/opennms-webapp/src/test/opennms-home/etc/collectd-configuration.xml
@@ -50,7 +50,7 @@
       <parameter key="ds-name" value="jmx"/>
       <parameter key="friendly-name" value="jvm"/>
     </service>
-    <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+    <outage-id>1</outage-id>
   </package>
   
 
@@ -106,7 +106,7 @@
       <parameter key="ds-name" value="jmx"/>
       <parameter key="friendly-name" value="jvm"/>
     </service>
-    <outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+    <outage-id>1</outage-id>
   </package>
 
   <collector service="JBoss4"     class-name="org.opennms.netmgt.collectd.JBossCollector"/>
diff --git a/opennms-webapp/src/test/opennms-home/etc/poller-configuration.xml b/opennms-webapp/src/test/opennms-home/etc/poller-configuration.xml
index ed0c468..2620f7a 100644
--- a/opennms-webapp/src/test/opennms-home/etc/poller-configuration.xml
+++ b/opennms-webapp/src/test/opennms-home/etc/poller-configuration.xml
@@ -131,7 +131,7 @@
 			<parameter key="rrd-repository" value="/Users/brozow/svn/trunk/target/opennms-1.3.2-SNAPSHOT/share/rrd/response"/>
 			<parameter key="ds-name" value="pop3"/>
 		</service>
-		<outage-calendar>zzz from poll-outages.xml zzz</outage-calendar>
+		<outage-id>1</outage-id>
 
 		<downtime interval="30000" begin="0" end="300000"/>		<!-- 30s, 0, 5m -->
 		<downtime interval="300000" begin="300000" end="43200000"/>	<!-- 5m, 5m, 12h -->
-- 
1.7.9