Fix added to add server restart warnings, and to prevent unnecessary

rapla exceptions.
karllassy · Dec 8, 2015 · db94765 · db94765
1 parent ec290e8
commit db94765
Show file tree

Hide file tree

Showing 9 changed files with 1,852 additions and 644 deletions.
diff --git a/CSE2102/data/data.xml b/CSE2102/data/data.xml
@@ -99,30 +99,22 @@
 
    <rapla:resources>
       <!-- resources -->
-      <rapla:resource id="r6be21be-0ed8-4814-931b-b5cb532f5b6e" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-21T20:37:40.0180Z" last-changed="2015-10-21T20:37:45.0035Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="r06f62df-127e-4a22-8ff2-1f3e88590091" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:39:35.0763Z" last-changed="2015-12-08T19:39:38.0681Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>hi</dynatt:name>
+            <dynatt:name>kjlh</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
-      <rapla:resource id="rf4e930b-3490-4020-bab3-73efa797bd4a" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T03:07:52.0235Z" last-changed="2015-12-08T03:07:55.0075Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="r5337fab-e7af-4519-b1c2-42f243e3a8e8" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T22:06:59.0522Z" last-changed="2015-12-08T22:07:05.0763Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>sdfg</dynatt:name>
+            <dynatt:name>asdfklsajdf</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
 
    </rapla:resources>
 
    <rapla:reservations>
-      <rapla:reservation id="e75d84a5-e92a-4850-ae7c-60179fadf9a6" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:29:10.0738Z" last-changed="2015-12-08T03:08:07.0235Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
-         <dynatt:event>
-            <dynatt:name>asdf</dynatt:name>
-         </dynatt:event>
-         <rapla:appointment id="a08c8f8a-b34a-4f66-be67-3374ec9ce11b" start-date="2015-12-07" start-time="14:45:00" end-date="2015-12-07" end-time="15:00:00"/>
-         <rapla:allocate idref="rf4e930b-3490-4020-bab3-73efa797bd4a"/>
-         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
-      </rapla:reservation>
       <rapla:reservation id="ec47e64a-eb77-416c-8231-f8368d29ef56" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-14T19:33:38.0461Z" last-changed="2015-10-14T19:33:45.0141Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>asdfadf</dynatt:name>
@@ -146,7 +138,6 @@
          <rapla:appointment id="a2f184d8-e684-4ff3-83dd-cf35950014fc" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:appointment id="a29d9537-833a-4ef8-80d8-f3655df7c95c" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:appointment id="a09bf5ec-3cfe-4cea-9f19-4d39ba811f7b" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
-         <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="ef2a1bb5-a741-4258-b335-7c04a0584d72" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-04T20:41:59.0270Z" last-changed="2015-11-04T20:43:10.0492Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -180,7 +171,46 @@
          <rapla:appointment id="ad122b94-b1da-40ce-b030-db2f3e3aa31c" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
          <rapla:appointment id="a9c6221f-0f58-4818-b5e1-4a714a837b01" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
          <rapla:appointment id="ad8eabc3-c44e-4365-9bec-9746e3c6e9f6" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
-         <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e4283910-411b-4271-b528-44658fce8b48" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:16:14.0449Z" last-changed="2015-12-08T19:17:32.0883Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>sfdg</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="add3f21a-16f8-43b1-bb62-794a28df297e" start-date="2015-12-07" start-time="09:15:00" end-date="2015-12-07" end-time="09:30:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e56ad51d-38ff-45cf-ae87-3cafc4fd9e3d" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:22:09.0264Z" last-changed="2015-12-08T19:41:03.0254Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>gsdfg</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a59596d9-f4b0-46b7-9395-e937b5aa057c" start-date="2015-12-07" start-time="01:15:00" end-date="2015-12-07" end-time="01:30:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="ef1561b0-45fc-47b0-81cd-4556a8ae3231" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:33:01.0941Z" last-changed="2015-12-08T19:39:21.0212Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>fgd</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a317a755-a163-4972-8e65-416cf442da81" start-date="2015-12-07" start-time="08:30:00" end-date="2015-12-07" end-time="08:45:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e0787fc1-0788-4d81-bf0d-d1f7eaaa4242" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:44:51.0585Z" last-changed="2015-12-08T19:45:00.0585Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>ll</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="afb275b2-7c7a-4ed8-9db9-db50f519f6fa" start-date="2015-12-07" start-time="04:45:00" end-date="2015-12-07" end-time="05:00:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="eb61ad82-4b7a-4fcb-b3d6-711e5fced5f0" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T22:07:11.0528Z" last-changed="2015-12-08T22:07:32.0167Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>fasdf</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="afbbb4fa-6bbc-49b0-af1c-c592f1655ffe" start-date="2015-12-07" start-time="09:15:00" end-date="2015-12-07" end-time="09:30:00">
+            <rapla:allocate idref="r5337fab-e7af-4519-b1c2-42f243e3a8e8"/>
+         </rapla:appointment>
+         <rapla:appointment id="ad0f079c-48d6-46b6-b852-5b450878ebc5" start-date="2015-12-07" start-time="09:15:00" end-date="2015-12-07" end-time="09:30:00">
+            <rapla:allocate idref="r06f62df-127e-4a22-8ff2-1f3e88590091"/>
+         </rapla:appointment>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
    </rapla:reservations>

diff --git a/CSE2102/data/data.xml.bak b/CSE2102/data/data.xml.bak
@@ -99,29 +99,22 @@
 
    <rapla:resources>
       <!-- resources -->
-      <rapla:resource id="r6be21be-0ed8-4814-931b-b5cb532f5b6e" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-21T20:37:40.0180Z" last-changed="2015-10-21T20:37:45.0035Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="r06f62df-127e-4a22-8ff2-1f3e88590091" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:39:35.0763Z" last-changed="2015-12-08T19:39:38.0681Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>hi</dynatt:name>
+            <dynatt:name>kjlh</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
-      <rapla:resource id="rf4e930b-3490-4020-bab3-73efa797bd4a" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T03:07:52.0235Z" last-changed="2015-12-08T03:07:55.0075Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="r5337fab-e7af-4519-b1c2-42f243e3a8e8" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T22:06:59.0522Z" last-changed="2015-12-08T22:07:05.0763Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>sdfg</dynatt:name>
+            <dynatt:name>asdfklsajdf</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
 
    </rapla:resources>
 
    <rapla:reservations>
-      <rapla:reservation id="e75d84a5-e92a-4850-ae7c-60179fadf9a6" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:29:10.0738Z" last-changed="2015-12-08T03:07:43.0240Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
-         <dynatt:event>
-            <dynatt:name>asdf</dynatt:name>
-         </dynatt:event>
-         <rapla:appointment id="a08c8f8a-b34a-4f66-be67-3374ec9ce11b" start-date="2015-12-07" start-time="14:45:00" end-date="2015-12-07" end-time="15:00:00"/>
-         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
-      </rapla:reservation>
       <rapla:reservation id="ec47e64a-eb77-416c-8231-f8368d29ef56" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-14T19:33:38.0461Z" last-changed="2015-10-14T19:33:45.0141Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>asdfadf</dynatt:name>
@@ -145,7 +138,6 @@
          <rapla:appointment id="a2f184d8-e684-4ff3-83dd-cf35950014fc" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:appointment id="a29d9537-833a-4ef8-80d8-f3655df7c95c" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:appointment id="a09bf5ec-3cfe-4cea-9f19-4d39ba811f7b" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
-         <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="ef2a1bb5-a741-4258-b335-7c04a0584d72" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-04T20:41:59.0270Z" last-changed="2015-11-04T20:43:10.0492Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -179,7 +171,34 @@
          <rapla:appointment id="ad122b94-b1da-40ce-b030-db2f3e3aa31c" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
          <rapla:appointment id="a9c6221f-0f58-4818-b5e1-4a714a837b01" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
          <rapla:appointment id="ad8eabc3-c44e-4365-9bec-9746e3c6e9f6" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
-         <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e4283910-411b-4271-b528-44658fce8b48" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:16:14.0449Z" last-changed="2015-12-08T19:17:32.0883Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>sfdg</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="add3f21a-16f8-43b1-bb62-794a28df297e" start-date="2015-12-07" start-time="09:15:00" end-date="2015-12-07" end-time="09:30:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e56ad51d-38ff-45cf-ae87-3cafc4fd9e3d" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:22:09.0264Z" last-changed="2015-12-08T19:41:03.0254Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>gsdfg</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a59596d9-f4b0-46b7-9395-e937b5aa057c" start-date="2015-12-07" start-time="01:15:00" end-date="2015-12-07" end-time="01:30:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="ef1561b0-45fc-47b0-81cd-4556a8ae3231" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:33:01.0941Z" last-changed="2015-12-08T19:39:21.0212Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>fgd</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a317a755-a163-4972-8e65-416cf442da81" start-date="2015-12-07" start-time="08:30:00" end-date="2015-12-07" end-time="08:45:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e0787fc1-0788-4d81-bf0d-d1f7eaaa4242" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T19:44:51.0585Z" last-changed="2015-12-08T19:45:00.0585Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>ll</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="afb275b2-7c7a-4ed8-9db9-db50f519f6fa" start-date="2015-12-07" start-time="04:45:00" end-date="2015-12-07" end-time="05:00:00"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
    </rapla:reservations>