# HG changeset patch
# User wenzelm
# Date 1299186375 -3600
# Node ID 2386fb64feafa9251d2f13ef8e98309df0e4fbc3
# Parent  d37babdf5cae9994cbf3e5dd2581f84061638a59
eliminated UNITY_Examples.thy which takes quite long to merge and does not parallelize so well -- essentially reverting 3dec57ec3473;

diff -r d37babdf5cae -r 2386fb64feaf src/HOL/IsaMakefile
--- a/src/HOL/IsaMakefile	Thu Mar 03 21:43:06 2011 +0100
+++ b/src/HOL/IsaMakefile	Thu Mar 03 22:06:15 2011 +0100
@@ -787,8 +787,8 @@
 HOL-UNITY: HOL $(LOG)/HOL-UNITY.gz
 
 $(LOG)/HOL-UNITY.gz: $(OUT)/HOL Library/Multiset.thy UNITY/ROOT.ML	\
-  UNITY/UNITY_Main.thy UNITY/UNITY_Examples.thy UNITY/UNITY_tactics.ML	\
-  UNITY/Comp.thy UNITY/Constrains.thy UNITY/Detects.thy UNITY/ELT.thy	\
+  UNITY/UNITY_Main.thy UNITY/UNITY_tactics.ML UNITY/Comp.thy		\
+  UNITY/Constrains.thy UNITY/Detects.thy UNITY/ELT.thy			\
   UNITY/Extend.thy UNITY/FP.thy UNITY/Follows.thy UNITY/Guar.thy	\
   UNITY/Lift_prog.thy UNITY/ListOrder.thy UNITY/ProgressSets.thy	\
   UNITY/PPROD.thy UNITY/Project.thy UNITY/Rename.thy			\
diff -r d37babdf5cae -r 2386fb64feaf src/HOL/UNITY/ROOT.ML
--- a/src/HOL/UNITY/ROOT.ML	Thu Mar 03 21:43:06 2011 +0100
+++ b/src/HOL/UNITY/ROOT.ML	Thu Mar 03 22:06:15 2011 +0100
@@ -6,7 +6,38 @@
 no_document use_thys ["../Auth/Public"];
 
 use_thys [
-  "UNITY_Main",     (*Basic meta-theory*)
-  "UNITY_Examples"  (*Examples*)
+  (*Basic meta-theory*)
+  "UNITY_Main",
+
+  (*Simple examples: no composition*)
+  "Simple/Deadlock",
+  "Simple/Common",
+  "Simple/Network",
+  "Simple/Token",
+  "Simple/Channel",
+  "Simple/Lift",
+  "Simple/Mutex",
+  "Simple/Reach",
+  "Simple/Reachability",
+
+  (*Verifying security protocols using UNITY*)
+  "Simple/NSP_Bad",
+
+  (*Example of composition*)
+  "Comp/Handshake",
+
+  (*Universal properties examples*)
+  "Comp/Counter",
+  "Comp/Counterc",
+  "Comp/Priority",
+
+  "Comp/TimerArray",
+  "Comp/Progress",
+
+  "Comp/Alloc",
+  "Comp/AllocImpl",
+  "Comp/Client",
+
+  (*obsolete*)
+  "ELT"
 ];
-
diff -r d37babdf5cae -r 2386fb64feaf src/HOL/UNITY/UNITY_Examples.thy
--- a/src/HOL/UNITY/UNITY_Examples.thy	Thu Mar 03 21:43:06 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-(*  Author:     Lawrence C Paulson Cambridge University Computer Laboratory
-    Copyright   1998  University of Cambridge
-*)
-
-header {* Various examples for UNITY *}
-
-theory UNITY_Examples
-imports
-  UNITY_Main
-
-  (*Simple examples: no composition*)
-  "Simple/Deadlock"
-  "Simple/Common"
-  "Simple/Network"
-  "Simple/Token"
-  "Simple/Channel"
-  "Simple/Lift"
-  "Simple/Mutex"
-  "Simple/Reach"
-  "Simple/Reachability"
-
-  (*Verifying security protocols using UNITY*)
-  "Simple/NSP_Bad"
-
-  (*Example of composition*)
-  "Comp/Handshake"
-
-  (*Universal properties examples*)
-  "Comp/Counter"
-  "Comp/Counterc"
-  "Comp/Priority"
-
-  "Comp/TimerArray"
-  "Comp/Progress"
-
-  "Comp/Alloc"
-  "Comp/AllocImpl"
-  "Comp/Client"
-
-  (*obsolete*)
-  "ELT"
-
-begin
-
-end