Jan's 4/2 bug 50932 patch

4 files changed, 10 insertions, 12 deletions

diff --git a/docs/sandbox/ubc-design-patterns/docs/readme-1.1.pdf b/docs/sandbox/ubc-design-patterns/docs/readme-1.1.pdf
deleted file mode 100644
index 89d5db0d4..000000000
--- a/docs/sandbox/ubc-design-patterns/docs/readme-1.1.pdf
+++ /dev/null
diff --git a/docs/sandbox/ubc-design-patterns/docs/readme.pdf b/docs/sandbox/ubc-design-patterns/docs/readme.pdf
new file mode 100644
index 000000000..cde37b24b
--- /dev/null
+++ b/docs/sandbox/ubc-design-patterns/docs/readme.pdf
diff --git a/docs/sandbox/ubc-design-patterns/docs/readme-1.1.txt b/docs/sandbox/ubc-design-patterns/docs/readme.txt
index 4be660c35..8908cf8b6 100644
--- a/docs/sandbox/ubc-design-patterns/docs/readme-1.1.txt
+++ b/docs/sandbox/ubc-design-patterns/docs/readme.txt
@@ -1,5 +1,5 @@
 Implementations of GoF Design Patterns in Java and AspectJ
-Code base documentation (March 2, 2004)
+Code base documentation (April 2, 2004)
 
 
 Overview
@@ -13,8 +13,8 @@ While all files are extensively documented using ajdoc (the AspectJ version of j
 Within the ajdoc documentation, we tried to separate type names used in our examples from role names (as presented in GoF). We show roles names in italics and actual type names in code font.
 
 Questions, feedback, suggestions, etc.
-The AODP web page is http://www.cs.ubc.ca/labs/spl/projects/aodps.html
-Please send all questions, feedback, and suggestions to Jan Hannemann (jan@cs.ubc.ca). We are very much interested in improving our code. Please do not hesitate to drop us a line.
+The AODP web page is http://www.cs.ubc.ca/labs/spl/aodp.html
+Please send all questions, feedback, and suggestions to Jan Hannemann (jan [AT] cs.ubc.ca). We are very much interested in improving our code. Please do not hesitate to drop us a line.
 
 
 ===============================
@@ -27,11 +27,8 @@ This appendix outlines how to compile and run the examples provided. DOS batch f
 A1: Using the Eclipse IDE
 Setting up your system and running the examples
 1. Install Eclipse (www.eclipse.org) and AJDT (www.eclipse.org/ajdt). Currently AJDT only works with release 2.1.X and not with version 3.0+ of Eclipse. Check the AJDT web page for more information and updates.
-2. Create a new AspectJ project
-3. Import the ZIP file with the AOP pattern examples into your project  
-4. Set the source directory to "Design Pattern Examples/src" (under: Project / Properties / Java Build Path / Source). Set/adjust the output directory is desired.
-5. Compile
-6. Run individual examples by selecting the appropriate source folder and selecting Run As / Java Application.
+2. Import the ZIP file with the AOP pattern examples into Eclipse
+3. Compile & run
 
 
 A2: Using other AspectJ-compatible IDEs
@@ -55,5 +52,4 @@ Run a compiled example (e.g. observer). Choose one:
 java ca.ubc.cs.spl.aspectPatterns.examples.observer.java.Main (for the AspectJ version)
 
 
-		March 2, 2004
-
+		April 2, 2004
diff --git a/docs/sandbox/ubc-design-patterns/patterns-test.xml b/docs/sandbox/ubc-design-patterns/patterns-test.xml
index 717162536..be5f4f4b6 100644
--- a/docs/sandbox/ubc-design-patterns/patterns-test.xml
+++ b/docs/sandbox/ubc-design-patterns/patterns-test.xml
@@ -14,7 +14,7 @@
 
 	<ajc-test dir="src" 
 		title="UBC design patterns library">
-		<compile sourceroots="ca/ubc/cs/spl/aspectPatterns/patternLibrary"/>
+		<compile sourceroots="ca/ubc/cs/spl/aspectPatterns/patternLibrary" />
 	</ajc-test>
 
 	<ajc-test dir="src" 
@@ -59,7 +59,9 @@
 
 	<ajc-test dir="src" 
 		title="UBC design patterns facade">
-		<compile sourceroots="ca/ubc/cs/spl/aspectPatterns/patternLibrary,ca/ubc/cs/spl/aspectPatterns/examples/facade/aspectj"/>
+		<compile sourceroots="ca/ubc/cs/spl/aspectPatterns/patternLibrary,ca/ubc/cs/spl/aspectPatterns/examples/facade/aspectj">
+			<message kind="warning" line="72" />
+		</compile>
 	</ajc-test>
 
 	<ajc-test dir="src"