Moved to Java 6 and removed unnecessary files.

kabutz · Oct 4, 2012 · 2e16555 · 2e16555
1 parent 42861af
commit 2e16555
Show file tree

Hide file tree

Showing 25 changed files with 178 additions and 373 deletions.
diff --git a/DeadlockLabJavaOne2012.ipr b/DeadlockLabJavaOne2012.ipr
@@ -35,7 +35,7 @@
     <entry_points version="2.0" />
   </component>
   <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.7" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
   </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" />
@@ -217,7 +217,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">

diff --git a/DeadlockLabJavaOne2012.iws b/DeadlockLabJavaOne2012.iws
diff --git a/lab1/lab1.iml b/lab1/lab1.iml
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
   </component>

diff --git a/lab1/pom.xml b/lab1/pom.xml
@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/lab1/src/main/java/eu/javaspecialists/deadlock/lab1/Symposium.java b/lab1/src/main/java/eu/javaspecialists/deadlock/lab1/Symposium.java
@@ -34,7 +34,7 @@ public void run() throws InterruptedException {
         // let the reference to the Symposium escape.
         ExecutorService exec = Executors.newCachedThreadPool();
         CompletionService<String> results =
-                new ExecutorCompletionService<>(exec);
+                new ExecutorCompletionService<String>(exec);
         for (Thinker thinker : thinkers) {
             results.submit(thinker);
         }
@@ -48,4 +48,4 @@ public void run() throws InterruptedException {
         }
         exec.shutdown();
     }
-}
+}
diff --git a/lab1/src/main/java/eu/javaspecialists/deadlock/lab1solution/Krasi.java b/lab1/src/main/java/eu/javaspecialists/deadlock/lab1solution/Krasi.java
@@ -18,7 +18,7 @@ public class Krasi implements Comparable<Krasi> {
 
     @Override
     public int compareTo(Krasi o) {
-        return Integer.compare(cupNumber, o.cupNumber);
+        return (cupNumber < o.cupNumber) ? -1 : ((cupNumber == o.cupNumber) ? 0 : 1);
     }
 
     @Override

diff --git a/lab1/src/main/java/eu/javaspecialists/deadlock/lab1solution/Symposium.java b/lab1/src/main/java/eu/javaspecialists/deadlock/lab1solution/Symposium.java
@@ -34,7 +34,7 @@ public void run() throws InterruptedException {
         // let the reference to the Symposium escape.
         ExecutorService exec = Executors.newCachedThreadPool();
         CompletionService<String> results =
-                new ExecutorCompletionService<>(exec);
+                new ExecutorCompletionService<String>(exec);
         for (Thinker thinker : thinkers) {
             results.submit(thinker);
         }
@@ -48,4 +48,4 @@ public void run() throws InterruptedException {
         }
         exec.shutdown();
     }
-}
+}
diff --git a/lab2/lab2.iml b/lab2/lab2.iml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
   </component>

diff --git a/lab2/pom.xml b/lab2/pom.xml
@@ -30,8 +30,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.5.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
 			<plugin>

diff --git a/lab2/src/main/java/eu/javaspecialists/deadlock/lab2/Symposium.java b/lab2/src/main/java/eu/javaspecialists/deadlock/lab2/Symposium.java
@@ -34,7 +34,7 @@ public void run() throws InterruptedException {
         // let the reference to the Symposium escape.
         ExecutorService exec = Executors.newCachedThreadPool();
         CompletionService<String> results =
-                new ExecutorCompletionService<>(exec);
+                new ExecutorCompletionService<String>(exec);
         for (Thinker thinker : thinkers) {
             results.submit(thinker);
         }
@@ -48,4 +48,4 @@ public void run() throws InterruptedException {
         }
         exec.shutdown();
     }
-}
+}
diff --git a/lab2/src/main/java/eu/javaspecialists/deadlock/lab2solution/Symposium.java b/lab2/src/main/java/eu/javaspecialists/deadlock/lab2solution/Symposium.java
@@ -34,7 +34,7 @@ public void run() throws InterruptedException {
         // let the reference to the Symposium escape.
         ExecutorService exec = Executors.newCachedThreadPool();
         CompletionService<String> results =
-                new ExecutorCompletionService<>(exec);
+                new ExecutorCompletionService<String>(exec);
         for (Thinker thinker : thinkers) {
             results.submit(thinker);
         }
@@ -48,4 +48,4 @@ public void run() throws InterruptedException {
         }
         exec.shutdown();
     }
-}
+}
diff --git a/lab2/src/main/java/eu/javaspecialists/deadlock/lab2solutioncounting/Symposium.java b/lab2/src/main/java/eu/javaspecialists/deadlock/lab2solutioncounting/Symposium.java
@@ -35,7 +35,7 @@ public void run() throws InterruptedException {
         // let the reference to the Symposium escape.
         ExecutorService exec = Executors.newCachedThreadPool();
         CompletionService<String> results =
-                new ExecutorCompletionService<>(exec);
+                new ExecutorCompletionService<String>(exec);
         for (Thinker thinker : thinkers) {
             results.submit(thinker);
         }
@@ -54,4 +54,4 @@ public void run() throws InterruptedException {
                     thinkers[i].getRetry());
         }
     }
-}
+}
diff --git a/lab3/lab3.iml b/lab3/lab3.iml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/lab3/pom.xml b/lab3/pom.xml
@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/lab4/lab4.iml b/lab4/lab4.iml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/lab4/pom.xml b/lab4/pom.xml
@@ -28,8 +28,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>

diff --git a/labideas/labideas.iml b/labideas/labideas.iml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
   </component>
 </module>
 
diff --git a/labideas/pom.xml b/labideas/pom.xml
@@ -20,7 +20,13 @@
 			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
-	</dependencies>
+   		<dependency>
+   			<groupId>junit</groupId>
+   			<artifactId>junit</artifactId>
+   			<version>4.10</version>
+   			<scope>test</scope>
+   		</dependency>
+   	</dependencies>
 
 	<build>
 		<plugins>

diff --git a/labideas/src/main/java/eu/javaspecialists/deadlock/labideas/basic/App.java b/labideas/src/main/java/eu/javaspecialists/deadlock/labideas/basic/App.java
diff --git a/labideas/src/main/java/eu/javaspecialists/deadlock/labideas/webapp/SaveServlet.java b/labideas/src/main/java/eu/javaspecialists/deadlock/labideas/webapp/SaveServlet.java