Merge remote-tracking branch 'upstream/master' into craedel-enterprise-patterns/front-controller

2016-09-25 11:13:33 +02:00
parent 51c438b469 5b29f1bc81
commit 3b948c9b8b
239 changed files with 6802 additions and 3209 deletions
@@ -31,7 +31,11 @@
            <plugin>
                <groupId>org.eclipse.jetty</groupId>
                <artifactId>jetty-maven-plugin</artifactId>
+<<<<<<< HEAD
                <version>9.3.11.v20160721</version>
+=======
+                <version>9.4.0.M1</version>
+>>>>>>> upstream/master
                <configuration>
                    <webApp>
                        <contextPath>/front-controller</contextPath>
@@ -0,0 +1,22 @@
+@startuml
+
+class Handler {
+doGet
+doPost
+}
+
+abstract class AbstractCommand {
+process
+}
+class ConcreteCommand1 {
+process
+}
+class ConcreteCommand2 {
+process
+}
+
+Handler .right.> AbstractCommand
+AbstractCommand <|-- ConcreteCommand1
+AbstractCommand <|-- ConcreteCommand2
+
+@enduml