From d1c653f74c7bbfc61b78120a505f43212925d557 Mon Sep 17 00:00:00 2001 From: zafarella Date: Thu, 13 Aug 2015 01:31:49 -0400 Subject: [PATCH 1/8] add draft --- singleton/presentation/index.html | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 singleton/presentation/index.html diff --git a/singleton/presentation/index.html b/singleton/presentation/index.html new file mode 100644 index 000000000..238bdb50f --- /dev/null +++ b/singleton/presentation/index.html @@ -0,0 +1,57 @@ + + + + + Circular Slides - impress.js + + + +
+
My Slides +
+
Slide 1
+
Slide 2
+
Slide 3
+
Slide 4
+ +
+
+ + + From 4ee25105b90366dd5a498256ad177590274796e9 Mon Sep 17 00:00:00 2001 From: zafarella Date: Wed, 9 Sep 2015 17:39:44 -0400 Subject: [PATCH 2/8] add checkstyle to check against google standard --- checkstyle.xml | 202 +++++++++++++++++++++++ pom.xml | 431 ++++++++++++++++++++++++++----------------------- 2 files changed, 430 insertions(+), 203 deletions(-) create mode 100644 checkstyle.xml diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 000000000..e79788f46 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 7b0d80bd8..68fd2254e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,211 +1,236 @@ - - 4.0.0 + + 4.0.0 - com.iluwatar - java-design-patterns - 1.6.0 - pom + com.iluwatar + java-design-patterns + 1.6.0 + pom - - UTF-8 - 5.0.0.Final - 1.8.2.RELEASE - 1.4.188 - 4.12 - 3.0 - 3.1.0 - 0.7.2.201409121644 - 1.4 - 2.15.3 - - - abstract-factory - builder - factory-method - prototype - singleton - adapter - bridge - composite - dao - decorator - facade - flyweight - proxy - chain - command - interpreter - iterator - mediator - memento - model-view-presenter - observer - state - strategy - template-method - visitor - double-checked-locking - servant - service-locator - null-object - event-aggregator - callback - execute-around - property - intercepting-filter - poison-pill - lazy-loading - service-layer - specification - tolerant-reader - model-view-controller - flux - double-dispatch - multiton - resource-acquisition-is-initialization - thread-pool - private-class-data - object-pool - dependency-injection - naked-objects - front-controller - repository - async-method-invocation - business-delegate - half-sync-half-async - step-builder - layers - message-channel - + + UTF-8 + 5.0.0.Final + 1.8.2.RELEASE + 1.4.188 + 4.12 + 3.0 + 3.1.0 + 0.7.2.201409121644 + 1.4 + 2.15.3 + + + abstract-factory + builder + factory-method + prototype + singleton + adapter + bridge + composite + dao + decorator + facade + flyweight + proxy + chain + command + interpreter + iterator + mediator + memento + model-view-presenter + observer + state + strategy + template-method + visitor + double-checked-locking + servant + service-locator + null-object + event-aggregator + callback + execute-around + property + intercepting-filter + poison-pill + lazy-loading + service-layer + specification + tolerant-reader + model-view-controller + flux + double-dispatch + multiton + resource-acquisition-is-initialization + thread-pool + private-class-data + object-pool + dependency-injection + naked-objects + front-controller + repository + async-method-invocation + business-delegate + half-sync-half-async + step-builder + layers + message-channel + - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.springframework.data - spring-data-jpa - ${spring-data.version} - - - com.h2database - h2 - ${h2.version} - - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - org.apache.camel - camel-core - ${camel.version} - - - org.apache.camel - camel-stream - ${camel.version} - - - junit - junit - ${junit.version} - test - - - + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + + + org.springframework.data + spring-data-jpa + ${spring-data.version} + + + com.h2database + h2 + ${h2.version} + + + commons-dbcp + commons-dbcp + ${commons-dbcp.version} + + + org.apache.camel + camel-core + ${camel.version} + + + org.apache.camel + camel-stream + ${camel.version} + + + junit + junit + ${junit.version} + test + + + - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jacoco - - jacoco-maven-plugin - - - [0.6.2,) - - - prepare-agent - - - - - - - - - - - - + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jacoco + + jacoco-maven-plugin + + + [0.6.2,) + + + prepare-agent + + + + + + + + + + + + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - org.eluder.coveralls - coveralls-maven-plugin - ${coveralls.version} - - jb6wYzxkVvjolD6qOWpzWdcWBzYk2fAmF - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - - domainapp/dom/modules/simple/QSimpleObject.class - - - - - prepare-agent - - prepare-agent - - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.version} + + 1.8 + 1.8 + + + + org.eluder.coveralls + coveralls-maven-plugin + ${coveralls.version} + + jb6wYzxkVvjolD6qOWpzWdcWBzYk2fAmF + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + + domainapp/dom/modules/simple/QSimpleObject.class + + + + + prepare-agent + + prepare-agent + + + + - \ No newline at end of file + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.15 + + + validate + + check + + validate + + checkstyle.xml + UTF-8 + true + false + + + + + + + + From e97c5a1f9550dc498b647010672290977dc9f7d7 Mon Sep 17 00:00:00 2001 From: zafarella Date: Wed, 9 Sep 2015 17:41:28 -0400 Subject: [PATCH 3/8] delete presentation --- singleton/presentation/index.html | 57 ------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 singleton/presentation/index.html diff --git a/singleton/presentation/index.html b/singleton/presentation/index.html deleted file mode 100644 index 238bdb50f..000000000 --- a/singleton/presentation/index.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - Circular Slides - impress.js - - - -
-
My Slides -
-
Slide 1
-
Slide 2
-
Slide 3
-
Slide 4
- -
-
- - - From 5aa3eb4652c8606b92c521452c07a43d47c4806a Mon Sep 17 00:00:00 2001 From: zafarella Date: Wed, 9 Sep 2015 17:43:21 -0400 Subject: [PATCH 4/8] reformat rules --- checkstyle.xml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index e79788f46..0ff943d95 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -23,7 +23,7 @@ --> - + @@ -38,7 +38,8 @@ - + @@ -55,7 +56,8 @@ - + @@ -64,7 +66,8 @@ - + @@ -159,12 +162,14 @@ - + - + @@ -176,7 +181,8 @@ - + From f12de5cae4cc11b830914d4c333ad20df41edd3b Mon Sep 17 00:00:00 2001 From: zafarella Date: Wed, 9 Sep 2015 17:45:20 -0400 Subject: [PATCH 5/8] preserve tabs instead of space --- pom.xml | 450 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 225 insertions(+), 225 deletions(-) diff --git a/pom.xml b/pom.xml index 68fd2254e..10f37ccfe 100644 --- a/pom.xml +++ b/pom.xml @@ -1,236 +1,236 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.iluwatar - java-design-patterns - 1.6.0 - pom + com.iluwatar + java-design-patterns + 1.6.0 + pom - - UTF-8 - 5.0.0.Final - 1.8.2.RELEASE - 1.4.188 - 4.12 - 3.0 - 3.1.0 - 0.7.2.201409121644 - 1.4 - 2.15.3 - - - abstract-factory - builder - factory-method - prototype - singleton - adapter - bridge - composite - dao - decorator - facade - flyweight - proxy - chain - command - interpreter - iterator - mediator - memento - model-view-presenter - observer - state - strategy - template-method - visitor - double-checked-locking - servant - service-locator - null-object - event-aggregator - callback - execute-around - property - intercepting-filter - poison-pill - lazy-loading - service-layer - specification - tolerant-reader - model-view-controller - flux - double-dispatch - multiton - resource-acquisition-is-initialization - thread-pool - private-class-data - object-pool - dependency-injection - naked-objects - front-controller - repository - async-method-invocation - business-delegate - half-sync-half-async - step-builder - layers - message-channel - + + UTF-8 + 5.0.0.Final + 1.8.2.RELEASE + 1.4.188 + 4.12 + 3.0 + 3.1.0 + 0.7.2.201409121644 + 1.4 + 2.15.3 + + + abstract-factory + builder + factory-method + prototype + singleton + adapter + bridge + composite + dao + decorator + facade + flyweight + proxy + chain + command + interpreter + iterator + mediator + memento + model-view-presenter + observer + state + strategy + template-method + visitor + double-checked-locking + servant + service-locator + null-object + event-aggregator + callback + execute-around + property + intercepting-filter + poison-pill + lazy-loading + service-layer + specification + tolerant-reader + model-view-controller + flux + double-dispatch + multiton + resource-acquisition-is-initialization + thread-pool + private-class-data + object-pool + dependency-injection + naked-objects + front-controller + repository + async-method-invocation + business-delegate + half-sync-half-async + step-builder + layers + message-channel + - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.springframework.data - spring-data-jpa - ${spring-data.version} - - - com.h2database - h2 - ${h2.version} - - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - org.apache.camel - camel-core - ${camel.version} - - - org.apache.camel - camel-stream - ${camel.version} - - - junit - junit - ${junit.version} - test - - - + + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + + + org.springframework.data + spring-data-jpa + ${spring-data.version} + + + com.h2database + h2 + ${h2.version} + + + commons-dbcp + commons-dbcp + ${commons-dbcp.version} + + + org.apache.camel + camel-core + ${camel.version} + + + org.apache.camel + camel-stream + ${camel.version} + + + junit + junit + ${junit.version} + test + + + - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jacoco - - jacoco-maven-plugin - - - [0.6.2,) - - - prepare-agent - - - - - - - - - - - - + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jacoco + + jacoco-maven-plugin + + + [0.6.2,) + + + prepare-agent + + + + + + + + + + + + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - org.eluder.coveralls - coveralls-maven-plugin - ${coveralls.version} - - jb6wYzxkVvjolD6qOWpzWdcWBzYk2fAmF - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - - domainapp/dom/modules/simple/QSimpleObject.class - - - - - prepare-agent - - prepare-agent - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.version} + + 1.8 + 1.8 + + + + org.eluder.coveralls + coveralls-maven-plugin + ${coveralls.version} + + jb6wYzxkVvjolD6qOWpzWdcWBzYk2fAmF + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + + domainapp/dom/modules/simple/QSimpleObject.class + + + + + prepare-agent + + prepare-agent + + + + - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.15 - - - validate - - check - - validate - - checkstyle.xml - UTF-8 - true - false - - - - - - + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.15 + + + validate + + check + + validate + + checkstyle.xml + UTF-8 + true + false + + + + + + From 31537a238324987c7ca3dcf53df8fb33945e8d9c Mon Sep 17 00:00:00 2001 From: zafarella Date: Wed, 9 Sep 2015 19:05:34 -0400 Subject: [PATCH 6/8] suppress checkstyle warnings due to travis failure because of huge logs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10f37ccfe..b65a30712 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ checkstyle.xml UTF-8 - true + false false From 3ebc64c5d689cd200d979d36d2895975a778b8b2 Mon Sep 17 00:00:00 2001 From: zafarella Date: Thu, 13 Aug 2015 01:31:49 -0400 Subject: [PATCH 7/8] add draft --- singleton/presentation/index.html | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 singleton/presentation/index.html diff --git a/singleton/presentation/index.html b/singleton/presentation/index.html new file mode 100644 index 000000000..238bdb50f --- /dev/null +++ b/singleton/presentation/index.html @@ -0,0 +1,57 @@ + + + + + Circular Slides - impress.js + + + +
+
My Slides +
+
Slide 1
+
Slide 2
+
Slide 3
+
Slide 4
+ +
+
+ + + From 266aca20c781c0ca146f52685bd6008edbc1bb01 Mon Sep 17 00:00:00 2001 From: zafarella Date: Fri, 11 Sep 2015 18:30:17 -0400 Subject: [PATCH 8/8] delete presentation from branch --- singleton/presentation/index.html | 57 ------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 singleton/presentation/index.html diff --git a/singleton/presentation/index.html b/singleton/presentation/index.html deleted file mode 100644 index 238bdb50f..000000000 --- a/singleton/presentation/index.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - Circular Slides - impress.js - - - -
-
My Slides -
-
Slide 1
-
Slide 2
-
Slide 3
-
Slide 4
- -
-
- - -