diff --git a/lyo-rest-workshop/.gitignore b/lyo-rest-workshop/.gitignore
new file mode 100644
index 0000000..feb7ca1
--- /dev/null
+++ b/lyo-rest-workshop/.gitignore
@@ -0,0 +1,12 @@
+# Build artefacts
+target/
+bin/
+
+# IDE files
+.project
+.classpath
+.settings/
+
+.idea/
+*.iml
+
diff --git a/lyo-rest-workshop/Lab1/.classpath b/lyo-rest-workshop/Lab1/.classpath
deleted file mode 100644
index 4acbfe3..0000000
--- a/lyo-rest-workshop/Lab1/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab1/.project b/lyo-rest-workshop/Lab1/.project
deleted file mode 100644
index 64438fe..0000000
--- a/lyo-rest-workshop/Lab1/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- Lab1
-
-
-
-
-
- org.eclipse.wst.jsdt.core.javascriptValidator
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.wst.jsdt.core.jsNature
-
-
diff --git a/lyo-rest-workshop/Lab1/.settings/.jsdtscope b/lyo-rest-workshop/Lab1/.settings/.jsdtscope
deleted file mode 100644
index b46b920..0000000
--- a/lyo-rest-workshop/Lab1/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab1/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/Lab1/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e06b7a7..0000000
--- a/lyo-rest-workshop/Lab1/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Mon May 07 14:14:26 EDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lyo-rest-workshop/Lab1/.settings/org.eclipse.m2e.core.prefs b/lyo-rest-workshop/Lab1/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f77049e..0000000
--- a/lyo-rest-workshop/Lab1/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Apr 03 16:21:47 EDT 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.common.component b/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 75ffd2f..0000000
--- a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.common.project.facet.core.xml b/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5a88726..0000000
--- a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.jsdt.ui.superType.container b/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.jsdt.ui.superType.name b/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/lyo-rest-workshop/Lab1/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/lyo-rest-workshop/Lab1/src/main/resources/bugz.properties b/lyo-rest-workshop/Lab1/src/main/resources/bugz.properties
index 7025e73..138ba61 100644
--- a/lyo-rest-workshop/Lab1/src/main/resources/bugz.properties
+++ b/lyo-rest-workshop/Lab1/src/main/resources/bugz.properties
@@ -13,6 +13,6 @@
#
# IBM Corporation - initial API and implementation
###############################################################################
-bugzilla_uri=https://landfill.bugzilla.org/bugzilla-4.0-branch/
+bugzilla_uri=http://localhost/bugzilla/
admin=
diff --git a/lyo-rest-workshop/Lab2/.classpath b/lyo-rest-workshop/Lab2/.classpath
deleted file mode 100644
index 8be6238..0000000
--- a/lyo-rest-workshop/Lab2/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab2/.project b/lyo-rest-workshop/Lab2/.project
deleted file mode 100644
index 8080f7b..0000000
--- a/lyo-rest-workshop/Lab2/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Lab2
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/lyo-rest-workshop/Lab2/.settings/.jsdtscope b/lyo-rest-workshop/Lab2/.settings/.jsdtscope
deleted file mode 100644
index b46b920..0000000
--- a/lyo-rest-workshop/Lab2/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab2/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/Lab2/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 326c8ca..0000000
--- a/lyo-rest-workshop/Lab2/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Mon May 07 14:15:25 EDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lyo-rest-workshop/Lab2/.settings/org.eclipse.m2e.core.prefs b/lyo-rest-workshop/Lab2/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f77049e..0000000
--- a/lyo-rest-workshop/Lab2/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Apr 03 16:21:47 EDT 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.common.component b/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 75ffd2f..0000000
--- a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.common.project.facet.core.xml b/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5a88726..0000000
--- a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.jsdt.ui.superType.container b/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.jsdt.ui.superType.name b/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/lyo-rest-workshop/Lab2/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/lyo-rest-workshop/Lab2/src/main/resources/bugz.properties b/lyo-rest-workshop/Lab2/src/main/resources/bugz.properties
index 7025e73..138ba61 100644
--- a/lyo-rest-workshop/Lab2/src/main/resources/bugz.properties
+++ b/lyo-rest-workshop/Lab2/src/main/resources/bugz.properties
@@ -13,6 +13,6 @@
#
# IBM Corporation - initial API and implementation
###############################################################################
-bugzilla_uri=https://landfill.bugzilla.org/bugzilla-4.0-branch/
+bugzilla_uri=http://localhost/bugzilla/
admin=
diff --git a/lyo-rest-workshop/Lab3/.classpath b/lyo-rest-workshop/Lab3/.classpath
deleted file mode 100644
index 8be6238..0000000
--- a/lyo-rest-workshop/Lab3/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab3/.project b/lyo-rest-workshop/Lab3/.project
deleted file mode 100644
index 83f4550..0000000
--- a/lyo-rest-workshop/Lab3/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Lab3
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/lyo-rest-workshop/Lab3/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/Lab3/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ce57a63..0000000
--- a/lyo-rest-workshop/Lab3/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Wed May 02 15:23:37 EDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lyo-rest-workshop/Lab3/.settings/org.eclipse.m2e.core.prefs b/lyo-rest-workshop/Lab3/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index af7a922..0000000
--- a/lyo-rest-workshop/Lab3/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Apr 18 08:44:45 EDT 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/lyo-rest-workshop/Lab3/src/main/resources/bugz.properties b/lyo-rest-workshop/Lab3/src/main/resources/bugz.properties
index 7025e73..138ba61 100644
--- a/lyo-rest-workshop/Lab3/src/main/resources/bugz.properties
+++ b/lyo-rest-workshop/Lab3/src/main/resources/bugz.properties
@@ -13,6 +13,6 @@
#
# IBM Corporation - initial API and implementation
###############################################################################
-bugzilla_uri=https://landfill.bugzilla.org/bugzilla-4.0-branch/
+bugzilla_uri=http://localhost/bugzilla/
admin=
diff --git a/lyo-rest-workshop/Lab4/.classpath b/lyo-rest-workshop/Lab4/.classpath
deleted file mode 100644
index 8be6238..0000000
--- a/lyo-rest-workshop/Lab4/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab4/.project b/lyo-rest-workshop/Lab4/.project
deleted file mode 100644
index a078be6..0000000
--- a/lyo-rest-workshop/Lab4/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Lab4
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/lyo-rest-workshop/Lab4/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/Lab4/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ce57a63..0000000
--- a/lyo-rest-workshop/Lab4/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Wed May 02 15:23:37 EDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lyo-rest-workshop/Lab4/.settings/org.eclipse.m2e.core.prefs b/lyo-rest-workshop/Lab4/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index af7a922..0000000
--- a/lyo-rest-workshop/Lab4/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Apr 18 08:44:45 EDT 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/lyo-rest-workshop/Lab4/src/main/resources/bugz.properties b/lyo-rest-workshop/Lab4/src/main/resources/bugz.properties
index 7025e73..138ba61 100644
--- a/lyo-rest-workshop/Lab4/src/main/resources/bugz.properties
+++ b/lyo-rest-workshop/Lab4/src/main/resources/bugz.properties
@@ -13,6 +13,6 @@
#
# IBM Corporation - initial API and implementation
###############################################################################
-bugzilla_uri=https://landfill.bugzilla.org/bugzilla-4.0-branch/
+bugzilla_uri=http://localhost/bugzilla/
admin=
diff --git a/lyo-rest-workshop/Lab5/.classpath b/lyo-rest-workshop/Lab5/.classpath
deleted file mode 100644
index 8be6238..0000000
--- a/lyo-rest-workshop/Lab5/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab5/.project b/lyo-rest-workshop/Lab5/.project
deleted file mode 100644
index 38b4bc2..0000000
--- a/lyo-rest-workshop/Lab5/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Lab5
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/lyo-rest-workshop/Lab5/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/Lab5/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ce57a63..0000000
--- a/lyo-rest-workshop/Lab5/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Wed May 02 15:23:37 EDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lyo-rest-workshop/Lab5/.settings/org.eclipse.m2e.core.prefs b/lyo-rest-workshop/Lab5/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index af7a922..0000000
--- a/lyo-rest-workshop/Lab5/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Apr 18 08:44:45 EDT 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/lyo-rest-workshop/Lab5/src/main/resources/bugz.properties b/lyo-rest-workshop/Lab5/src/main/resources/bugz.properties
index 7025e73..138ba61 100644
--- a/lyo-rest-workshop/Lab5/src/main/resources/bugz.properties
+++ b/lyo-rest-workshop/Lab5/src/main/resources/bugz.properties
@@ -13,6 +13,6 @@
#
# IBM Corporation - initial API and implementation
###############################################################################
-bugzilla_uri=https://landfill.bugzilla.org/bugzilla-4.0-branch/
+bugzilla_uri=http://localhost/bugzilla/
admin=
diff --git a/lyo-rest-workshop/Lab6/.classpath b/lyo-rest-workshop/Lab6/.classpath
deleted file mode 100644
index 8be6238..0000000
--- a/lyo-rest-workshop/Lab6/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/Lab6/.project b/lyo-rest-workshop/Lab6/.project
deleted file mode 100644
index 630b84f..0000000
--- a/lyo-rest-workshop/Lab6/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- Lab6
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/lyo-rest-workshop/Lab6/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/Lab6/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ce57a63..0000000
--- a/lyo-rest-workshop/Lab6/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Wed May 02 15:23:37 EDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/lyo-rest-workshop/Lab6/.settings/org.eclipse.m2e.core.prefs b/lyo-rest-workshop/Lab6/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index af7a922..0000000
--- a/lyo-rest-workshop/Lab6/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Apr 18 08:44:45 EDT 2012
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/lyo-rest-workshop/Lab6/src/main/resources/bugz.properties b/lyo-rest-workshop/Lab6/src/main/resources/bugz.properties
index 7025e73..138ba61 100644
--- a/lyo-rest-workshop/Lab6/src/main/resources/bugz.properties
+++ b/lyo-rest-workshop/Lab6/src/main/resources/bugz.properties
@@ -13,6 +13,6 @@
#
# IBM Corporation - initial API and implementation
###############################################################################
-bugzilla_uri=https://landfill.bugzilla.org/bugzilla-4.0-branch/
+bugzilla_uri=http://localhost/bugzilla/
admin=
diff --git a/lyo-rest-workshop/LabMiscellaneous/.project b/lyo-rest-workshop/LabMiscellaneous/.project
deleted file mode 100644
index 7d150f9..0000000
--- a/lyo-rest-workshop/LabMiscellaneous/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- LabMiscellaneous
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/LabMiscellaneous/build.xml b/lyo-rest-workshop/LabMiscellaneous/build.xml
deleted file mode 100644
index 3eb3a89..0000000
--- a/lyo-rest-workshop/LabMiscellaneous/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lyo-rest-workshop/LabMiscellaneous/pom.xml b/lyo-rest-workshop/LabMiscellaneous/pom.xml
deleted file mode 100644
index bdc5d55..0000000
--- a/lyo-rest-workshop/LabMiscellaneous/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- 4.0.0
- oslc.workshop
- build-all
- 0.1.2-SNAPSHOT
- pom
-
-
- ../../org.eclipse.lyo.core/org.eclipse.lyo.oslc4j.core
- ../org.eclipse.lyo.oslc4j.bugzilla
- ../../org.eclipse.lyo.core/org.eclipse.lyo.oslc4j.provider.jena
- ../../org.eclipse.lyo.core/org.eclipse.lyo.oslc4j.provider.json4j
- ../../org.eclipse.lyo.core/org.eclipse.lyo.oslc4j.registry
- ../../org.eclipse.lyo.core/org.eclipse.lyo.oslc4j.wink
-
- ../../org.eclipse.lyo.server/org.eclipse.lyo.server.oauth.consumerstore
-
-
- ../../org.eclipse.lyo.server/org.eclipse.lyo.server.oauth.core
-
-
- ../../org.eclipse.lyo.server/org.eclipse.lyo.server.oauth.webapp
-
- ../Lab1
- ../Lab2
- ../Lab3
- ../Lab4
- ../Lab5
- ../Lab6
-
-
\ No newline at end of file
diff --git a/lyo-rest-workshop/Lab1/Lyo_OSLC_Workshop.pdf b/lyo-rest-workshop/Lyo_OSLC_Workshop.pdf
similarity index 76%
rename from lyo-rest-workshop/Lab1/Lyo_OSLC_Workshop.pdf
rename to lyo-rest-workshop/Lyo_OSLC_Workshop.pdf
index bc29a07..9421967 100644
Binary files a/lyo-rest-workshop/Lab1/Lyo_OSLC_Workshop.pdf and b/lyo-rest-workshop/Lyo_OSLC_Workshop.pdf differ
diff --git a/lyo-rest-workshop/ninacrm/.classpath b/lyo-rest-workshop/ninacrm/.classpath
deleted file mode 100644
index 846abef..0000000
--- a/lyo-rest-workshop/ninacrm/.classpath
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.project b/lyo-rest-workshop/ninacrm/.project
deleted file mode 100644
index c285136..0000000
--- a/lyo-rest-workshop/ninacrm/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
- ninacrm
-
-
-
-
-
- org.eclipse.wst.jsdt.core.javascriptValidator
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.maven.ide.eclipse.maven2Builder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.maven.ide.eclipse.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.wst.jsdt.core.jsNature
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/.jsdtscope b/lyo-rest-workshop/ninacrm/.settings/.jsdtscope
deleted file mode 100644
index 3a28de0..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/all-wcprops b/lyo-rest-workshop/ninacrm/.settings/.svn/all-wcprops
deleted file mode 100644
index 961d640..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/all-wcprops
+++ /dev/null
@@ -1,47 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings
-END
-org.eclipse.jdt.core.prefs
-K 25
-svn:wc:ra_dav:version-url
-V 109
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings/org.eclipse.jdt.core.prefs
-END
-org.eclipse.wst.jsdt.ui.superType.name
-K 25
-svn:wc:ra_dav:version-url
-V 121
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.name
-END
-org.eclipse.wst.jsdt.ui.superType.container
-K 25
-svn:wc:ra_dav:version-url
-V 126
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.container
-END
-org.eclipse.wst.common.project.facet.core.xml
-K 25
-svn:wc:ra_dav:version-url
-V 128
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings/org.eclipse.wst.common.project.facet.core.xml
-END
-.jsdtscope
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings/.jsdtscope
-END
-org.maven.ide.eclipse.prefs
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/svnroot/oslc-tools/!svn/ver/125/examples/java/provider-workshop/ninacrm/.settings/org.maven.ide.eclipse.prefs
-END
-org.eclipse.wst.common.component
-K 25
-svn:wc:ra_dav:version-url
-V 115
-/svnroot/oslc-tools/!svn/ver/158/examples/java/provider-workshop/ninacrm/.settings/org.eclipse.wst.common.component
-END
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/entries b/lyo-rest-workshop/ninacrm/.settings/.svn/entries
deleted file mode 100644
index 3cd905c..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/entries
+++ /dev/null
@@ -1,266 +0,0 @@
-10
-
-dir
-134
-https://oslc-tools.svn.sourceforge.net/svnroot/oslc-tools/examples/java/provider-workshop/ninacrm/.settings
-https://oslc-tools.svn.sourceforge.net/svnroot/oslc-tools
-
-
-
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-fddb901c-4584-4cf9-ab94-73399a1f4b56
-
-org.eclipse.jdt.core.prefs
-file
-
-
-
-
-2011-05-19T13:28:46.000000Z
-515cc40f743e5e7b3453eebdf1fa4e37
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-452
-
-org.eclipse.wst.jsdt.ui.superType.name
-file
-
-
-
-
-2011-05-19T13:28:46.000000Z
-c89686a387d2b12b3c729ce35a0bcb5b
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6
-
-org.eclipse.wst.jsdt.ui.superType.container
-file
-
-
-
-
-2011-05-19T13:28:46.000000Z
-b27d1cf62dde4473bab7c433317bb0ce
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-49
-
-org.eclipse.wst.common.project.facet.core.xml
-file
-
-
-
-
-2011-05-19T13:28:46.000000Z
-41a0d7e975fd6207f85268f65911a799
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-245
-
-.jsdtscope
-file
-
-
-
-
-2011-05-19T13:28:46.000000Z
-a8af45432f8aa5684388bd4a04f145a0
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-491
-
-org.maven.ide.eclipse.prefs
-file
-
-
-
-
-2011-05-19T13:28:46.000000Z
-07f4cfc4673870230d2f56d0cd91392c
-2011-05-17T19:59:49.282818Z
-125
-snoopdave
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-241
-
-org.eclipse.wst.common.component
-file
-158
-
-
-
-2011-05-23T03:33:47.000000Z
-82091372aeb260b932cc31e3bd788cf7
-2011-05-23T04:03:05.406911Z
-158
-sspeiche
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-715
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/.jsdtscope.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/.jsdtscope.svn-base
deleted file mode 100644
index 3a28de0..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/.jsdtscope.svn-base
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base
deleted file mode 100644
index 2bc1d53..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Mar 29 11:43:54 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.common.component.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.common.component.svn-base
deleted file mode 100644
index c486fce..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.common.component.svn-base
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.common.project.facet.core.xml.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.common.project.facet.core.xml.svn-base
deleted file mode 100644
index 7893960..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.common.project.facet.core.xml.svn-base
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.jsdt.ui.superType.container.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.jsdt.ui.superType.container.svn-base
deleted file mode 100644
index 3bd5d0a..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.jsdt.ui.superType.container.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.jsdt.ui.superType.name.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.jsdt.ui.superType.name.svn-base
deleted file mode 100644
index 05bd71b..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.eclipse.wst.jsdt.ui.superType.name.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.maven.ide.eclipse.prefs.svn-base b/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.maven.ide.eclipse.prefs.svn-base
deleted file mode 100644
index c5fbb3c..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/.svn/text-base/org.maven.ide.eclipse.prefs.svn-base
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Mar 01 06:25:42 EST 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.jdt.core.prefs b/lyo-rest-workshop/ninacrm/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 45a6e0e..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/lyo-rest-workshop/ninacrm/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
deleted file mode 100644
index 0edf154..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon May 07 14:18:01 EDT 2012
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.1
-eclipse.preferences.version=1
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.common.component b/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 710a671..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.common.project.facet.core.xml b/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 38059d9..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.container b/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.name b/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/lyo-rest-workshop/ninacrm/.settings/org.maven.ide.eclipse.prefs b/lyo-rest-workshop/ninacrm/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index c5fbb3c..0000000
--- a/lyo-rest-workshop/ninacrm/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Mar 01 06:25:42 EST 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/lyo-rest-workshop/ninacrm/pom.xml b/lyo-rest-workshop/ninacrm/pom.xml
index 4a01f85..3f28045 100644
--- a/lyo-rest-workshop/ninacrm/pom.xml
+++ b/lyo-rest-workshop/ninacrm/pom.xml
@@ -53,7 +53,7 @@
org.eclipse.jetty
jetty-maven-plugin
- 9.3.0.v20150612
+ 9.4.0.M0
/ninacrm