[maven-release-plugin] copy for tag register-app-1.0-RC1

dddsample/checkstyle.xml

@@ -1,221 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-
-    <module name="TreeWalker">
-
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod"/>
-        <module name="JavadocType">
-          <property name="scope" value="public"/>
-        </module>
-        <module name="JavadocVariable">
-          <property name="scope" value="public"/>
-        </module>
-        <module name="JavadocStyle"/>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-
-        <!-- Checks for Headers                                -->
-        <!-- See http://checkstyle.sf.net/config_header.html   -->
-        <!-- <module name="Header">                            -->
-            <!-- The follow property value demonstrates the ability     -->
-            <!-- to have access to ANT properties. In this case it uses -->
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
-            <!-- from any directory within a project. See property      -->
-            <!-- expansion,                                             -->
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
-            <!-- <property                                              -->
-            <!--     name="headerFile"                                  -->
-            <!--     value="${basedir}/java.header"/>                   -->
-        <!-- </module> -->
-
-        <!-- Following interprets the header file as regular expressions. -->
-        <!-- <module name="RegexpHeader"/>                                -->
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
-
-        <module name="LineLength">
-         <property name="max" value="120"/>
-        </module>
-
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="MethodParamPad"/>
-
-        <module name="NoWhitespaceAfter">
-          <!-- Default tokens and additional GENERIC_START -->
-          <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
-        </module>
-        
-        <module name="NoWhitespaceBefore">
-          <!-- Default tokens and additional GENERIC_START and GENERIC_END -->
-          <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
-        </module>
-        
-        <module name="WhitespaceAfter">
-          <!-- Default tokens and additional GENERIC_END -->
-          <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
-        </module>
-        
-        <module name="WhitespaceAround">
-          <!-- Default tokens without GENERIC_START and GENERIC_END -->
-          <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN,
-        BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON,
-        DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, 
-        LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, 
-        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
-        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
-        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN,
-        QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,
-        TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
-        </module>
-        
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MagicNumber"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="RedundantThrows"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <module name="DesignForExtension"/>
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-    </module>
-
-</module>

dddsample/doc/dddsample-format-eclipse.pref

@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="DDDSample App code convention" version="11">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-</profile>
-</profiles>

dddsample/pom.xml

@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>se.citerus</groupId>
-  <artifactId>dddsample</artifactId>
-  <packaging>war</packaging>
-  <name>DDDSample</name>
-  <version>1.0-SNAPSHOT</version>
-  <description>This application shows a few key concepts of
-    Domain Driven Design implemented in Enterprise Java.
-  </description>
-  <url>http://dddsample.sourceforge.net</url>
-  <distributionManagement>
-    <site>
-      <id>sf</id>
-      <url>scp://shell.sf.net/home/groups/d/dd/dddsample/htdocs</url>
-    </site>
-  </distributionManagement>
-  <ciManagement/>
-  <repositories>
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2</url>
-      <layout>default</layout>
-    </repository>
-    <repository>
-      <id>maven-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven 1</name>
-      <url>http://download.java.net/maven/1</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <developers>
-    <developer>
-      <id>eric_evans</id>
-      <name>Eric Evans</name>
-      <email>eric at domainlanguage dot com</email>
-      <organization>Domain Language, Inc.</organization>
-      <organizationUrl>http://www.domainlanguage.com</organizationUrl>
-      <timezone>-8</timezone>
-    </developer>
-    <developer>
-      <id>peba</id>
-      <name>Peter Backlund</name>
-      <email>peter.backlund@citerus.se</email>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>patrikfr</id>
-      <name>Patrik Fredriksson</name>
-      <email>patrikfr@users.sourceforge.net</email>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jeham</id>
-      <name>Jesper Hammarback</name>
-      <email>jeham@users.sourceforge.net</email>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>jorgen_falk</id>
-      <name>Jorgen Falk</name>
-      <email>jorgen.falk@citerus.se</email>
-      <organization>Citerus</organization>
-      <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>MIT</name>
-      <url>http://www.opensource.org/licenses/mit-license.php</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <developerConnection>scm:svn:https://dddsample.svn.sourceforge.net/svnroot/dddsample</developerConnection>
-    <url>http://ddd.sventon.org</url>
-  </scm>
-  <properties>
-    <spring.version>2.5.1</spring.version>
-  </properties>
-  <build>
-    <plugins>
-      <!-- Compiler -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <!-- Jetty servlet container: http://jetty.mortbay.com/maven-plugin -->
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.4</version>
-        <configuration>
-          <scanIntervalSeconds>3</scanIntervalSeconds>
-        </configuration>
-      </plugin>
-
-      <!-- JAX-WS generation plugin -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jaxws-maven-plugin</artifactId>
-        <version>1.9</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>wsgen</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <sei>se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl</sei>
-          <genWsdl>true</genWsdl>
-        </configuration>
-      </plugin>
-
-      <!-- Jar plugin for generation of WS Client classes -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <classifier>ws-client</classifier>
-              <includes>
-                <include>**/se/citerus/dddsample/application/ws/**</include>
-              </includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jms</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.5.ga</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.3.0.ga</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-commons-annotations</artifactId>
-      <version>3.3.0.ga</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>avalon-framework</groupId>
-          <artifactId>avalon-framework</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>sitemesh</artifactId>
-      <version>2.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>5.0.0</version>
-      <exclusions>
-        <!--
-          This is a snapshot dependency, with no published pom.
-          It does not appear to be needed either:
-          
-          http://mail-archives.apache.org/mod_mbox/activemq-commits/200610.mbox/%3C20061005025744.0C6591A981A@eris.apache.org%3E
-        -->
-        <exclusion>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activeio-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.xml</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- JAX-WS integration with Spring. Lots of broken pom files unfortunately,
-      so we need a few excluded-and-overridden dependencies.
-      This problem will mostly go away when we move to Java 6.
-
-      javax.activation is excluded because of class loading issues with Jetty:
-      http://jira.codehaus.org/browse/JETTY-420
-      -->
-    <dependency>
-      <groupId>org.jvnet.jax-ws-commons.spring</groupId>
-      <artifactId>jaxws-spring</artifactId>
-      <version>1.8</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.stream.buffer</groupId>
-          <artifactId>streambuffer</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jvnet.staxex</groupId>
-          <artifactId>stax-ex</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jvnet.staxex</groupId>
-      <artifactId>stax-ex</artifactId>
-      <version>1.2</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.stream.buffer</groupId>
-      <artifactId>streambuffer</artifactId>
-      <version>0.7</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.ws</groupId>
-      <artifactId>jaxws-rt</artifactId>
-      <version>2.1.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.istack</groupId>
-      <artifactId>istack-commons-runtime</artifactId>
-      <version>1.0</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <reporting>
-    <plugins>
-      <!-- Javadoc -->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <!-- Source code cross reference -->
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-      <!-- Test report -->
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-      <!-- Test coverage -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-      </plugin>
-      <!-- CheckStyle report -->
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>checkstyle.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>

dddsample/src/main/java/se/citerus/dddsample/application/messaging/HandlingEventMessageDelegate.java

@@ -1,40 +0,0 @@
-package se.citerus.dddsample.application.messaging;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.service.TrackingService;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-/**
- * Consumes JMS messages and delegates notification of misdirected
- * cargo to the cargo service.
- * <p/>
- * This point of this is to decouple the tracking service from JMS,
- * and to allow a thread-based messaging implementation to live in
- * parallell.
- */
-public class HandlingEventMessageDelegate implements MessageListener {
-
-  private TrackingService trackingService;
-  private final Log logger = LogFactory.getLog(getClass());
-
-  public void onMessage(final Message message) {
-    if (logger.isDebugEnabled()) {
-      logger.debug("Received message " + message);
-    }
-    try {
-      String tidString = message.getStringProperty(JmsDomainEventNotifierImpl.TRACKING_ID_KEY);
-      trackingService.inspectCargo(new TrackingId(tidString));
-    } catch (JMSException e) {
-      logger.error(e, e);
-    }
-  }
-
-  public void setTrackingService(TrackingService trackingService) {
-    this.trackingService = trackingService;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/messaging/JmsDomainEventNotifierImpl.java

@@ -1,38 +0,0 @@
-package se.citerus.dddsample.application.messaging;
-
-import org.springframework.jms.core.JmsOperations;
-import org.springframework.jms.core.MessageCreator;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.service.DomainEventNotifier;
-
-import javax.jms.*;
-
-/**
- * JMS based implementation.
- */
-public final class JmsDomainEventNotifierImpl implements DomainEventNotifier {
-  private JmsOperations jmsOperations;
-  private Destination destination;
-  public static final String TRACKING_ID_KEY = TrackingId.class.getName() + ".KEY";
-
-  public void cargoWasHandled(final HandlingEvent event) {
-    jmsOperations.send(destination, new MessageCreator() {
-      // TODO: richer message type
-      public Message createMessage(final Session session) throws JMSException {
-        final MapMessage message = session.createMapMessage();
-        message.setStringProperty(TRACKING_ID_KEY, event.cargo().trackingId().idString());
-        return message;
-      }
-
-    });
-  }
-
-  public void setJmsOperations(final JmsOperations jmsOperations) {
-    this.jmsOperations = jmsOperations;
-  }
-
-  public void setDestination(final Destination destination) {
-    this.destination = destination;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/messaging/ThreadBasedDomainEventNotifierImpl.java

@@ -1,25 +0,0 @@
-package se.citerus.dddsample.application.messaging;
-
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.service.DomainEventNotifier;
-import se.citerus.dddsample.domain.service.TrackingService;
-
-/**
- * Thread based implementation.
- */
-public class ThreadBasedDomainEventNotifierImpl implements DomainEventNotifier {
-
-  private TrackingService trackingService;
-
-  public void cargoWasHandled(final HandlingEvent event) {
-    new Thread(new Runnable() {
-      public void run() {
-        trackingService.inspectCargo(event.cargo().trackingId());
-      }
-    }).start();
-  }
-
-  public void setTrackingService(TrackingService trackingService) {
-    this.trackingService = trackingService;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/messaging/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Asynchronous messaging, both JMS and simple thread-based. This is part of the infrastructure.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/package.html

@@ -1,14 +0,0 @@
-<html>
-<body>
-<p>
-  This is the application layer: code that's needed for the application to
-  performs its tasks. This includes code that directly depends on external libraries
-  such as Hibernate and Spring MVC, implementations of JMS interfaces, remoting and so on.
-</p>
-<p>
-  This part is very technology-heavy and generally not comprehensible to the domain expert,
-  unlike the domain part. It is thin in terms of knowledge of domain business logic,
-  although it may be large in terms of lines of code.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/persistence/CargoRepositoryHibernate.java

@@ -1,62 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * Hibernate implementation of CargoRepository.
- */
-@Repository
-public class CargoRepositoryHibernate extends HibernateRepository implements CargoRepository {
-
-  public Cargo find(TrackingId tid) {
-    // Query for id and then perform a standard load().
-    // This way we use the metadata-defined way of loading the aggregate
-    // in an efficient way (generally a complete aggregate at a time),
-    // and we can benefi from the identifier-keyed second level cache
-    // without havng to cache individual queries.
-    Long id = (Long) getSession().
-       createQuery("select id from Cargo where trackingId = :tid").
-       setParameter("tid", tid).
-       uniqueResult();
-
-    if (id != null) {
-      return (Cargo) getSession().get(Cargo.class, id);
-    } else {
-      return null;
-    }
-
-
-  }
-
-  public void save(Cargo cargo) {
-    getSession().persist(cargo);
-
-    // Delete orphaned itineraries - conceptually the responsibility
-    // of the Cargo aggregate
-    final List<Itinerary> orphans = getSession().
-       createQuery("from Itinerary where cargo = null").
-       list();
-    for (Itinerary orphan : orphans) {
-      getSession().delete(orphan);
-    }
-  }
-
-  public TrackingId nextTrackingId() {
-    final String random = UUID.randomUUID().toString().toUpperCase();
-    return new TrackingId(
-       random.substring(0, random.indexOf("-"))
-    );
-  }
-
-  public List<Cargo> findAll() {
-    return getSession().createQuery("from Cargo").list();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/CarrierMovementRepositoryHibernate.java

@@ -1,21 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-
-/**
- * Hibernate implementation of CarrierMovementRepository.
- */
-@Repository
-public final class CarrierMovementRepositoryHibernate extends HibernateRepository implements CarrierMovementRepository {
-
-  public CarrierMovement find(final CarrierMovementId carrierMovementId) {
-    return (CarrierMovement) getSession().
-      createQuery("from CarrierMovement where carrierMovementId = ?").
-      setParameter(0, carrierMovementId).
-      uniqueResult();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/HandlingEventRepositoryHibernate.java

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-
-import java.util.List;
-
-/**
- * Hibernate implementation of HandlingEventRepository.
- *
- */
-@Repository
-public class HandlingEventRepositoryHibernate extends HibernateRepository implements HandlingEventRepository {
-
-  public void save(HandlingEvent event) {
-    getSession().save(event);
-  }
-
-  public List<HandlingEvent> findEventsForCargo(TrackingId tid) {
-    return getSession().createQuery(
-            "from HandlingEvent where cargo.trackingId = :tid order by completionTime").
-            setParameter("tid", tid).
-            list();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/HibernateRepository.java

@@ -1,23 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Required;
-
-/**
- * Functionality common to all Hibernate repositories.
- */
-public abstract class HibernateRepository {
-
-  private SessionFactory sessionFactory;
-
-  @Required
-  public void setSessionFactory(final SessionFactory sessionFactory) {
-    this.sessionFactory = sessionFactory;
-  }
-
-  protected Session getSession() {
-    return sessionFactory.getCurrentSession();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/LocationRepositoryHibernate.java

@@ -1,24 +0,0 @@
-package se.citerus.dddsample.application.persistence;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.List;
-
-@Repository
-public final class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
-
-  public Location find(final UnLocode unLocode) {
-    return (Location) getSession().
-      createQuery("from Location where unLocode = ?").
-      setParameter(0, unLocode).
-      uniqueResult();
-  }
-
-  public List<Location> findAll() {
-    return getSession().createQuery("from Location").list();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/persistence/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Hibernate implementations of the repository interfaces. This is part of the infrastructure.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacade.java

@@ -1,30 +0,0 @@
-package se.citerus.dddsample.application.remoting;
-
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.List;
-
-/**
- * This facade shields the domain layer - model, services, repositories -
- * from concerns about such things as the user interface and remoting.
- * It is an application service.
- */
-public interface BookingServiceFacade extends Remote {
-
-  String registerNewCargo(String origin, String destination) throws RemoteException;
-
-  CargoRoutingDTO loadCargoForRouting(String trackingId) throws RemoteException;
-
-  void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itinerary) throws RemoteException;
-
-  List<ItineraryCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException;
-
-  List<LocationDTO> listShippingLocations() throws RemoteException;
-
-  List<CargoRoutingDTO> listAllCargos() throws RemoteException;
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java

@@ -1,99 +0,0 @@
-package se.citerus.dddsample.application.remoting;
-
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.application.remoting.dto.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.application.remoting.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.application.remoting.dto.assembler.LocationDTOAssembler;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.BookingService;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * This implementation has additional support from the infrastructure, for exposing as an RMI
- * service and for keeping the OR-mapper unit-of-work open during DTO assembly,
- * analogous to the view rendering for web interfaces.
- *
- * See context-remote.xml.  
- */
-public class BookingServiceFacadeImpl implements BookingServiceFacade {
-
-  private BookingService bookingService;
-  private LocationRepository locationRepository;
-  private CargoRepository cargoRepository;
-  private CarrierMovementRepository carrierMovementRepository;
-
-  public List<LocationDTO> listShippingLocations() {
-    final List<Location> allLocations = locationRepository.findAll();
-    final LocationDTOAssembler assembler = new LocationDTOAssembler();
-    return assembler.toDTOList(allLocations);
-  }
-
-  public String registerNewCargo(String origin, String destination) {
-    TrackingId trackingId = bookingService.bookNewCargo(new UnLocode(origin), new UnLocode(destination));
-    return trackingId.idString();
-  }
-
-  public CargoRoutingDTO loadCargoForRouting(String trackingId) {
-    // TODO lock
-    final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
-    return assembler.toDTO(cargo);
-  }
-
-  public void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itineraryCandidateDTO) {
-    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, carrierMovementRepository, locationRepository);
-    bookingService.assignCargoToRoute(new TrackingId(trackingId), itinerary);
-    // TODO unlock
-  }
-
-  public List<CargoRoutingDTO> listAllCargos() {
-    final List<Cargo> cargoList = cargoRepository.findAll();
-    final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(cargoList.size());
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
-    for (Cargo cargo : cargoList) {
-      dtoList.add(assembler.toDTO(cargo));
-    }
-    return dtoList;
-  }
-
-  public List<ItineraryCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException {
-    final List<Itinerary> itineraries = bookingService.requestPossibleRoutesForCargo(new TrackingId(trackingId));
-
-    final List<ItineraryCandidateDTO> itineraryCandidates = new ArrayList<ItineraryCandidateDTO>(itineraries.size());
-    final ItineraryCandidateDTOAssembler dtoAssembler = new ItineraryCandidateDTOAssembler();
-    for (Itinerary itinerary : itineraries) {
-      itineraryCandidates.add(dtoAssembler.toDTO(itinerary));
-    }
-
-    return itineraryCandidates;
-  }
-
-  public void setBookingService(BookingService bookingService) {
-    this.bookingService = bookingService;
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/CargoRoutingDTO.java

@@ -1,59 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * DTO for registering and routing a cargo.
- */
-public final class CargoRoutingDTO implements Serializable {
-
-  private final String trackingId;
-  private final String origin;
-  private final String finalDestination;
-  private final List<LegDTO> legs;
-
-  /**
-   * Constructor.
-   *
-   * @param trackingId
-   * @param origin
-   * @param finalDestination
-   */
-  public CargoRoutingDTO(final String trackingId, final String origin, final String finalDestination) {
-    this.trackingId = trackingId;
-    this.origin = origin;
-    this.finalDestination = finalDestination;
-    this.legs = new ArrayList<LegDTO>();
-  }
-
-  public String getTrackingId() {
-    return trackingId;
-  }
-
-  public String getOrigin() {
-    return origin;
-  }
-
-  public String getFinalDestination() {
-    return finalDestination;
-  }
-
-  public void addLeg(final String carrierMovementId, final String from, final String to) {
-    legs.add(new LegDTO(carrierMovementId, from, to));
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<LegDTO> getLegs() {
-    return Collections.unmodifiableList(legs);
-  }
-
-  public boolean isRouted() {
-    return !legs.isEmpty();
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/HandlingEventDTO.java

@@ -1,54 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * DTO for a handling event.
- */
-public final class HandlingEventDTO implements Serializable {
-
-  private final String type;
-  private final String location;
-  private final String carrier;
-  private final Date time;
-  private boolean expected;
-
-  /**
-   * Constructor.
-   *
-   * @param location
-   * @param type
-   * @param carrier
-   * @param time
-   * @param expected
-   */
-  public HandlingEventDTO(final String location, final String type, final String carrier, final Date time,
-                          final boolean expected) {
-    this.location = location;
-    this.type = type;
-    this.carrier = carrier;
-    this.time = time;
-    this.expected = expected;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public Date getTime() {
-    return time;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public String getCarrier() {
-    return carrier;
-  }
-
-  public boolean isExpected() {
-    return expected;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/ItineraryCandidateDTO.java

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * DTO for presenting and selecting an itinerary from a collection of candidates.
- */
-public final class ItineraryCandidateDTO implements Serializable {
-
-  private final List<LegDTO> legs;
-
-  /**
-   * Constructor.
-   *
-   * @param legs The legs for this itinerary.
-   */
-  public ItineraryCandidateDTO(final List<LegDTO> legs) {
-    this.legs = legs;
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<LegDTO> getLegs() {
-    return Collections.unmodifiableList(legs);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/LegDTO.java

@@ -1,39 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-
-/**
- * DTO for a leg in an itinerary.
- */
-public final class LegDTO implements Serializable {
-
-  private final String carrierMovementId;
-  private final String from;
-  private final String to;
-
-  /**
-   * Constructor.
-   *
-   * @param carrierMovementId
-   * @param from
-   * @param to
-   */
-  public LegDTO(final String carrierMovementId, final String from, final String to) {
-    this.carrierMovementId = carrierMovementId;
-    this.from = from;
-    this.to = to;
-  }
-
-  public String getCarrierMovementId() {
-    return carrierMovementId;
-  }
-
-  public String getFrom() {
-    return from;
-  }
-
-  public String getTo() {
-    return to;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/LocationDTO.java

@@ -1,26 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-
-/**
- * Location DTO.
- */
-public class LocationDTO implements Serializable {
-
-  private final String unLocode;
-  private final String name;
-
-  public LocationDTO(String unLocode, String name) {
-    this.unLocode = unLocode;
-    this.name = name;
-  }
-
-  public String getUnLocode() {
-    return unLocode;
-  }
-
-  public String getName() {
-    return name;
-  }
-  
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/CargoRoutingDTOAssembler.java

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
-
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.Leg;
-
-/**
- * Assembler class for the CargoRoutingDTO.
- */
-public class CargoRoutingDTOAssembler {
-
-  public CargoRoutingDTO toDTO(final Cargo cargo) {
-    final CargoRoutingDTO dto = new CargoRoutingDTO(
-      cargo.trackingId().idString(),
-      cargo.origin().toString(),
-      cargo.destination().toString()
-    );
-    for (Leg leg : cargo.itinerary().legs()) {
-      dto.addLeg(
-        leg.carrierMovement().carrierMovementId().idString(),
-        leg.from().toString(),
-        leg.to().toString()
-      );
-    }
-    return dto;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -1,48 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
-
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LegDTO;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.Leg;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Assembler class for the ItineraryCandidateDTO.
- */
-public class ItineraryCandidateDTOAssembler {
-  
-  public ItineraryCandidateDTO toDTO(final Itinerary itinerary) {
-    final List<LegDTO> legDTOs = new ArrayList<se.citerus.dddsample.application.remoting.dto.LegDTO>(itinerary.legs().size());
-    for (Leg leg : itinerary.legs()) {
-      legDTOs.add(toLegDTO(leg));
-    }
-    return new ItineraryCandidateDTO(legDTOs);
-  }
-
-  protected LegDTO toLegDTO(final Leg leg) {
-    final CarrierMovementId carrierMovementId = leg.carrierMovement().carrierMovementId();
-    final UnLocode from = leg.from().unLocode();
-    final UnLocode to = leg.to().unLocode();
-    return new LegDTO(carrierMovementId.idString(), from.idString(), to.idString());
-  }
-
-  public Itinerary fromDTO(ItineraryCandidateDTO itineraryCandidateDTO, CarrierMovementRepository carrierMovementRepository, LocationRepository locationRepository) {
-    final List<Leg> legs = new ArrayList<Leg>(itineraryCandidateDTO.getLegs().size());
-    for (LegDTO legDTO : itineraryCandidateDTO.getLegs()) {
-      final CarrierMovementId carrierMovementId = new CarrierMovementId(legDTO.getCarrierMovementId());
-      final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
-      final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
-      final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
-      legs.add(new Leg(carrierMovement, from, to));
-    }
-    return new Itinerary(legs);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/LocationDTOAssembler.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto.assembler;
-
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.domain.model.location.Location;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class LocationDTOAssembler {
-
-  public LocationDTO toDTO(Location location) {
-    return new LocationDTO(location.unLocode().idString(), location.name());
-  }
-
-  public List<LocationDTO> toDTOList(List<Location> allLocations) {
-    final List<LocationDTO> dtoList = new ArrayList<LocationDTO>(allLocations.size());
-    for (Location location : allLocations) {
-      dtoList.add(toDTO(location));
-    }
-    return dtoList;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  DTO assemblers.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/package.html

@@ -1,43 +0,0 @@
-<html>
-<body>
-<p>DTOs for the remote booking client API.</p>
-<!--
-<p>
-  DTOs are designed in a use case-driven fashion, closely related to the service layer interface.
-  They represent a particular section of the domain model, which may cross aggregate boundaries.
-  They have no behaviour and are immutable.
-</p>
-<p>
-  The reason for using DTOs is mainly to loosen the coupling of the application and the user interface.
-  It allows us to build the domain model completely without having to conforming to any UI-related conventions
-  or requirements, such as JavaBean getter methods or no-args constructors. We also avoid exposing functionality that is internal
-  to the domain model to the UI layer.
-</p>
-<p>
-  Futhermore, we have a clear contract for what part of the object graph is loaded from the database
-  when the service layer call returns. If domain model objects are passed on to the UI layer, it will
-  be necessary to keep the database access window (the Hibernate session in this case) open during the entire processing of
-  the view (the Open Session In View pattern), otherwise an uninitialized part of the model could
-  accidentally be accessed, causing an error. For example, if the UI layer were to receive a Cargo instance,
-  that could be navigated to access the Itinerary, iterate over the Legs of the itinerary, access the Leg's CarrierMovement and
-  then the CarrierMovement's Location and so on.
-  In addition to effectively tying the UI layer and the rest of the aplication to the same JVM,
-  letting the UI layer decide when to initialize data may be very inefficient. DTOs are a natural way
-  of loading only the relevant data for a particular use case, and blocking access to the rest.
-</p>
-<p>
-  Using DTOs also makes the service layer reusable across different kinds of frontends: web, rich clients, other backend systems etc.
-  Remember that classes that are persisted with Hibernate or similar technologies are modified in runtime,
-  so that for example collection-valued fields are swapped for customized implementations that allow lazy loading.
-  If these persisted domain model classes are to be deserialized in another JVM, those O/R-mapping-specific classes need to be available
-  there as well, which is not very elegant.
-</p>
-<p>
-  One caveat though: The usefulness of DTOs may vary with the degree of vertical separation in the application. If it's very
-  unlikely that your application will use anything other than a web interface, and that it otherwise are
-  no problems running the web layer together with the rest of the application, you may want to avoid the
-  overhead of maintaining several similar sets of classes.  
-</p>
--->
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/remoting/package.html

@@ -1,8 +0,0 @@
-<html>
-<body>
-<p>
-  Remote service facades with supporting DTO classes and assemblers. Sits on top of the domain service
-  layer, and forms the boundary of the O/R-mapper unit-of-work scope when sending data to the user interface.   
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/routing/ExternalRoutingService.java

@@ -1,79 +0,0 @@
-package se.citerus.dddsample.application.routing;
-
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.Leg;
-import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.RoutingService;
-import se.citerus.routingteam.GraphTraversalService;
-import se.citerus.routingteam.TransitEdge;
-import se.citerus.routingteam.TransitPath;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Our end of the routing service. This is basically a data model
- * translation layer between our domain model and the API put forward
- * by the routing team, which operates in a different context from us.
- *
- */
-public class ExternalRoutingService implements RoutingService {
-
-  private GraphTraversalService graphTraversalService;
-  private LocationRepository locationRepository;
-  private CarrierMovementRepository carrierMovementRepository;
-
-  @Transactional(readOnly = true)
-  public List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification) {
-    final Location origin = routeSpecification.origin();
-    final Location destination = routeSpecification.destination();
-
-    final List<TransitPath> transitPaths = graphTraversalService.findShortestPath(
-      origin.unLocode().idString(),
-      destination.unLocode().idString()
-    );
-    
-    final List<Itinerary> itineraries = new ArrayList<Itinerary>(transitPaths.size());
-
-    for (TransitPath transitPath : transitPaths) {
-      final Itinerary itinerary = toItinerary(transitPath);
-      itineraries.add(itinerary);
-    }
-
-    return itineraries;
-  }
-
-  private Itinerary toItinerary(TransitPath transitPath) {
-    List<Leg> legs = new ArrayList(transitPath.getTransitEdges().size());
-    for (TransitEdge edge : transitPath.getTransitEdges()) {
-      legs.add(toLeg(edge));
-    }
-    return new Itinerary(legs);
-  }
-
-  private Leg toLeg(TransitEdge edge) {
-    return new Leg(
-      carrierMovementRepository.find(new CarrierMovementId(edge.getCarrierMovementId())),
-      locationRepository.find(new UnLocode(edge.getFromUnLocode())),
-      locationRepository.find(new UnLocode(edge.getToUnLocode()))
-    );
-  }
-
-  public void setGraphTraversalService(GraphTraversalService graphTraversalService) {
-    this.graphTraversalService = graphTraversalService;
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/routing/package.html

@@ -1,9 +0,0 @@
-<html>
-<body>
-<p>
-  The routing service interface, which is part of the domain layer, is implemented by translating
-  our model and delegating work to a remote service in a different context. The recieved routing data
-  is also translated back to our model, forming a cargo itinerary.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java

@@ -1,211 +0,0 @@
-package se.citerus.dddsample.application.util;
-
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.sql.DataSource;
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Provides sample data.
- */
-public class SampleDataGenerator implements ServletContextListener {
-
-  private static final Timestamp base; 
-  static {
-    try {
-      Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2008-01-01");
-      base = new Timestamp(date.getTime() - 1000L * 60 * 60 * 24 * 100);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static void loadHandlingEventData(JdbcTemplate jdbcTemplate) {
-    String handlingEventSql =
-      "insert into HandlingEvent (completionTime, registrationTime, type, location_id, carrierMovement_id, cargo_id) " +
-      "values (?, ?, ?, ?, ?, ?)";
-
-    Object[][] handlingEventArgs = {
-        //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
-        {ts(0),     ts((0)),    "RECEIVE",  1,  null,  1},
-        {ts((4)),   ts((5)),    "LOAD",     1,  1,     1},
-        {ts((14)),  ts((14)),   "UNLOAD",   5,  1,     1},
-        {ts((15)),  ts((15)),   "LOAD",     5,  2,     1},
-        {ts((30)),  ts((30)),   "UNLOAD",   6,  2,     1},
-        {ts((33)),  ts((33)),   "LOAD",     6,  3,     1},
-        {ts((34)),  ts((34)),   "UNLOAD",   3,  3,     1},
-        {ts((60)),  ts((60)),   "LOAD",     3,  4,     1},
-        {ts((70)),  ts((71)),   "UNLOAD",   4,  4,     1},
-        {ts((75)),  ts((75)),   "LOAD",     4,  5,     1},
-        {ts((88)),  ts((88)),   "UNLOAD",   2,  5,     1},
-        {ts((100)), ts((102)),  "CLAIM",    2,  null,  1},
-
-        //ZYX (AUMEL - USCHI - DEHAM -)
-        {ts((200)),   ts((201)),  "RECEIVE",  2,  null,  3},
-        {ts((202)),   ts((202)),  "LOAD",     2,  7,     3},
-        {ts((208)),   ts((208)),  "UNLOAD",   7,  7,     3},
-        {ts((212)),   ts((212)),  "LOAD",     7,  8,     3},
-        {ts((230)),   ts((230)),  "UNLOAD",   6,  8,     3},
-        {ts((235)),   ts((235)),  "LOAD",     6,  9,     3},
-
-        //ABC
-        {ts((20)),  ts((21)),   "CLAIM",    2,  null,  2},
-
-        //CBA
-        {ts((0)),   ts((1)),    "RECEIVE",  2,  null,  4},
-        {ts((10)),  ts((11)),   "LOAD",     2,  7,     4},
-        {ts((20)),  ts((21)),   "UNLOAD",   7,  7,     4},
-
-        //FGH
-        {ts(100),   ts(160),    "RECEIVE",  3,  null,   5},
-        {ts(150),   ts(110),    "LOAD",     3,  10,     5},
-
-        // JKL
-        {ts(200),   ts(220),    "RECEIVE",  6,  null,   6},
-        {ts(300),   ts(330),    "LOAD",     6,  12,     6},
-        {ts(400),   ts(440),    "UNLOAD",   5,  12,     6}  // Unexpected event
-    };
-    executeUpdate(jdbcTemplate, handlingEventSql, handlingEventArgs);
-  }
-
-  private static void loadCarrierMovementData(JdbcTemplate jdbcTemplate) {
-    String carrierMovementSql =
-      "insert into CarrierMovement (id, carrier_movement_id, from_id, to_id) " +
-      "values (?,?,?,?)";
-
-    Object[][] carrierMovementArgs = {
-     // SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL
-      {1, "CAR_001",1,5},
-      {2, "CAR_002",5,6},
-      {3, "CAR_003",6,3},
-      {4, "CAR_004",3,4},
-      {5, "CAR_005",4,2},
-
-      // FIHEL - SESTO
-      {6, "CAR_006",5,1},
-
-      // AUMEL - USCHI - DEHAM - SESTO
-      {7, "CAR_007",2,7},
-      {8, "CAR_008",7,6},
-      {9, "CAR_009",6,1},
-
-      // CNHKG - AUMEL
-      {10,"CAR_010",3,2},
-      // AUMEL - FIHEL
-      {11,"CAR_011",2,5},
-      // DEHAM - SESTO
-      {12,"CAR_020",6,1},
-      // SESTO - USCHI
-      {13,"CAR_021",1,7},
-      // USCHI - JPTKO
-      {14,"CAR_022",7,4}
-    };
-    executeUpdate(jdbcTemplate, carrierMovementSql, carrierMovementArgs);
-  }
-
-  private static void loadCargoData(JdbcTemplate jdbcTemplate) {
-    String cargoSql =
-      "insert into Cargo (id, tracking_id, origin_id, destination_id) " +
-      "values (?, ?, ?, ?)";
-
-    Object[][] cargoArgs = {
-      {1, "XYZ", 1, 2},
-      {2, "ABC", 1, 5},
-      {3, "ZYX", 2, 1},
-      {4, "CBA", 5, 1},
-      {5, "FGH", 3, 5},
-      {6, "JKL", 6, 4}
-    };
-    executeUpdate(jdbcTemplate, cargoSql, cargoArgs);
-  }
-
-  private static void loadLocationData(JdbcTemplate jdbcTemplate) {
-    String locationSql =
-      "insert into Location (id, unlocode, name) " +
-      "values (?, ?, ?)";
-
-    Object[][] locationArgs = {
-      {1, "SESTO", "Stockholm"},
-      {2, "AUMEL", "Melbourne"},
-      {3, "CNHKG", "Hongkong"},
-      {4, "JPTOK", "Tokyo"},
-      {5, "FIHEL", "Helsinki"},
-      {6, "DEHAM", "Hamburg"},
-      {7, "USCHI", "Chicago"}
-    };
-    executeUpdate(jdbcTemplate, locationSql, locationArgs);
-  }
-
-  private static void loadItineraryData(JdbcTemplate jdbcTemplate) {
-    String itinerarySql = "insert into Itinerary (id, cargo_id) values (?,?)";
-
-    Object[][] itineraryArgs = {
-      {1, 5},
-      {2, 6}
-    };
-    executeUpdate(jdbcTemplate, itinerarySql, itineraryArgs);
-
-    String legSql =
-      "insert into Leg (id, itinerary_id, carrierMovement_id, from_id, to_id, leg_index) " +
-      "values (?,?,?,?,?,?)";
-
-    Object [][] legArgs = {
-      // Cargo 5: Hongkong - Melbourne - Stockholm - Helsinki
-      {1,1,10,3,2,0},
-      {2,1,11,2,1,1},
-      {3,1,11,1,5,2},
-      // Cargo 6: Hamburg - Stockholm - Chicago - Tokyo
-      {4,2,12,6,1,0},
-      {5,2,13,1,7,1},
-      {6,2,14,7,4,2}
-    };
-    executeUpdate(jdbcTemplate, legSql, legArgs);
-  }
-
-  public void contextInitialized(ServletContextEvent event) {
-    WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
-    DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
-    PlatformTransactionManager transactionManager = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
-    loadSampleData(new JdbcTemplate(dataSource), new TransactionTemplate(transactionManager));
-  }
-
-  public void contextDestroyed(ServletContextEvent event) {}
-
-  public static void loadSampleData(final JdbcTemplate jdbcTemplate, TransactionTemplate transactionTemplate) {
-    transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-      protected void doInTransactionWithoutResult(TransactionStatus status) {
-        loadLocationData(jdbcTemplate);
-        loadCarrierMovementData(jdbcTemplate);
-        loadCargoData(jdbcTemplate);
-        loadItineraryData(jdbcTemplate);
-        loadHandlingEventData(jdbcTemplate);
-      }
-    });
-  }
-
-  private static void executeUpdate(JdbcTemplate jdbcTemplate, String sql, Object[][] args) {
-    for (Object[] arg : args) {
-      jdbcTemplate.update(sql, arg);
-    }
-  }
-
-  private static Timestamp ts(int hours) {
-    return new Timestamp(base.getTime() + 1000L * 60 * 60 * hours);
-  }
-
-  public static Date offset(int hours) {
-    return new Date(ts(hours).getTime());
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/util/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Various utilities.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/ws/HandlingEventServiceEndpoint.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.application.ws;
-
-import javax.jws.WebService;
-
-/**
- * Web service endpoint for handling event registration.
- */
-@WebService
-public interface HandlingEventServiceEndpoint {
-
-  /**
-   * Register an cargo handling event.
-   *
-   * @param completionTime    time when event occured, for example a the loading of cargo was completed
-   * @param trackingId        tracking id of the cargo
-   * @param carrierMovementId carrier movement id, if applicable
-   * @param unlocode          United Nations Location Code for the location where the event occured
-   * @param eventType         type of event
-   */
-  void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType);
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/ws/HandlingEventServiceEndpointImpl.java

@@ -1,102 +0,0 @@
-package se.citerus.dddsample.application.ws;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.HandlingEventService;
-import se.citerus.dddsample.domain.service.UnknownCarrierMovementIdException;
-import se.citerus.dddsample.domain.service.UnknownTrackingIdException;
-
-import javax.jws.WebService;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@WebService(endpointInterface = "se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint")
-public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
-
-  private HandlingEventService handlingEventService;
-  private final Log logger = LogFactory.getLog(getClass());
-  protected static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
-
-  public void register(final String completionTime, final String trackingId, final String carrierMovementId,
-                       final String unlocode, final String eventType) {
-    try {
-      Date date = parseIso8601Date(completionTime);
-      TrackingId tid = new TrackingId(trackingId);
-      CarrierMovementId cid;
-      if (StringUtils.isNotEmpty(carrierMovementId)) {
-        cid = new CarrierMovementId(carrierMovementId);
-      } else {
-        cid = null;
-      }
-      HandlingEvent.Type type = parseEventType(eventType);
-
-      UnLocode ul = new UnLocode(unlocode);
-
-      handlingEventService.register(date, tid, cid, ul, type);
-
-    } catch (IllegalArgumentException iae) {
-      handleIllegalArgument(iae);
-
-    } catch (ParseException pe) {
-      handleInvalidDateFormat(completionTime);
-
-    } catch (UnknownTrackingIdException utid) {
-      handleUnknownTrackingId(utid);
-
-    } catch (UnknownCarrierMovementIdException ucmi) {
-      handleUnknownCarrierMovementId(ucmi);
-
-    } catch (InvalidEventTypeException iete) {
-      handleInvalidEventType(iete);
-
-    } catch (Exception e) {
-      handleOtherError(e);
-    }
-  }
-
-  private void handleIllegalArgument(IllegalArgumentException iae) {
-    logger.error(iae, iae);
-  }
-
-  private void handleOtherError(Exception e) {
-    logger.error(e, e);
-  }
-
-  private void handleInvalidEventType(InvalidEventTypeException iete) {
-    logger.error(iete, iete);
-  }
-
-  private void handleInvalidDateFormat(String completionTime) {
-    logger.error("Invalid date format: " + completionTime + ", must be on ISO 8601 format: " + ISO_8601_FORMAT);
-  }
-
-  private HandlingEvent.Type parseEventType(final String eventType) throws InvalidEventTypeException {
-    try {
-      return HandlingEvent.Type.valueOf(eventType);
-    } catch (IllegalArgumentException e) {
-      throw new InvalidEventTypeException(eventType);
-    }
-  }
-
-  private void handleUnknownCarrierMovementId(UnknownCarrierMovementIdException e) {
-    logger.info("Placing event in retry queue due to: " + e.getMessage());
-  }
-
-  private void handleUnknownTrackingId(Exception e) {
-    logger.info("Placing event in retry queue due to: " + e.getMessage());
-  }
-
-  private Date parseIso8601Date(final String completionTime) throws ParseException {
-    return new SimpleDateFormat(ISO_8601_FORMAT).parse(completionTime);
-  }
-
-  public void setHandlingEventService(final HandlingEventService handlingEventService) {
-    this.handlingEventService = handlingEventService;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/ws/InvalidEventTypeException.java

@@ -1,21 +0,0 @@
-package se.citerus.dddsample.application.ws;
-
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-import java.util.Arrays;
-
-/**
- * Thrown when trying to register an event with an invalid type.
- *
- */
-public class InvalidEventTypeException extends Throwable {
-  private String eventType;
-
-  public InvalidEventTypeException(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public String getMessage() {
-    return "Invalid event type: " + eventType + ". Valid types are: " + Arrays.deepToString(HandlingEvent.Type.values());
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/ws/package.html

@@ -1,8 +0,0 @@
-<html>
-<body>
-<p>
-  The web service interface for registering handling events, implemented using JAX-WS.
-  This is an Open Host Service with data model translation and basic validation, and part of the infrastructure. 
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/DomainEvent.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.model;
-
-/**
- * A domain event is something that is unique, but does not have a lifecycle.
- * The identity may be explicit, for example the sequence number of a payment,
- * or it could be derived from various aspects of the event such as where, when and what
- * has happened.
- */
-public interface DomainEvent<T> {
-
-  /**
-   * @param other The other domain event.
-   * @return <code>true</code> if the given domain event and this event are regarded as being the same event.
-   */
-  boolean sameEventAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/Entity.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.model;
-
-/**
- * An entity, as explained in the DDD book.
- *  
- */
-public interface Entity<T> {
-
-  /**
-   * Entities compare by identity, not by attributes.
-   *
-   * @param other The other entity.
-   * @return true if the identities are the same, regardles of other attributes.
-   */
-  boolean sameIdentityAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/Specification.java

@@ -1,6 +0,0 @@
-package se.citerus.dddsample.domain.model;
-
-public interface Specification<T> {
-  // TODO replace with Specification project dependency
-  boolean isSatisfiedBy(T t);
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/ValueObject.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.model;
-
-/**
- * A value object, as described in the DDD book.
- * 
- */
-public interface ValueObject<T> {
-
-  /**
-   * Value objects compare by the values of their attributes, they don't have an identity.
-   *
-   * @param other The other value object.
-   * @return <code>true</code> if the given value object's and this value object's attributes are the same.
-   */
-  boolean sameValueAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Cargo.java

@@ -1,230 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.Entity;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-
-/**
- * A Cargo. This is the central class in the domain model,
- * and it is the root of the Cargo-Itinerary-Leg-DeliveryHistory aggregate.
- *
- * A cargo is identified by a unique tracking id, and it always has an origin
- * and a destination. The life cycle of a cargo begins with the booking procedure,
- * when the tracking id is assigned. During a (short) period of time, between booking
- * and initial routing, the cargo has no itinerary.
- *
- * The booking clerk requests a list of possible routes, matching a route specification,
- * and assigns the cargo to one route. An itinerary listing the legs of the route
- * is attached to the cargo.
- *
- * A cargo can be re-routed during transport, on demand of the customer, in which case
- * the destination is changed and a new route is requested. The old itinerary,
- * being a value object, is discarded and a new one is attached.
- *
- * It may also happen that a cargo is accidentally misrouted, which should notify the proper
- * personnel and also trigger a re-routing procedure.
- *
- * The life cycle of a cargo ends when the cargo is claimed by the customer.
- *
- * The cargo aggregate, and the entre domain model, is built to solve the problem
- * of booking and tracking cargo. All important business rules for determining whether
- * or not a cargo is misrouted, what the current status of the cargo is (on board carrier,
- * in port etc), are captured in this aggregate.
- *
- */
-public final class Cargo implements Entity<Cargo> {
-
-  private TrackingId trackingId;
-  private Location origin;
-  private Location destination;
-  private Itinerary itinerary;
-  private DeliveryHistory deliveryHistory;
-
-  /**
-   * @param trackingId tracking id
-   * @param origin origin location
-   * @param destination destination location
-   */
-  public Cargo(final TrackingId trackingId, final Location origin, final Location destination) {
-    Validate.notNull(trackingId);
-    Validate.notNull(origin);
-    Validate.notNull(destination);
-
-    this.trackingId = trackingId;
-    this.origin = origin;
-    this.destination = destination;
-  }
-
-  /**
-   * The tracking id is the identity of this entity, and is unique.
-   * 
-   * @return Tracking id.
-   */
-  public TrackingId trackingId() {
-    return this.trackingId;
-  }
-
-  /**
-   * @return Origin location.
-   */
-  public Location origin() {
-    return this.origin;
-  }
-
-  /**
-   * @param newDestination the new destination. May not be null.
-   */
-  public void changeDestination(final Location newDestination) {
-    Validate.notNull(newDestination);
-
-    this.destination = newDestination;
-  }
-
-  /**
-   * @return Destination of the cargo.
-   */
-  public Location destination() {
-    return this.destination;
-  }
-
-  /**
-   * @return The delivery history. Never null.
-   */
-  public DeliveryHistory deliveryHistory() {
-    return nullSafe(this.deliveryHistory, DeliveryHistory.EMPTY_DELIVERY_HISTORY);
-  }
-
-  /**
-   * @return The itinerary. Never null.
-   */
-  public Itinerary itinerary() {
-    return nullSafe(this.itinerary, Itinerary.EMPTY_ITINERARY);
-  }
-
-  /**
-   * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
-   */
-  public Location lastKnownLocation() {
-    final HandlingEvent lastEvent = deliveryHistory().lastEvent();
-    if (lastEvent != null) {
-      return lastEvent.location();
-    } else {
-      return Location.UNKNOWN;
-    }
-  }
-
-  /**
-   * @return True if the cargo has arrived at its final destination.
-   */
-  public boolean hasArrived() {
-    return destination.equals(lastKnownLocation());
-  }
-
-  /**
-   * Attach a new itinerary to this cargo.
-   *
-   * @param itinerary an itinerary. May not be null.
-   */
-  public void attachItinerary(final Itinerary itinerary) {
-    Validate.notNull(itinerary);
-
-    // Decouple the old itinerary from this cargo
-    itinerary().setCargo(null);
-    // Couple this cargo and the new itinerary
-    this.itinerary = itinerary;
-    this.itinerary.setCargo(this);
-  }
-
-  /**
-   * Detaches the current itinerary from the cargo.
-   */
-  public void detachItinerary() {
-    itinerary().setCargo(null);
-    this.itinerary = null;
-  }
-
-  /**
-   * @param deliveryHistory Cargo delivery history
-   */
-  void setDeliveryHistory(final DeliveryHistory deliveryHistory) {
-    Validate.notNull(deliveryHistory);
-    this.deliveryHistory = deliveryHistory;
-  }
-
-  /**
-   * Check if cargo is misdirected.
-   * <p/>
-   * <ul>
-   * <li>A cargo is misdirected if it is in a location that's not in the itinerary.
-   * <li>A cargo with no itinerary can not be misdirected.
-   * <li>A cargo that has received no handling events can not be misdirected.
-   * </ul>
-   *
-   * @return <code>true</code> if the cargo has been misdirected,
-   */
-  public boolean isMisdirected() {
-    final HandlingEvent lastEvent = deliveryHistory().lastEvent();
-    if (lastEvent == null) {
-      return false;
-    } else {                                          
-      return !itinerary().isExpected(lastEvent);
-    }
-  }
-
-  /**
-   * Does not take into account the possibility of the cargo having been
-   * (errouneously) loaded onto another carrier after it has been unloaded
-   * at the final destination.
-   *
-   * @return True if the cargo has been unloaded at the final destination.
-   */
-  public boolean isUnloadedAtDestination() {
-    for (HandlingEvent event : deliveryHistory().eventsOrderedByCompletionTime()) {
-      if (HandlingEvent.Type.UNLOAD.equals(event.type())
-        && destination.equals(event.location())) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public boolean sameIdentityAs(final Cargo other) {
-    return other != null && trackingId.sameValueAs(other.trackingId);
-  }
-
-  /**
-   * @param object to compare
-   * @return True if they have the same identity
-   * @see #sameIdentityAs(Cargo)
-   */
-  @Override
-  public boolean equals(final Object object) {
-    if (!(object instanceof Cargo)) {
-      return false;
-    }
-    final Cargo other = (Cargo) object;
-    return sameIdentityAs(other);
-  }
-
-  /**
-   * @return Hash code of tracking id.
-   */
-  @Override
-  public int hashCode() {
-    return trackingId.hashCode();
-  }
-
-  // Utility for Null Object Pattern - should be moved out of this class
-  private <T> T nullSafe(T actual, T safe) {
-    return actual == null ? safe : actual;
-  }
-
-  Cargo() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -1,38 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import java.util.List;
-
-public interface CargoRepository {
-
-  /**
-   * Finds a cargo using given id.
-   *
-   * @param trackingId Id
-   * @return Cargo if found, else {@code null}
-   */
-  Cargo find(TrackingId trackingId);
-
-  /**
-   * Finds all cargo.
-   *
-   * @return All cargo.
-   */
-  List<Cargo> findAll();
-
-  /**
-   * Saves given cargo.
-   *
-   * @param cargo cargo to save
-   */
-  void save(Cargo cargo);
-
-  /**
-   * TODO
-   * this is too complex a procedure to belong in the repository -
-   * introduce a TrackingIdFactory (or perhaps a CargoFactory).
-   *
-   * @return A new generated tracking Id.
-   */
-  TrackingId nextTrackingId();
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/DeliveryHistory.java

@@ -1,109 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import se.citerus.dddsample.domain.model.ValueObject;
-import static se.citerus.dddsample.domain.model.cargo.StatusCode.*;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-
-import java.util.*;
-
-/**
- * The delivery history of a cargo.
- *
- * This is a value object.
- */
-public final class DeliveryHistory implements ValueObject<DeliveryHistory> {
-
-  private Set<HandlingEvent> events;
-
-  public static final DeliveryHistory EMPTY_DELIVERY_HISTORY = new DeliveryHistory(Collections.EMPTY_SET);
-
-  DeliveryHistory(final Collection<HandlingEvent> events) {
-    this.events = new HashSet<HandlingEvent>(events);
-  }
-
-  /**
-   * @return An <b>unmodifiable</b> list of handling events, ordered by the time the events occured.
-   */
-  public List<HandlingEvent> eventsOrderedByCompletionTime() {
-    final List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
-    Collections.sort(eventList, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
-    return Collections.unmodifiableList(eventList);
-  }
-
-  /**
-   * @return The last event of the delivery history, or null is history is empty.
-   */
-  public HandlingEvent lastEvent() {
-    if (events.isEmpty()) {
-      return null;
-    } else {
-      final List<HandlingEvent> orderedEvents = eventsOrderedByCompletionTime();
-      return orderedEvents.get(orderedEvents.size() - 1);
-    }
-  }
-
-  public StatusCode status() {
-    if (lastEvent() == null)
-      return NOT_RECEIVED;
-
-    final HandlingEvent.Type type = lastEvent().type();
-    
-    switch (type) {
-      case LOAD:
-        return ONBOARD_CARRIER;
-
-      case UNLOAD:
-      case RECEIVE:
-      case CUSTOMS:
-        return IN_PORT;
-
-      case CLAIM:
-        return CLAIMED;
-
-      default:
-        return null;
-    }
-  }
-
-  public Location currentLocation() {
-    if (status().equals(IN_PORT)) {
-      return lastEvent().location();
-    } else {
-      return null;
-    }
-  }
-
-  public CarrierMovement currentCarrierMovement() {
-    if (status().equals(ONBOARD_CARRIER)) {
-      return lastEvent().carrierMovement();
-    } else {
-      return null;
-    }
-  }
-
-  public boolean sameValueAs(DeliveryHistory other) {
-    return other != null && events.equals(other.events);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final DeliveryHistory other = (DeliveryHistory) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return events.hashCode();
-  }
-
-  DeliveryHistory() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -1,130 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.ValueObject;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * An itinerary.
- * 
- */
-public final class Itinerary implements ValueObject<Itinerary> {
-
-  private Cargo cargo;
-  private List<Leg> legs = Collections.emptyList();
-
-  static final Itinerary EMPTY_ITINERARY = new Itinerary();
-
-  /**
-   * Constructor.
-   *
-   * @param legs List of legs for this itinerary.
-   */
-  public Itinerary(final List<Leg> legs) {
-    Validate.notEmpty(legs);
-    Validate.noNullElements(legs);
-    
-    this.legs = Collections.unmodifiableList(legs);
-  }
-
-  /**
-   * For maintaing referential integrity inside the Cargo aggregate,
-   * with package level visibility. 
-   *
-   * @see Cargo#attachItinerary(Itinerary)
-   * @see Cargo#detachItinerary()
-   *  
-   * @param cargo the cargo that this itinerary is for
-   */
-  void setCargo(Cargo cargo) {
-    this.cargo = cargo;
-  }
-  
-  /**
-   * @return the legs of this itinerary, as an <b>immutable</b> list.
-   */
-  public List<Leg> legs() {
-    return legs;
-  }
-
-  /**
-   * Test if the given handling event is expected when executing this itinerary.
-   *
-   * @param event Event to test.
-   * @return <code>true</code> if the event is expected
-   */
-  public boolean isExpected(final HandlingEvent event) {
-    if (legs.isEmpty()) {
-      return true;
-    }
-
-    if (event.type() == HandlingEvent.Type.RECEIVE) {
-      //Check that the first leg's origin is the event's location
-      final Leg leg = legs.get(0);
-      return (leg.from().equals(event.location()));
-    }
-
-    if (event.type() == HandlingEvent.Type.LOAD) {
-      //Check that the there is one leg with same from location and carrier movement
-      for (Leg leg : legs) {
-        if (leg.from().equals(event.location())
-          && leg.carrierMovement().equals(event.carrierMovement()))
-          return true;
-      }
-      return false;
-    }
-
-    if (event.type() == HandlingEvent.Type.UNLOAD) {
-      //Check that the there is one leg with same to loc and carrier movement
-      for (Leg leg : legs) {
-        if (leg.to().equals(event.location())
-          && leg.carrierMovement().equals(event.carrierMovement()))
-          return true;
-      }
-      return false;
-    }
-
-    if (event.type() == HandlingEvent.Type.CLAIM) {
-      //Check that the last leg's destination is from the event's location
-      final Leg leg = legs.get(legs.size() - 1);
-      return (leg.to().equals(event.location()));
-    }
-
-    //HandlingEvent.Type.CUSTOMS;
-    return true;
-  }
-
-  /**
-   * @param other itinerary to compare
-   * @return <code>true</code> if the legs in this and the other itinerary are all equal.
-   */
-  public boolean sameValueAs(final Itinerary other) {
-    return other != null && legs.equals(other.legs);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Itinerary itinerary = (Itinerary) o;
-
-    return sameValueAs(itinerary);
-  }
-
-  @Override
-  public int hashCode() {
-    return legs.hashCode();
-  }
-
-  Itinerary() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Leg.java

@@ -1,80 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.ValueObject;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.location.Location;
-
-/**
- * An itinerary consists of one or more legs.
- */
-public final class Leg implements ValueObject<Leg> {
-
-  private CarrierMovement carrierMovement;
-  private Location from;
-  private Location to;
-
-  /**
-   * Constructor.
-   *
-   * @param carrierMovement
-   * @param from
-   * @param to
-   */
-  public Leg(final CarrierMovement carrierMovement, final Location from, final Location to) {
-    Validate.noNullElements(new Object[]{carrierMovement, from, to});
-    this.carrierMovement = carrierMovement;
-    this.from = from;
-    this.to = to;
-  }
-
-  public Location from() {
-    return from;
-  }
-
-  public Location to() {
-    return to;
-  }
-
-  public CarrierMovement carrierMovement() {
-    return carrierMovement;
-  }
-
-
-  public boolean sameValueAs(final Leg other) {
-    return other != null && new EqualsBuilder().
-      append(this.carrierMovement, other.carrierMovement).
-      append(this.from, other.from).
-      append(this.to, other.to).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    Leg leg = (Leg) o;
-
-    return sameValueAs(leg);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(carrierMovement).
-      append(from).
-      append(to).
-      toHashCode();
-  }
-
-  Leg() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/RouteSpecification.java

@@ -1,99 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.Specification;
-import se.citerus.dddsample.domain.model.ValueObject;
-import se.citerus.dddsample.domain.model.location.Location;
-
-import java.util.Date;
-
-/**
- * Route specification.
- * 
- */
-public class RouteSpecification implements ValueObject<RouteSpecification>, Specification<Itinerary> {
-  private Location origin;
-  private Location destination;
-  private Date arrivalDeadline;
-
-  /**
-   * Factory for creatig a route specification for a cargo, from cargo
-   * origin to cargo destination. Use for initial routing.
-   *
-   * @param cargo cargo
-   * @param arrivalDeadline arrival deadline
-   * @return A route specification for this cargo and arrival deadline
-   */
-  public static RouteSpecification forCargo(Cargo cargo, Date arrivalDeadline) {
-    Validate.notNull(cargo);
-    Validate.notNull(arrivalDeadline);
-
-    return new RouteSpecification(cargo.origin(), cargo.destination(), arrivalDeadline);
-  }
-
-  /**
-   * Factory for creating a route specfication from an explicit destination,
-   * for rerouting a cargo.
-   *
-   * @param from
-   * @param cargo
-   * @param arrivalDeadline
-   * @return
-   */
-  public static RouteSpecification forReroutedCargo(Location from, Cargo cargo, Date arrivalDeadline) {
-    Validate.notNull(from);
-    Validate.notNull(cargo);
-    Validate.notNull(arrivalDeadline);
-
-    return new RouteSpecification(from, cargo.destination(), arrivalDeadline);
-  }
-
-  private RouteSpecification(Location origin, Location destination, Date arrivalDeadline) {
-    this.origin = origin;
-    this.destination = destination;
-    this.arrivalDeadline = arrivalDeadline;
-  }
-
-  public Location origin() {
-    return origin;
-  }
-
-  public Location destination() {
-    return destination;
-  }
-
-  public boolean isSatisfiedBy(Itinerary itinerary) {
-    // TODO implement
-    return true;
-  }
-
-  public boolean sameValueAs(RouteSpecification other) {
-    return other != null && new EqualsBuilder().
-      append(this.origin, other.origin).
-      append(this.destination, other.destination).
-      append(this.arrivalDeadline, other.arrivalDeadline).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    RouteSpecification that = (RouteSpecification) o;
-
-    return sameValueAs(that);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(this.origin).
-      append(this.destination).
-      append(this.arrivalDeadline).
-      toHashCode();
-  }
-  
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/StatusCode.java

@@ -1,8 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-/**
- * Represents the different status codes for a cargo.
- */
-public enum StatusCode {
-  NOT_RECEIVED, IN_PORT, ONBOARD_CARRIER, CLAIMED, UNKNOWN
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/TrackingId.java

@@ -1,53 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.ValueObject;
-
-/**
- * Uniquely identifies a particular cargo. Automatically generated by the application.
- *  
- */
-public final class TrackingId implements ValueObject<TrackingId> {
-
-  private String id;
-
-  /**
-   * Constructor.
-   *
-   * @param id Id string.
-   */
-  public TrackingId(final String id) {
-    Validate.notNull(id);
-    this.id = id;
-  }
-
-  /**
-   * @return String representation of this tracking id.
-   */
-  public String idString() {
-    return id;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    TrackingId other = (TrackingId) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return id.hashCode();
-  }
-
-  public boolean sameValueAs(TrackingId other) {
-    return other != null && this.id.equals(other.id);
-  }
-
-  TrackingId() {
-    // Needed by Hibernate
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  The cargo aggregate. Cargo is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovement.java

@@ -1,72 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.Entity;
-import se.citerus.dddsample.domain.model.location.Location;
-
-
-/**
- * A carrier movement is a vessel voyage from one location to another.
- */
-public final class CarrierMovement implements Entity<CarrierMovement> {
-
-  private CarrierMovementId carrierMovementId;
-  private Location from;
-  private Location to;
-
-  /**
-   * Constructor.
-   *
-   * @param carrierMovementId
-   * @param from
-   * @param to
-   */
-  public CarrierMovement(final CarrierMovementId carrierMovementId, final Location from, final Location to) {
-    Validate.noNullElements(new Object[]{carrierMovementId, from, to});
-    this.carrierMovementId = carrierMovementId;
-    this.from = from;
-    this.to = to;
-  }
-
-  public CarrierMovementId carrierMovementId() {
-    return carrierMovementId;
-  }
-
-  public Location from() {
-    return from;
-  }
-
-  public Location to() {
-    return to;
-  }
-
-  public boolean sameIdentityAs(final CarrierMovement other) {
-    return carrierMovementId.sameValueAs(other.carrierMovementId);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final CarrierMovement that = (CarrierMovement) o;
-
-    return sameIdentityAs(that);
-  }
-
-  /**
-   * @return Hashcode of carrier movement id.
-   */
-  @Override
-  public int hashCode() {
-    return carrierMovementId.hashCode();
-  }
-
-  CarrierMovement() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementId.java

@@ -1,55 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.ValueObject;
-
-/**
- * Identifies a particular carrier movement, such as a flight number.
- */
-public final class CarrierMovementId implements ValueObject<CarrierMovementId> {
-
-  private String id;
-
-  /**
-   * Constructor.
-   *
-   * @param id Id string.
-   */
-  public CarrierMovementId(final String id) {
-    Validate.notNull(id);
-    this.id = id;
-  }
-
-  /**
-   * @return String representation of this carrier movement id.
-   */
-  public String idString() {
-    return id;
-  }
-
-  public boolean sameValueAs(CarrierMovementId other) {
-    return other != null && this.id.equals(other.id);
-  }
-
-  @Override
-  public boolean equals(final Object obj) {
-    return EqualsBuilder.reflectionEquals(this, obj);
-  }
-
-  @Override
-  public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this);
-  }
-
-  @Override
-  public String toString() {
-    return idString();
-  }
-
-  CarrierMovementId() {
-    // Needed by hibernate
-   }
-  
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementRepository.java

@@ -1,13 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-public interface CarrierMovementRepository {
-
-  /**
-   * Finds a carrier movement using given id.
-   *
-   * @param carrierMovementId Id
-   * @return The carrier movement.
-   */
-  CarrierMovement find(CarrierMovementId carrierMovementId);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  The carrier aggregate. CarrierMovement is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEvent.java

@@ -1,183 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.DomainEvent;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.location.Location;
-
-import java.util.Comparator;
-import java.util.Date;
-
-/**
- * A HandlingEvent is used to register the event when, for instance,
- * a cargo is unloaded from a carrier at a some loacation at a given time.
- * <p/>
- * The HandlingEvent's are sent from different Incident Logging Applications
- * some time after the event occured and contain information about the
- * {@link se.citerus.dddsample.domain.model.cargo.TrackingId}, {@link se.citerus.dddsample.domain.model.location.Location}, timestamp of the completion of the event,
- * and possibly, if applicable a {@link se.citerus.dddsample.domain.model.carrier.CarrierMovement}.
- * <p/>
- * This class is the only member, and consequently the root, of the HandlingEvent aggregate. 
- * <p/>
- * HandlingEvent's could contain information about a {@link CarrierMovement} and if so,
- * the event type must be either {@link Type#LOAD} or {@link Type#UNLOAD}.
- * <p/>
- * All other events must be of {@link Type#RECEIVE}, {@link Type#CLAIM} or {@link Type#CUSTOMS}.
- */
-public final class HandlingEvent implements DomainEvent<HandlingEvent> {
-
-  /**
-   * Comparator used to be able to sort HandlingEvents according to their completion time
-   */
-  public static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR = new Comparator<HandlingEvent>() {
-    public int compare(final HandlingEvent o1, final HandlingEvent o2) {
-      return o1.completionTime().compareTo(o2.completionTime());
-    }
-  };
-
-  private Type type;
-  private CarrierMovement carrierMovement;
-  private Location location;
-  private Date completionTime;
-  private Date registrationTime;
-  private Cargo cargo;
-
-  /**
-   * Handling event type. Either requires or prohibits a carrier movement
-   * association, it's never optional.
-   */
-  public enum Type {
-    LOAD(true),
-    UNLOAD(true),
-    RECEIVE(false),
-    CLAIM(false),
-    CUSTOMS(false);
-
-    private boolean carrierMovementRequired;
-
-    /**
-     * Private enum constructor.
-     *
-     * @param carrierMovementRequired whether or not a carrier movement is associated with this event type
-     */
-    private Type(final boolean carrierMovementRequired) {
-      this.carrierMovementRequired = carrierMovementRequired;
-    }
-
-    /**
-     * @return True if a carrier movement association is required for this event type.
-     */
-    public boolean requiresCarrierMovement() {
-      return carrierMovementRequired;
-    }
-
-    /**
-     * @return True if a carrier movement association is prohibited for this event type.
-     */
-    public boolean prohibitsCarrierMovement() {
-      return !requiresCarrierMovement();
-    }
-  }
-
-  /**
-   * @param cargo            cargo
-   * @param completionTime   completion time, the reported time that the event actually happened (e.g. the receive took place).
-   * @param registrationTime registration time, the time the message is received
-   * @param type             type of event. Legal values are LOAD and UNLOAD
-   * @param location         where the event took place
-   * @param carrierMovement  carrier movement.
-   */
-  public HandlingEvent(final Cargo cargo, final Date completionTime, final Date registrationTime, final Type type,
-                       final Location location, final CarrierMovement carrierMovement) {
-    Validate.noNullElements(new Object[]{cargo, completionTime, registrationTime, type, location});
-    this.registrationTime = registrationTime;
-    this.completionTime = completionTime;
-    this.type = type;
-    this.cargo = cargo;
-    this.location = location;
-    this.carrierMovement = carrierMovement;
-
-    validateType();
-  }
-
-  public Type type() {
-    return this.type;
-  }
-
-  public CarrierMovement carrierMovement() {
-    return this.carrierMovement;
-  }
-
-  public Date completionTime() {
-    return this.completionTime;
-  }
-
-  public Date registrationTime() {
-    return this.registrationTime;
-  }
-
-  public Location location() {
-    return this.location;
-  }
-
-  public Cargo cargo() {
-    return this.cargo;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final HandlingEvent event = (HandlingEvent) o;
-
-    return sameEventAs(event);
-  }
-
-  public boolean sameEventAs(final HandlingEvent other) {
-    return other != null && new EqualsBuilder().
-      append(this.cargo, other.cargo).
-      append(this.carrierMovement, other.carrierMovement).
-      append(this.completionTime, other.completionTime).
-      append(this.location, other.location).
-      append(this.type, other.type).
-      isEquals();
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(cargo).
-      append(carrierMovement).
-      append(completionTime).
-      append(location).
-      append(type).
-      toHashCode();
-  }
-
-  /**
-   * Validate that the event type is compatible with the carrier movement value.
-   * <p/>
-   * Only certain types of events may be associated with a carrier movement.
-   */
-  private void validateType() {
-    if (type.requiresCarrierMovement() && carrierMovement == null) {
-      throw new IllegalArgumentException("Carrier movement is required for event type " + type);
-    }
-    if (type.prohibitsCarrierMovement() && carrierMovement != null) {
-      throw new IllegalArgumentException("Carrier movement is not allowed with event type " + type);
-    }
-  }
-
-  // Needed by Hibernate
-  HandlingEvent() {
-  }
-
-
-  // Auto-generated surrogate key
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEventRepository.java

@@ -1,26 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-import java.util.List;
-
-/**
- * Handling event repository.
- */
-public interface HandlingEventRepository {
-
-  /**
-   * Saves a (new) handling event.
-   *
-   * @param event handling event to save
-   */
-  void save(final HandlingEvent event);
-
-
-  // TODO: remove this in 1.0 branch, it's not used anywhere
-  /**
-   * @param trackingId cargo tracking id
-   * @return All handling events for this cargo, ordered by completion time.
-   */
-  List<HandlingEvent> findEventsForCargo(final TrackingId trackingId);
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  The handling aggregate. HandlingEvent is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/Location.java

@@ -1,99 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.Entity;
-
-/**
- * A location is our model is stops on a journey, such as cargo
- * origin or destination, or carrier movement endpoints.
- *
- * It is uniquely identified by a UN Locode.
- *
- */
-public final class Location implements Entity<Location> {
-
-  private UnLocode unLocode;
-  private String name;
-
-  /**
-   * Special Location object that marks an unknown location.
-   */
-  public static final Location UNKNOWN = new Location(new UnLocode("XXXXX"), "Unknown location");
-
-  /**
-   * Package-level constructor, visible for test only.
-   *
-   * @param unLocode UN Locode
-   * @param name     location name
-   * @throws IllegalArgumentException if the UN Locode or name is null
-   */
-  Location(final UnLocode unLocode, final String name) {
-    Validate.notNull(unLocode);
-    Validate.notNull(name);
-    
-    this.unLocode = unLocode;
-    this.name = name;
-  }
-
-  /**
-   * @return UN Locode for this location.
-   */
-  public UnLocode unLocode() {
-    return unLocode;
-  }
-
-  /**
-   * @return Actual name of this location, e.g. "Stockholm".
-   */
-  public String name() {
-    return name;
-  }
-
-  /**
-   * @param object to compare
-   * @return Since this is an entiy this will be true iff UN locodes are equal.
-   */
-  @Override
-  public boolean equals(final Object object) {
-    if (object == null) {
-      return false;
-    }
-    if (this == UNKNOWN || object == UNKNOWN) {
-      return this == object;
-    }
-    if (!(object instanceof Location)) {
-      return false;
-    }
-    Location other = (Location) object;
-    return sameIdentityAs(other);
-  }
-
-  public boolean sameIdentityAs(final Location other) {
-    return this.unLocode.sameValueAs(other.unLocode);
-  }
-
-  /**
-   * @return Hash code of UN locode.
-   */
-  @Override
-  public int hashCode() {
-    return unLocode.hashCode();
-  }
-
-  /**
-   * @return Unlocode and name, on the format "SESTO (Stockholm)"
-   */
-  @Override
-  public String toString() {
-    // TODO: this feels like presentation logic and is very inconsistent, move to DTO assembler
-    return unLocode.idString() + " (" + name + ")";
-  }
-
-
-  Location() {
-    // Needed by Hibernate
-  }
-
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/LocationRepository.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import java.util.List;
-
-public interface LocationRepository {
-
-  /**
-   * Finds a location using given unlocode.
-   *
-   * @param unLocode UNLocode.
-   * @return Location.
-   */
-  Location find(UnLocode unLocode);
-
-  /**
-   * Finds all locations.
-   *
-   * @return All locations.
-   */
-  List<Location> findAll();
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/UnLocode.java

@@ -1,71 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.ValueObject;
-
-import java.util.regex.Pattern;
-
-/**
- * United nations location code.
- * <p/>
- * http://www.unece.org/cefact/locode/
- * http://www.unece.org/cefact/locode/DocColumnDescription.htm#LOCODE
- */
-public final class UnLocode implements ValueObject<UnLocode> {
-
-  private String unlocode;
-
-  // Country code is exactly two letters.
-  // Location code is usually three letters, but may contain the numbers 2-9 as well
-  private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z]{2}[a-zA-Z2-9]{3}");
-
-  /**
-   * Constructor.
-   *
-   * @param countryAndLocation Location string.
-   */
-  public UnLocode(final String countryAndLocation) {
-    Validate.notNull(countryAndLocation, "Country and location may not be null");
-    Validate.isTrue(VALID_PATTERN.matcher(countryAndLocation).matches(),
-      countryAndLocation + " is not a valid UN/LOCODE (does not match pattern)");
-
-    this.unlocode = countryAndLocation.toUpperCase();
-  }
-
-  /**
-   * @return country code and location code concatenated, always upper case.
-   */
-  public String idString() {
-    return unlocode;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    UnLocode other = (UnLocode) o;
-
-    return sameValueAs(other);
-  }
-
-  public boolean sameValueAs(UnLocode other) {
-    return other != null && this.idString().equals(other.idString());
-  }
-
-  @Override
-  public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this);
-  }
-
-  @Override
-  public String toString() {
-    return idString();
-  }
-
-  UnLocode() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  The location aggregate. Location is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/package.html

@@ -1,8 +0,0 @@
-<html>
-<body>
-<p>
-  The domain model. This is the heart of the application. Each aggregate is contained in
-  its own subpackage, along with the repository interface.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/package.html

@@ -1,14 +0,0 @@
-<html>
-<body>
-<p>
-  The domain model, services and repository interfaces. This is the central part of the
-  application. The ubiquitous language is used in classes, interfaces and method signatures,
-  and every concept in here is familiar to a expert in the cargo shiping domain.
-</p>
-<p>
-  There is no infrastructure or user interface related code here, except for things like
-  transactional and security metadata which is likely to be relevant to a domain expert
-  ("Either all of foo succeeds or none of it does", "In order to do bar you need to be a Supervisor", and so on).
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/service/BookingService.java

@@ -1,39 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.List;
-
-/**
- * Cargo booking service.
- */
-public interface BookingService {
-
-  /**
-   * Registers a new cargo in the tracking system, not yet routed.
-   *
-   * @param origin      cargo origin
-   * @param destination cargo destination
-   * @return Cargo tracking id
-   */
-  TrackingId bookNewCargo(UnLocode origin, UnLocode destination);
-
-  /**
-   * Requests a list of itineraries describing possible routes for this cargo.
-   * 
-   * @param trackingId cargo tracking id
-   * @return A list of possible itineraries for this cargo 
-   */
-  List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId);
-
-  /**
-   * Assigns a cargo to route.
-   *
-   * @param trackingId cargo tracking id
-   * @param itinerary  the new itinerary describing the route
-   */
-  void assignCargoToRoute(TrackingId trackingId, Itinerary itinerary);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/DomainEventNotifier.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-/**
- * This interface provides a way to let other parts
- * of the system know about domain events that have occurred.
- * <p/>
- * All method signatures are expressed in the ubiquitous language.    
- * <p/>
- * It may be implemented synchronously or asynchronously, using
- * for example JMS.
- */
-public interface DomainEventNotifier {
-
-  /**
-   * A cargo has been handled.
-   *
-   * @param event handling event
-   */
-  void cargoWasHandled(HandlingEvent event);
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/HandlingEventService.java

@@ -1,30 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.Date;
-
-
-/**
- * Handling event service.
- */
-public interface HandlingEventService {
-
-  /**
-   * @param completionTime    when the event was completed, for example finished loading
-   * @param trackingId        tracking id
-   * @param carrierMovementId carrier movement id, if applicable (may be null)
-   * @param unlocode          United Nations Location Code for the location of the event
-   * @param type              type of event
-   * @throws UnknownCarrierMovementIdException
-   *                                    if there's not carrier movement with this id
-   * @throws UnknownTrackingIdException if there's no cargo with this tracking id
-   * @throws UnknownLocationException   if there's no location with this UN Locode
-   */
-  void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type)
-  throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/RoutingService.java

@@ -1,20 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
-
-import java.util.List;
-
-/**
- * Routing service.
- *
- */
-public interface RoutingService {
-
-  /**
-   * @param routeSpecification route specification
-   * @return A list of itineraries that satisfy the specification. May be an empty list if no route is found.
-   */
-  List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/TrackingService.java

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-/**
- * Cargo tracking service.
- *
- */
-public interface TrackingService {
-
-  /**
-   * Track a particular cargo.
-   *
-   * @param trackingId cargo tracking id
-   * @return A cargo and its delivery history, or null if no cargo with given tracking id is found.
-   */
-  Cargo track(TrackingId trackingId);
-
-  /**
-   * Inspect cargo and send relevant notifications to interested parties,
-   * for example if a cargo has been misdirected, or unloaded
-   * at the final destination.
-   *
-   * @param trackingId cargo tracking id
-   */
-  void inspectCargo(TrackingId trackingId);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownCarrierMovementIdException.java

@@ -1,20 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-
-/**
- * Thrown when trying to register an event with an unknown carrier movement id.
- */
-public class UnknownCarrierMovementIdException extends Exception {
-
-  private final CarrierMovementId carrierMovementId;
-
-  public UnknownCarrierMovementIdException(final CarrierMovementId carrierMovementId) {
-    this.carrierMovementId = carrierMovementId;
-  }
-
-  @Override
-  public String getMessage() {
-    return "No carrier movement with id " + carrierMovementId.idString() + " exists in the system";
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownLocationException.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-public class UnknownLocationException extends Exception {
-
-  private final UnLocode unlocode;
-
-  public UnknownLocationException(final UnLocode unlocode) {
-    this.unlocode = unlocode;
-  }
-
-  @Override
-  public String getMessage() {
-    return "No location with UN locode " + unlocode.idString() + " exists in the system";
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownTrackingIdException.java

@@ -1,20 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-/**
- * Thrown when trying to register an event with an unknown tracking id.
- */
-public final class UnknownTrackingIdException extends Exception {
-
-  private final TrackingId trackingId;
-
-  public UnknownTrackingIdException(final TrackingId trackingId) {
-    this.trackingId = trackingId;
-  }
-
-  @Override
-  public String getMessage() {
-    return "No cargo with tracking id " + trackingId.idString() + " exists in the system";
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/BookingServiceImpl.java

@@ -1,78 +0,0 @@
-package se.citerus.dddsample.domain.service.impl;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.*;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.BookingService;
-import se.citerus.dddsample.domain.service.RoutingService;
-
-import java.util.Date;
-import java.util.List;
-
-public final class BookingServiceImpl implements BookingService {
-
-  private CargoRepository cargoRepository;
-  private LocationRepository locationRepository;
-  private RoutingService routingService;
-
-  private final Log logger = LogFactory.getLog(getClass());
-
-  @Transactional(readOnly = false)
-  public TrackingId bookNewCargo(final UnLocode originUnLocode, final UnLocode destinationUnLocode) {
-    Validate.notNull(originUnLocode);
-    Validate.notNull(destinationUnLocode);
-
-    final TrackingId trackingId = cargoRepository.nextTrackingId();
-    final Location origin = locationRepository.find(originUnLocode);
-    final Location destination = locationRepository.find(destinationUnLocode);
-    Cargo cargo = new Cargo(trackingId, origin, destination);
-
-    cargoRepository.save(cargo);
-    logger.info("Registered new cargo with tracking id " + cargo.trackingId().idString());
-
-    return cargo.trackingId();
-  }
-
-  @Transactional(readOnly = true)
-  public List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId) {
-    Validate.notNull(trackingId);
-    
-    final Cargo cargo = cargoRepository.find(trackingId);
-    final RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, new Date());
-
-    return routingService.fetchRoutesForSpecification(routeSpecification);
-  }
-
-  @Transactional(readOnly = false)
-  public void assignCargoToRoute(final TrackingId trackingId, final Itinerary newItinerary) {
-    Validate.notNull(trackingId);
-    Validate.notNull(newItinerary);
-
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) {
-      throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);
-    }
-
-    cargo.attachItinerary(newItinerary);
-    cargoRepository.save(cargo);
-
-    logger.info("Assigned cargo " + trackingId + " to new route");
-  }
-
-  public void setCargoRepository(final CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  public void setLocationRepository(final LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setRoutingService(RoutingService routingService) {
-    this.routingService = routingService;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/HandlingEventServiceImpl.java

@@ -1,106 +0,0 @@
-package se.citerus.dddsample.domain.service.impl;
-
-import org.apache.commons.lang.Validate;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.*;
-
-import java.util.Date;
-
-public final class HandlingEventServiceImpl implements HandlingEventService {
-  private CargoRepository cargoRepository;
-  private CarrierMovementRepository carrierMovementRepository;
-  private HandlingEventRepository handlingEventRepository;
-  private LocationRepository locationRepository;
-  private DomainEventNotifier domainEventNotifier;
-
-  @Transactional(readOnly = false)
-  public void register(final Date completionTime, final TrackingId trackingId, final CarrierMovementId carrierMovementId,
-                       final UnLocode unlocode, final HandlingEvent.Type type)
-    throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
-
-    // Carrier movement may be null for certain event types
-    Validate.noNullElements(new Object[]{trackingId, unlocode, type});
-
-    Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) throw new UnknownTrackingIdException(trackingId);
-
-    final CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
-    final Location location = findLocation(unlocode);
-    final Date registrationTime = new Date();
-
-    final HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, type, location, carrierMovement);
-
-    /*
-      NOTE:
-        The cargo instance that's loaded and associated with the handling event is
-        in an inconsitent state, because the cargo delivery history's collection of
-        events does not contain the event created here. However, this is not a problem,
-        because cargo is in a different aggregate from handling event.
-
-        The rules of an aggregate dictate that all consistency rules within the aggregate
-        are enforced synchronously in the transaction, but consistency rules of other aggregates
-        are enforced by asynchronous updates, after the commit of this transaction.
-     */
-    handlingEventRepository.save(event);
-
-    domainEventNotifier.cargoWasHandled(event);
-  }
-
-  private CarrierMovement findCarrierMovement(final CarrierMovementId carrierMovementId)
-    throws UnknownCarrierMovementIdException {
-
-    if (carrierMovementId == null) {
-      return null;
-    }
-    final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
-    if (carrierMovement == null) {
-      throw new UnknownCarrierMovementIdException(carrierMovementId);
-    }
-
-    return carrierMovement;
-  }
-
-  private Location findLocation(final UnLocode unlocode) throws UnknownLocationException {
-    if (unlocode == null) {
-      return Location.UNKNOWN;
-    }
-
-    final Location location = locationRepository.find(unlocode);
-    if (location == null) {
-      throw new UnknownLocationException(unlocode);
-    }
-
-    return location;
-  }
-
-  public void setCargoRepository(final CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  public void setCarrierMovementRepository(final CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
-  }
-
-  public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
-  public void setLocationRepository(final LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setDomainEventNotifier(DomainEventNotifier domainEventNotifier) {
-    this.domainEventNotifier = domainEventNotifier;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/TrackingServiceImpl.java

@@ -1,58 +0,0 @@
-package se.citerus.dddsample.domain.service.impl;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.service.TrackingService;
-
-public class TrackingServiceImpl implements TrackingService {
-
-  private CargoRepository cargoRepository;
-
-  private final Log logger = LogFactory.getLog(getClass());
-
-  @Transactional(readOnly = true)
-  public Cargo track(final TrackingId trackingId) {
-    Validate.notNull(trackingId);
-
-    return cargoRepository.find(trackingId);
-  }
-
-  @Transactional(readOnly = true)
-  public void inspectCargo(final TrackingId trackingId) {
-    Validate.notNull(trackingId);
-
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) {
-      logger.warn("Can't notify listeners for non-existing cargo " + trackingId);
-      return;
-    }
-
-    if (cargo.isMisdirected()) {
-      handleMisdirectedCargo(cargo);
-    }
-    if (cargo.isUnloadedAtDestination()) {
-      notifyCustomerOfAvailability(cargo);
-    }
-  }
-
-  private void notifyCustomerOfAvailability(Cargo cargo) {
-    // TODO: more elaborate notifications
-    logger.info("Cargo " + cargo.trackingId() + " has been unloaded " +
-      "at its final destination " + cargo.destination());
-  }
-
-  private void handleMisdirectedCargo(Cargo cargo) {
-    logger.info("Cargo " + cargo.trackingId() + " has been misdirected. " +
-      "Last event was " + cargo.deliveryHistory().lastEvent());
-  }
-
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/package.html

@@ -1,9 +0,0 @@
-<html>
-<body>
-<p>
-  Domain services. Those services that may be implemented purely using the domain layer
-  have their implementations here, other implementations may be part of the aplication
-  or infrastructure layers.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/ui/CargoAdminController.java

@@ -1,106 +0,0 @@
-package se.citerus.dddsample.ui;
-
-import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.application.remoting.BookingServiceFacade;
-import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remoting.dto.LegDTO;
-import se.citerus.dddsample.application.remoting.dto.LocationDTO;
-import se.citerus.dddsample.ui.command.RegistrationCommand;
-import se.citerus.dddsample.ui.command.RouteAssignmentCommand;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Handles cargo booking and routing. Operates against a dedicated remoting service facade,
- * and could easily be rewritten as a thick Swing client. Completely separated from the domain layer,
- * unlike the tracking user interface.
- * <p/>
- * In order to successfully keep the domain model shielded from user interface considerations,
- * this approach is generally preferred to the one taken in the tracking controller. However,
- * there is never any one perfect solution for all situations, so we've chosen to demonstrate
- * two polarized ways to build user interfaces.   
- *
- * @see CargoTrackingController
- */
-public final class CargoAdminController extends MultiActionController {
-
-  private BookingServiceFacade bookingServiceFacade;
-
-  public Map registrationForm(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
-
-    final List<String> unLocodeStrings = new ArrayList<String>();
-
-    for (LocationDTO dto : dtoList) {
-      unLocodeStrings.add(dto.getUnLocode());
-    }
-
-    map.put("unlocodes", unLocodeStrings);
-    return map;
-  }
-
-  public void register(final HttpServletRequest request, final HttpServletResponse response,
-                       final RegistrationCommand command) throws Exception {
-
-    final String trackingId = bookingServiceFacade.registerNewCargo(
-      command.getOriginUnlocode(), command.getDestinationUnlocode()
-    );
-    response.sendRedirect("show.html?trackingId=" + trackingId);
-  }
-
-  public Map list(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
-
-    map.put("cargoList", cargoList);
-    return map;
-  }
-
-  public Map show(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final String trackingId = request.getParameter("trackingId");
-    final CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
-    map.put("cargo", dto);
-    return map;
-  }
-
-  public Map selectItinerary(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-    final Map<String, Object> map = new HashMap<String, Object>();
-    final String trackingId = request.getParameter("trackingId");
-    final List<ItineraryCandidateDTO> itineraryCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
-
-    if (request.getParameter("spec") != null) {
-      map.put("itineraryCandidates", itineraryCandidates);
-    }
-
-    final CargoRoutingDTO cargoDTO = bookingServiceFacade.loadCargoForRouting(trackingId);
-    map.put("origin", cargoDTO.getOrigin());
-    map.put("destination", cargoDTO.getFinalDestination());
-    map.put("trackingId", trackingId);
-    return map;
-  }
-
-  public void assignItinerary(final HttpServletRequest request, final HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
-    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
-    for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
-      legDTOs.add(new LegDTO(leg.getCarrierMovementId(), leg.getFromUnLocode(), leg.getToUnLocode()));
-    }
-
-    final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
-
-    bookingServiceFacade.assignCargoToRoute(command.getTrackingId(), selectedItinerary);
-
-    response.sendRedirect("list.html");
-  }
-
-  public void setBookingServiceFacade(BookingServiceFacade bookingServiceFacade) {
-    this.bookingServiceFacade = bookingServiceFacade;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingController.java

@@ -1,65 +0,0 @@
-package se.citerus.dddsample.ui;
-
-import org.springframework.context.MessageSource;
-import org.springframework.validation.BindException;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.SimpleFormController;
-import org.springframework.web.servlet.support.RequestContextUtils;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.service.TrackingService;
-import se.citerus.dddsample.ui.command.TrackCommand;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Controller for tracking cargo. This interface sits immediately on top of the
- * domain layer, unlike the booking interface which has a a remote facade and supporting
- * DTOs in between.
- * <p/>
- * An adapter class, designed for the tracking use case, is used to wrap the domain model
- * to make it easier to work with in a web page rendering context. We do not want to apply
- * view rendering constraints to the design of our domain model, and the adapter
- * helps us shield the domain model classes. 
- * <p/>
- *
- * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
- * @see CargoAdminController
- *
- */
-public final class CargoTrackingController extends SimpleFormController {
-
-  private TrackingService trackingService;
-
-  public CargoTrackingController() {
-    setCommandClass(TrackCommand.class);
-  }
-
-  @Override
-  protected ModelAndView onSubmit(final HttpServletRequest request, final HttpServletResponse response,
-                                  final Object command, final BindException errors) throws Exception {
-
-    final TrackCommand trackCommand = (TrackCommand) command;
-    final String trackingIdString = trackCommand.getTrackingId();
-    final Cargo cargo = trackingService.track(new TrackingId(trackingIdString));
-
-    final Map<String, CargoTrackingViewAdapter> model = new HashMap();
-    if (cargo != null) {
-      final MessageSource messageSource = getApplicationContext();
-      final Locale locale = RequestContextUtils.getLocale(request);
-      model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale));
-    } else {
-      errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()},
-        "Unknown tracking id");
-    }
-    return showForm(request, response, errors, model);
-  }
-
-  public void setTrackingService(TrackingService trackingService) {
-    this.trackingService = trackingService;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingViewAdapter.java

@@ -1,168 +0,0 @@
-package se.citerus.dddsample.ui;
-
-import org.springframework.context.MessageSource;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.DeliveryHistory;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * View adapter for displaying a cargo in a tracking context.
- */
-public final class CargoTrackingViewAdapter {
-
-  private final Cargo cargo;
-  private final MessageSource messageSource;
-  private final Locale locale;
-  private final List<HandlingEventViewAdapter> events;
-
-  /**
-   * Constructor.
-   *
-   * @param cargo
-   * @param messageSource
-   * @param locale
-   */
-  public CargoTrackingViewAdapter(Cargo cargo, MessageSource messageSource, Locale locale) {
-    this.messageSource = messageSource;
-    this.locale = locale;
-    this.cargo = cargo;
-
-    final List<HandlingEvent> handlingEvents = cargo.deliveryHistory().eventsOrderedByCompletionTime();
-    this.events = new ArrayList<HandlingEventViewAdapter>(handlingEvents.size());
-    for (HandlingEvent handlingEvent : handlingEvents) {
-      events.add(new HandlingEventViewAdapter(handlingEvent));
-    }
-  }
-
-  /**
-   * @param location a location
-   * @return A formatted string for displaying the location.
-   */
-  private String getDisplayText(Location location) {
-    return location.unLocode().idString() + " (" + location.name() + ")";
-  }
-
-  /**
-   * @return An unmodifiable list of handling event view adapters.
-   */
-  public List<HandlingEventViewAdapter> getEvents() {
-    return Collections.unmodifiableList(events);
-  }
-
-  /**
-   * @return A translated string describing the cargo status. 
-   */
-  public String getStatusText() {
-    final DeliveryHistory deliveryHistory = cargo.deliveryHistory();
-    final String code = "cargo.status." + deliveryHistory.status().name();
-
-    final Object[] args;
-    switch (deliveryHistory.status()) {
-      case IN_PORT:
-        args = new Object[] {getDisplayText(deliveryHistory.currentLocation())};
-        break;
-      case ONBOARD_CARRIER:
-        args = new Object[] {deliveryHistory.currentCarrierMovement().carrierMovementId().idString()};
-        break;
-      case CLAIMED:
-      case NOT_RECEIVED:
-      case UNKNOWN:
-      default:
-        args = null;
-        break;
-    }
-    
-    return messageSource.getMessage(code, args, "[Unknown status]", locale);
-  }
-
-  /**
-   * @return Cargo destination location.
-   */
-  public String getDestination() {
-    return getDisplayText(cargo.destination());
-  }
-
-  /**
-   * @return Cargo osigin location.
-   */
-  public String getOrigin() {
-    return getDisplayText(cargo.origin());
-  }
-
-  /**
-   * @return Cargo tracking id.
-   */
-  public String getTrackingId() {
-    return cargo.trackingId().idString();
-  }
-
-  /**
-   * @return True if cargo is misdirected.
-   */
-  public boolean isMisdirected() {
-    return cargo.isMisdirected();
-  }
-
-  /**
-   * Handling event view adapter component.
-   */
-  public final class HandlingEventViewAdapter {
-
-    private final HandlingEvent handlingEvent;
-    private final String FORMAT = "yyyy-MM-dd hh:mm";
-
-    /**
-     * Constructor.
-     *
-     * @param handlingEvent handling event
-     */
-    public HandlingEventViewAdapter(HandlingEvent handlingEvent) {
-      this.handlingEvent = handlingEvent;
-    }
-
-    /**
-     * @return Location where the event occurred.
-     */
-    public String getLocation() {
-      return handlingEvent.location().unLocode().idString();
-    }
-
-    /**
-     * @return Time when the event was completed.
-     */
-    public String getTime() {
-      return new SimpleDateFormat(FORMAT).format(handlingEvent.completionTime());
-    }
-
-    /**
-     * @return Type of event.
-     */
-    public String getType() {
-      return handlingEvent.type().toString();
-    }
-
-    /**
-     * @return Carrier movement id, or empty string if not applicable.
-     */
-    public String getCarrierMovement() {
-      final CarrierMovement cm = handlingEvent.carrierMovement();
-      return cm != null ? cm.carrierMovementId().toString() : "";
-    }
-
-    /**
-     * @return True if the event was expected, according to the cargo's itinerary.
-     */
-    public boolean isExpected() {
-      return cargo.itinerary().isExpected(handlingEvent);
-    }
-
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/ui/command/RegistrationCommand.java

@@ -1,27 +0,0 @@
-package se.citerus.dddsample.ui.command;
-
-/**
- *
- */
-public final class RegistrationCommand {
-
-  private String originUnlocode;
-  private String destinationUnlocode;
-
-  public String getOriginUnlocode() {
-    return originUnlocode;
-  }
-
-  public void setOriginUnlocode(final String originUnlocode) {
-    this.originUnlocode = originUnlocode;
-  }
-
-  public String getDestinationUnlocode() {
-    return destinationUnlocode;
-  }
-
-  public void setDestinationUnlocode(final String destinationUnlocode) {
-    this.destinationUnlocode = destinationUnlocode;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/ui/command/RouteAssignmentCommand.java

@@ -1,70 +0,0 @@
-package se.citerus.dddsample.ui.command;
-
-import org.apache.commons.collections.Factory;
-import org.apache.commons.collections.ListUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RouteAssignmentCommand {
-
-  private String trackingId;
-  private List<LegCommand> legs = ListUtils.lazyList(
-    new ArrayList(), LegCommand.factory()
-  );
-
-  public String getTrackingId() {
-    return trackingId;
-  }
-
-  public void setTrackingId(String trackingId) {
-    this.trackingId = trackingId;
-  }
-
-  public List<LegCommand> getLegs() {
-    return legs;
-  }
-
-  public void setLegs(List<LegCommand> legs) {
-    this.legs = legs;
-  }
-
-  public static final class LegCommand {
-    private String carrierMovementId;
-    private String fromUnLocode;
-    private String toUnLocode;
-
-    public String getCarrierMovementId() {
-      return carrierMovementId;
-    }
-
-    public void setCarrierMovementId(final String carrierMovementId) {
-      this.carrierMovementId = carrierMovementId;
-    }
-
-    public String getFromUnLocode() {
-      return fromUnLocode;
-    }
-
-    public void setFromUnLocode(final String fromUnLocode) {
-      this.fromUnLocode = fromUnLocode;
-    }
-
-    public String getToUnLocode() {
-      return toUnLocode;
-    }
-
-    public void setToUnLocode(final String toUnLocode) {
-      this.toUnLocode = toUnLocode;
-    }
-
-    public static Factory factory() {
-      return new Factory() {
-        public Object create() {
-          return new LegCommand();
-        }
-      };
-    }
-    
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommand.java

@@ -1,25 +0,0 @@
-package se.citerus.dddsample.ui.command;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;
-
-public final class TrackCommand {
-
-  /**
-   * The tracking id.
-   */
-  private String trackingId;
-
-  public String getTrackingId() {
-    return trackingId;
-  }
-
-  public void setTrackingId(final String trackingId) {
-    this.trackingId = trackingId;
-  }
-
-  @Override
-  public String toString() {
-    return ToStringBuilder.reflectionToString(this, MULTI_LINE_STYLE);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommandValidator.java

@@ -1,21 +0,0 @@
-package se.citerus.dddsample.ui.command;
-
-import org.springframework.validation.Errors;
-import org.springframework.validation.ValidationUtils;
-import org.springframework.validation.Validator;
-
-/**
- * Validator for {@link TrackCommand}s.
- */
-public final class TrackCommandValidator implements Validator {
-
-  public boolean supports(final Class clazz) {
-    return TrackCommand.class.isAssignableFrom(clazz);
-  }
-
-  public void validate(final Object object, final Errors errors) {
-    ValidationUtils.rejectIfEmptyOrWhitespace(errors, "trackingId", "error.required", "Required");
-  }
-
-}
-

dddsample/src/main/java/se/citerus/dddsample/ui/command/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Command classes for web data binding and form handling.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/ui/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Web user interfaces for tracking and booking cargo. Uses Spring MVC.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/routingteam/GraphTraversalService.java

@@ -1,14 +0,0 @@
-package se.citerus.routingteam;
-
-import java.util.List;
-
-/**
- * Part of the external graph traversal API exposed by the routing team
- * and used by us (booking and tracking team).
- * 
- */
-public interface GraphTraversalService {
-
-  List<TransitPath> findShortestPath(String originUnLocode, String destinationUnLocode);
-
-}

dddsample/src/main/java/se/citerus/routingteam/TransitEdge.java

@@ -1,39 +0,0 @@
-package se.citerus.routingteam;
-
-import java.io.Serializable;
-
-/**
- * DTO for a leg in an itinerary.
- */
-public final class TransitEdge implements Serializable {
-
-  private final String carrierMovementId;
-  private final String fromUnLocode;
-  private final String toUnLocode;
-
-  /**
-   * Constructor.
-   *
-   * @param carrierMovementId
-   * @param fromUnLocode
-   * @param toUnLocode
-   */
-  public TransitEdge(final String carrierMovementId, final String fromUnLocode, final String toUnLocode) {
-    this.carrierMovementId = carrierMovementId;
-    this.fromUnLocode = fromUnLocode;
-    this.toUnLocode = toUnLocode;
-  }
-
-  public String getCarrierMovementId() {
-    return carrierMovementId;
-  }
-
-  public String getFromUnLocode() {
-    return fromUnLocode;
-  }
-
-  public String getToUnLocode() {
-    return toUnLocode;
-  }
-
-}

dddsample/src/main/java/se/citerus/routingteam/TransitPath.java

@@ -1,29 +0,0 @@
-package se.citerus.routingteam;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- */
-public final class TransitPath implements Serializable {
-
-  private final List<TransitEdge> transitEdges;
-
-  /**
-   * Constructor.
-   *
-   * @param transitEdges The legs for this itinerary.
-   */
-  public TransitPath(final List<TransitEdge> transitEdges) {
-    this.transitEdges = transitEdges;
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<TransitEdge> getTransitEdges() {
-    return Collections.unmodifiableList(transitEdges);
-  }
-}

dddsample/src/main/java/se/citerus/routingteam/internal/GraphDAO.java

@@ -1,43 +0,0 @@
-package se.citerus.routingteam.internal;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-
-import javax.sql.DataSource;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class GraphDAO {
-
-  private final JdbcTemplate jt;
-
-  public GraphDAO(DataSource dataSource) {
-    jt = new JdbcTemplate(dataSource);
-  }
-
-  public List<String> listLocations() {
-    final List<String> result = new ArrayList();
-
-    jt.query("select unlocode from location", new RowCallbackHandler() {
-      public void processRow(ResultSet resultSet) throws SQLException {
-        result.add(resultSet.getString("unlocode"));
-      }
-    });
-
-    return result;
-  }
-
-  public void storeCarrierMovementId(String cmId, String from, String to) {
-    final String locationSql = "select id from location where unlocode = ?";
-
-    final Long fromId = jt.queryForLong(locationSql, new Object[]{ from });
-    final Long toId = jt.queryForLong(locationSql, new Object[]{ to });
-
-    final Object[] params = {cmId, fromId, toId};
-    jt.update(
-      "insert into CarrierMovement (carrier_movement_id,from_id,to_id) " +
-      "values (?,?,?)", params);
-  }
-}

dddsample/src/main/java/se/citerus/routingteam/internal/GraphTraversalServiceImpl.java

@@ -1,71 +0,0 @@
-package se.citerus.routingteam.internal;
-
-import se.citerus.routingteam.GraphTraversalService;
-import se.citerus.routingteam.TransitEdge;
-import se.citerus.routingteam.TransitPath;
-
-import java.util.*;
-
-public class GraphTraversalServiceImpl implements GraphTraversalService {
-
-  private GraphDAO dao;
-  private Random random;
-
-  public GraphTraversalServiceImpl(GraphDAO dao) {
-    this.dao = dao;
-    this.random = new Random();
-  }
-
-  public List<TransitPath> findShortestPath(String originUnLocode, String destinationUnLocode) {
-    List<String> allVertices = dao.listLocations();
-    allVertices.remove(originUnLocode);
-    allVertices.remove(destinationUnLocode);
-
-    final int candidateCount = getRandomNumberOfCandidates();
-    final List<TransitPath> candidates = new ArrayList<TransitPath>(candidateCount);
-
-    for (int i = 0; i < candidateCount; i++) {
-      allVertices = getRandomChunkOfLocations(allVertices);
-      final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
-      final String firstLegTo = allVertices.get(0);
-
-      transitEdges.add(new TransitEdge(
-        getRandomCarrierMovementId(originUnLocode, firstLegTo),
-        originUnLocode, firstLegTo));
-
-      for (int j = 0; j < allVertices.size() - 1; j++) {
-        final String curr = allVertices.get(j);
-        final String next = allVertices.get(j + 1);
-        transitEdges.add(new TransitEdge(getRandomCarrierMovementId(curr, next), curr, next));
-      }
-
-      final String lastLegFrom = allVertices.get(allVertices.size() - 1);
-      transitEdges.add(new TransitEdge(
-        getRandomCarrierMovementId(lastLegFrom, destinationUnLocode),
-        lastLegFrom, destinationUnLocode));
-
-      candidates.add(new TransitPath(transitEdges));
-    }
-
-    return candidates;
-  }
-
-  private String getRandomCarrierMovementId(String from, String to) {
-    final String random = UUID.randomUUID().toString().toUpperCase();
-    final String cmId =  random.substring(0, 4);
-    dao.storeCarrierMovementId(cmId, from, to);
-    return cmId;
-  }
-
-  private int getRandomNumberOfCandidates() {
-    return 1 + random.nextInt(4);
-  }
-
-  private List<String> getRandomChunkOfLocations(List<String> allLocations) {
-    Collections.shuffle(allLocations);
-    final int total = allLocations.size();
-    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
-    return allLocations.subList(0, chunk);
-  }
-
-}

dddsample/src/main/java/se/citerus/routingteam/internal/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-  Internal parts of the routing team application.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/routingteam/package.html

@@ -1,14 +0,0 @@
-<html>
-<body>
-<p>
-  This is the routing team context, which is separate from "our" application and context.
-  Our domain model with cargo, itinerary, handling event etc does not exist here.
-  The routing service implementation works against the API exposed by
-  this context.
-</p>
-<p>
-  It is not related to the core application at all, and is only part of this source tree for
-  developer convenience.
-</p>
-</body>
-</html>

dddsample/src/main/resources/context-messaging-jms.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:jms="http://www.springframework.org/schema/jms"
-       xmlns:amq="http://activemq.org/config/1.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-        http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
-        http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-
-  <amq:broker useJmx="false" persistent="false">
-    <amq:transportConnectors>
-      <amq:transportConnector uri="tcp://localhost:0"/>
-    </amq:transportConnectors>
-  </amq:broker>
-
-  <amq:connectionFactory id="jmsConnectionFactory" brokerURL="vm://localhost"/>
-
-  <amq:topic id="handlingEventTopic" name="HandlingEventTopic" physicalName="HandlingEventTopic"/>
-
-  <bean id="handlingEventMessageDelegate" class="se.citerus.dddsample.application.messaging.HandlingEventMessageDelegate">
-    <property name="trackingService" ref="trackingService"/>
-  </bean>
-
-  <bean id="jmsContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
-    <property name="connectionFactory" ref="jmsConnectionFactory"/>
-    <property name="destination" ref="handlingEventTopic"/>
-    <property name="messageListener" ref="handlingEventMessageDelegate"/>
-  </bean>
-
-  <bean id="jmsOperations" class="org.springframework.jms.core.JmsTemplate">
-    <property name="connectionFactory" ref="jmsConnectionFactory"/>
-  </bean>
-
-  <bean id="domainEventNotifier" class="se.citerus.dddsample.application.messaging.JmsDomainEventNotifierImpl">
-    <property name="jmsOperations" ref="jmsOperations"/>
-    <property name="destination" ref="handlingEventTopic"/>
-  </bean>
-  
-</beans>

dddsample/src/main/resources/context-messaging-thread.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <bean id="domainEventNotifier" class="se.citerus.dddsample.application.messaging.ThreadBasedDomainEventNotifierImpl">
-    <property name="bookingService" ref="bookingService"/>
-  </bean>
-
-</beans>

dddsample/src/main/resources/context-persistence-hibernate.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="location" value="classpath:jdbc.properties"/>
-  </bean>
-
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="url" value="${hibernate.connection.url}"/>
-    <property name="driverClassName" value="${hibernate.connection.driver_class}"/>
-    <property name="username" value="${hibernate.connection.username}"/>
-    <property name="password" value="${hibernate.connection.password}"/>
-    <property name="initialSize" value="4"/>
-    <property name="defaultAutoCommit" value="false"/>
-  </bean>
-
-  <bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
-    <property name="dataSource" ref="dataSource"/>
-    <property name="configLocation" value="classpath:hibernate.cfg.xml"/>
-  </bean>
-
-  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-  
-  <bean id="cargoRepository" class="se.citerus.dddsample.application.persistence.CargoRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="handlingEventRepository" class="se.citerus.dddsample.application.persistence.HandlingEventRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="carrierMovementRepository" class="se.citerus.dddsample.application.persistence.CarrierMovementRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <bean id="locationRepository" class="se.citerus.dddsample.application.persistence.LocationRepositoryHibernate">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-</beans>

dddsample/src/main/resources/context-persistence-in-mem.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <bean id="transactionManager" class="se.citerus.dddsample.application.service.InMemTransactionManager"/>
-
-  <bean id="cargoRepository" class="se.citerus.dddsample.application.persistence.CargoRepositoryInMem" init-method="init">
-    <property name="handlingEventRepository" ref="handlingEventRepository"/>
-  </bean>
-
-  <bean id="handlingEventRepository" class="se.citerus.dddsample.application.persistence.HandlingEventRepositoryInMem" init-method="init"/>
-
-  <bean id="carrierMovementRepository" class="se.citerus.dddsample.application.persistence.CarrierMovementRepositoryInMem" init-method="setup"/>
-
-  <bean id="locationRepository" class="se.citerus.dddsample.application.persistence.LocationRepositoryInMem"/>
-
-</beans>

dddsample/src/main/resources/context-remote.xml

@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:ws="http://jax-ws.dev.java.net/spring/core"
-       xmlns:wss="http://jax-ws.dev.java.net/spring/servlet"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="
-        http://jax-ws.dev.java.net/spring/core https://jax-ws.dev.java.net/spring/core.xsd
-        http://jax-ws.dev.java.net/spring/servlet https://jax-ws.dev.java.net/spring/servlet.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-
-  <!-- Handling event registration web service -->
-
-  
-  <wss:bindings id="jax-ws.http">
-    <wss:bindings>
-      <wss:binding url="/ws/RegisterEvent">
-        <wss:service>
-          <ws:service bean="#handlingEventServiceEndpoint"/>
-        </wss:service>
-      </wss:binding>
-    </wss:bindings>
-  </wss:bindings>
-
-  <bean id="handlingEventServiceEndpoint" class="se.citerus.dddsample.application.ws.HandlingEventServiceEndpointImpl">
-    <property name="handlingEventService" ref="handlingEventService"/>
-  </bean>
-
-
-  <!-- Booking service facade -->
-
-  
-  <!-- Hibernate interceptor -->
-  <bean id="hibernateInterceptor" class="org.springframework.orm.hibernate3.HibernateInterceptor">
-    <property name="sessionFactory" ref="sessionFactory"/>
-  </bean>
-
-  <!-- Facade wrapped with Hibernate interceptor -->
-  <bean id="bookingServiceFacade" class="org.springframework.aop.framework.ProxyFactoryBean">
-    <property name="interceptorNames">
-      <list>
-        <value>hibernateInterceptor</value>
-      </list>
-    </property>
-    <property name="target">
-      <bean class="se.citerus.dddsample.application.remoting.BookingServiceFacadeImpl">
-        <property name="bookingService" ref="bookingService"/>
-        <property name="cargoRepository" ref="cargoRepository"/>
-        <property name="locationRepository" ref="locationRepository"/>
-        <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
-      </bean>
-    </property>
-  </bean>
-
-  <!-- Wrap all methods with Hibernate interceptor
-  TODO: add necessary aspectj deps and replace config above with this
-  
-  <bean id="bookingServiceFacade" class="se.citerus.dddsample.application.remote.BookingServiceFacadeImpl">
-    <property name="bookingService" ref="bookingService"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="locationRepository" ref="locationRepository"/>
-    <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
-  </bean>
-
-  <aop:config>
-    <aop:advisor advice-ref="hibernateInterceptor"
-                 pointcut="execution (* se.citerus.dddsample.application.remote.BookingServiceFacadeImpl(..))"/>
-  </aop:config>
-  -->
-
-  <!-- RMI exposure -->
-  <bean id="rmiBookingServiceFacade" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.application.remoting.BookingServiceFacade"/>
-    <property name="service" ref="bookingServiceFacade"/>
-    <property name="serviceName" value="BookingService"/>
-  </bean>
-
-</beans>