[maven-release-plugin] copy for tag dddsample-1.0-RC1

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingScenarioTest.java

@@ -1,74 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import junit.framework.TestCase;
-import se.citerus.dddsample.domain.model.cargo.*;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.Date;
-import java.util.List;
-
-public class RoutingScenarioTest extends TestCase {
-
-  RoutingService routingService;
-  CargoRepository cargoRepository;
-  HandlingEventService handlingEventService;
-
-  // TODO work on this
-  public void xtestCalculateRoute() throws Exception {
-
-    TrackingId trackingId = new TrackingId("XYZ123");
-    Cargo cargo = cargoRepository.find(trackingId);
-
-    Date twoWeeksFromNow = new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 14);
-
-    RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, twoWeeksFromNow);
-
-    /*
-      The routing service calculates a number of possible routes that
-      satisfy the given specification (must arrive in three days, must not
-      cost more than $10,000 etc).
-     */
-    List<Itinerary> itineraryCandidates = routingService.fetchRoutesForSpecification(routeSpecification);
-
-    /*
-      Someone, or something, selects the most appropriate itinerary and
-      assigns that itinerary to the cargo.
-     */
-    Itinerary itinerary = stubbedItinerarySelection(itineraryCandidates);
-    cargo.attachItinerary(itinerary);
-
-    /*
-      A number of events occur, all of which are according to plan
-     */
-    handlingEventService.register(new Date(), trackingId, new CarrierMovementId("A001"), new UnLocode("SESTO"), null);
-    handlingEventService.register(new Date(), trackingId, new CarrierMovementId("B002"), null, null);
-    handlingEventService.register(new Date(), trackingId, new CarrierMovementId("C003"), null, null);
-
-    /*
-      Cargo should not be misdirected at this point.
-     */
-    assertFalse(cargo.isMisdirected());
-
-    /*
-      An unexpected event occur.
-     */
-    handlingEventService.register(null, null, null, null, null);
-
-    /*
-      Now the cargo is misdirected.
-     */
-    assertTrue(cargo.isMisdirected());
-  }
-
-  public void testRun() throws Exception
-  {
-    
-  }
-
-
-  private Itinerary stubbedItinerarySelection(List<Itinerary> itineraryCandidates) {
-    return itineraryCandidates.get(0);
-  }
-
-}

dddsample/pom.xml → pom.xml

@@ -1,13 +1,10 @@
-<?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">
+<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>
+  <version>1.0-RC1</version>
   <description>This application shows a few key concepts of
     Domain Driven Design implemented in Enterprise Java.
   </description>
@@ -18,7 +15,7 @@
       <url>scp://shell.sf.net/home/groups/d/dd/dddsample/htdocs</url>
     </site>
   </distributionManagement>
-  <ciManagement/>
+  <ciManagement />
   <repositories>
     <repository>
       <id>maven2-repository.dev.java.net</id>
@@ -90,8 +87,8 @@
     </license>
   </licenses>
   <scm>
-    <developerConnection>scm:svn:https://dddsample.svn.sourceforge.net/svnroot/dddsample</developerConnection>
-    <url>http://ddd.sventon.org</url>
+    <developerConnection>scm:svn:https://dddsample.svn.sourceforge.net/svnroot/dddsample/tags/dddsample-1.0-RC1</developerConnection>
+    <url>http://ddd.sventon.org/tags/dddsample-1.0-RC1</url>
   </scm>
   <properties>
     <spring.version>2.5.1</spring.version>

register-app/assembly.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>true</includeBaseDirectory>
-  
-    <files>
-        <file>
-            <source>src/main/resources/app.properties</source>
-            <destName>app.properties</destName>
-        </file>
-    </files>
-
-    <dependencySets>
-      <dependencySet>
-        <excludes>
-          <exclude>se.citerus:register-app</exclude>
-        </excludes>
-        <outputDirectory>lib</outputDirectory>
-      </dependencySet>
-      <dependencySet>
-        <includes>
-          <include>se.citerus:register-app</include>
-        </includes>
-        <outputFileNameMapping>IncidentLoggingApplication.${artifact.extension}</outputFileNameMapping>
-      </dependencySet>
-    </dependencySets>
-
-</assembly>

register-app/pom.xml

@@ -1,173 +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/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>se.citerus</groupId>
-  <artifactId>register-app</artifactId>
-  <name>register-app</name>
-  <version>1.0-SNAPSHOT</version>
-  <url>http://maven.apache.org</url>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>se.citerus.App</mainClass>
-              <addClasspath>true</addClasspath>
-              <classpathPrefix>lib</classpathPrefix>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>assembly.xml</descriptor>
-          </descriptors>
-          <finalName>IncidentLoggingApplication</finalName>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-    </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>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>2.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.jgoodies</groupId>
-      <artifactId>forms</artifactId>
-      <version>1.0.7</version>
-    </dependency>
-    <dependency>
-      <groupId>com.jgoodies</groupId>
-      <artifactId>looks</artifactId>
-      <version>2.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.ws</groupId>
-      <artifactId>jaxws-rt</artifactId>
-      <version>2.1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>se.citerus</groupId>
-      <artifactId>dddsample</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <classifier>ws-client</classifier>
-      <exclusions>
-        <exclusion>
-          <artifactId>spring-core</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-webmvc</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-orm</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-jdbc</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-aop</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-context</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-jms</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-beans</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hibernate</artifactId>
-          <groupId>org.hibernate</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hibernate-annotations</artifactId>
-          <groupId>org.hibernate</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hibernate-commons-annotations</artifactId>
-          <groupId>org.hibernate</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-dbcp</artifactId>
-          <groupId>commons-dbcp</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hsqldb</artifactId>
-          <groupId>hsqldb</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servlet-api</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>standard</artifactId>
-          <groupId>taglibs</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jstl</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>sitemesh</artifactId>
-          <groupId>opensymphony</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>

register-app/src/main/java/se/citerus/App.java

@@ -1,40 +0,0 @@
-package se.citerus;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import se.citerus.registerapp.RegisterApp;
-
-/**
- * The application main class
- *
- */
-public class App {
-  private static RegisterApp app;
-  
-  public static void main(String[] args) {
-    app = getRegisterApp();
-    
-    //Schedule a job for the event-dispatching thread:
-    //creating and showing this application's GUI.
-    javax.swing.SwingUtilities.invokeLater(new Runnable() {
-        public void run() {
-            app.show();
-        }
-    });
-  }
-
-  private static RegisterApp getRegisterApp() {
-    return (RegisterApp)getBean("registerApp");
-  }
-
-  public static Object getBean(String bean){
-    ApplicationContext context = getContext(); 
-
-    return context.getBean(bean);
-}
-
-public static ClassPathXmlApplicationContext getContext() {
-    return new ClassPathXmlApplicationContext(new String[] {"context-app.xml"});
-}
-}

register-app/src/main/java/se/citerus/registerapp/RegisterApp.java

@@ -1,242 +0,0 @@
-package se.citerus.registerapp;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.swing.*;
-import javax.swing.border.Border;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.LineBorder;
-import javax.swing.plaf.basic.BasicBorders;
-import javax.swing.text.DefaultFormatter;
-
-import se.citerus.registerapp.service.HandlingEventService;
-import se.citerus.registerapp.validation.FormValidationDecorator;
-import se.citerus.registerapp.validation.FormValidationSwingDecorator;
-import se.citerus.registerapp.validation.MandatoryTextFieldValidator;
-
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.debug.FormDebugPanel;
-import com.jgoodies.forms.factories.ButtonBarFactory;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class RegisterApp {
-  private static final DefaultFormatter DEFAULT_FORMATTER = new DefaultFormatter();
-  private static final SimpleDateFormat ISO8601_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:MM:SS.SSS");
-  private static final String TITLE = "Incident Logging Application";
-  private JFrame frame;
-  private JFormattedTextField completionTimeField;
-  private JFormattedTextField trackingIdField;
-  private JFormattedTextField carrierMovementField;
-  private JFormattedTextField locationField;
-  //private JFormattedTextField eventTypeField;
-  private JComboBox eventTypeField;
-  private JButton registerButton;
-  
-  private HandlingEventService handlingEventService;
-  private boolean debugUI;
-  private FormValidationDecorator validator;
-
-
-
-  /////////////////////////////////////////////////////////////////////////////
-  // GUI EVENT HANDLING
-  /////////////////////////////////////////////////////////////////////////////
-  protected void onRegister(){
-    assert handlingEventService != null : "No HandlingEventService available";
-
-      handlingEventService.register(ISO8601_DATE_FORMAT.format(completionTimeField.getValue()),
-                                  getStringValue(trackingIdField),
-                                  getStringValue(carrierMovementField),
-                                  getStringValue(locationField),
-                                  getStringValue(eventTypeField).toUpperCase());
-    
-    clearForm();
-  }
-
-  private String getStringValue(JComboBox comboBox) {
-      Object value = comboBox.getSelectedItem();
-      
-      if (value != null) {
-        return value.toString();
-      } else {
-        return null;
-      }
-  }
-
-
-  private String getStringValue(JFormattedTextField formattedTextField) {
-    Object value = formattedTextField.getValue();
-    
-    if (value != null) {
-      return value.toString();
-    } else {
-      return null;
-    }
-  }
-  
-  
-  /////////////////////////////////////////////////////////////////////////////
-  // PUBLIC API
-  /////////////////////////////////////////////////////////////////////////////
-  public void show() {
-    try {
-      UIManager.setLookAndFeel("com.jgoodies.looks.plastic.PlasticXPLookAndFeel");
-    } catch (Exception e) {
-      // Likely PlasticXP is not in the class path; ignore.
-    }
-    
-    initComponents();
-    JComponent panel = createMainPanel();
-    
-    
-    frame = createFrame(panel);
-    frame.pack();
-    centerOnScreen(frame);
-    
-    initValidation(frame);
-    
-    frame.setVisible(true);
-    
-    clearForm();
-  }
-
-
-  public void setHandlingEventService(HandlingEventService handlingEventService) {
-    this.handlingEventService = handlingEventService;
-  }
-
-  public void setDebugUI(boolean on){
-    this.debugUI = on;
-  }
-
-  /////////////////////////////////////////////////////////////////////////////
-  // GUI SETUP
-  /////////////////////////////////////////////////////////////////////////////
-  private void clearForm() {
-    completionTimeField.setText(ISO8601_DATE_FORMAT.format(new Date()));
-    trackingIdField.setText("");
-    carrierMovementField.setText("");
-    locationField.setText("");
-    eventTypeField.setSelectedIndex(0);
-  }
-
-  public static Border getMandatoryBorder() {
-    return new CompoundBorder(new LineBorder(Color.RED), new BasicBorders.MarginBorder());
-  }
-  
-  private void initComponents(){
-    completionTimeField = new JFormattedTextField(ISO8601_DATE_FORMAT);
-    trackingIdField = new JFormattedTextField(DEFAULT_FORMATTER);
-    carrierMovementField = new JFormattedTextField(DEFAULT_FORMATTER);
-    locationField = new JFormattedTextField(DEFAULT_FORMATTER);
-    eventTypeField = new JComboBox(new String[] {"-- Select --","Receive","Load","Unload","Customs","Claim"});
-    
-    registerButton = new JButton("Register");
-    registerButton.addActionListener(new ActionListener(){
-      public void actionPerformed(ActionEvent e) {
-        if (validator.validate()){
-          onRegister();
-        }
-      }
-    });
-  }
-
-  /**
-   * We need to do initialization of validators after the components and their parent frame has been initialized.
-   * @param frame 
-   * 
-   */
-  private void initValidation(JFrame frame){
-    validator = new FormValidationSwingDecorator(frame);
-    
-    validator.add(trackingIdField, new MandatoryTextFieldValidator("Tracking id can't be empty"));
-    validator.add(locationField, new MandatoryTextFieldValidator("Location can't be empty"));
-  }
-  
-  
-  /**
-   * Center a component on the screen.
-   * 
-   * @param component the component to be centered
-   */
-
-  public static void centerOnScreen(Component component) {
-      Dimension componentSize = component.getSize();
-      Dimension screenSize = component.getToolkit().getScreenSize();
-
-      component.setLocation(
-          (screenSize.width  - componentSize.width)  / 2,
-          (int) ((screenSize.height - componentSize.height) *0.45));
-
-  }
-
-  private JFrame createFrame(JComponent panel) {
-    JFrame f = new JFrame();
-    f.setTitle(TITLE);
-    f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-    f.getContentPane().add(panel);
-    
-    return f;
-  }
-
-  private JComponent createMainPanel() {
-    JComponent fieldPanel = createFieldPanel();
-    JComponent buttonPanel = createButtonPanel();
-    
-    DefaultFormBuilder mainBuilder = createBuilder("p");
-    mainBuilder.append(fieldPanel);
-    mainBuilder.append(buttonPanel);
-    
-    return mainBuilder.getPanel();
-  }
-
-
-  private JComponent createButtonPanel() {
-    return ButtonBarFactory.buildRightAlignedBar(registerButton);
-  }
-
-
-  private JComponent createFieldPanel() {
-    DefaultFormBuilder builder = createBuilder("right:pref, 3dlu, 100dlu");
-    
-    builder.appendSeparator("Completion");
-    builder.append("Time", completionTimeField); builder.nextLine();
-    
-    builder.appendSeparator("Cargo");
-    builder.append("Tracking Id", trackingIdField); builder.nextLine();
-    
-    builder.appendSeparator("Event");
-    builder.append("Carrier Movement", carrierMovementField); builder.nextLine();
-    builder.append("Location UN/Locode", locationField); builder.nextLine();
-    builder.append("Event Type", eventTypeField); builder.nextLine();
-    
-    builder.appendSeparator("");
-    
-    return builder.getPanel();
-  }
-
-
-  private DefaultFormBuilder createBuilder(String colSpec) {
-    FormLayout layout = new FormLayout(colSpec);
-
-    DefaultFormBuilder builder = createDefaultFormBuilder(layout);
-    builder.setDefaultDialogBorder();
-    return builder;
-  }
-
-
-  private DefaultFormBuilder createDefaultFormBuilder(FormLayout layout) {
-    if (debugUI){
-      return new DefaultFormBuilder(layout, new FormDebugPanel());
-    } else {
-      return new DefaultFormBuilder(layout);
-    }
-  }
- 
-}

register-app/src/main/java/se/citerus/registerapp/service/HandlingEventService.java

@@ -1,14 +0,0 @@
-package se.citerus.registerapp.service;
-
-public interface HandlingEventService {
-  /**
-   * 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);
-}

register-app/src/main/java/se/citerus/registerapp/service/HandlingEventServiceWs.java

@@ -1,17 +0,0 @@
-package se.citerus.registerapp.service;
-
-import se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint;
-
-
-public class HandlingEventServiceWs implements HandlingEventService {
-  private HandlingEventServiceEndpoint endPoint;
-  
-  public void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType){
-    System.out.println(completionTime);
-    endPoint.register(completionTime, trackingId, carrierMovementId, unlocode, eventType);
-  }
-
-  public void setEndPoint(HandlingEventServiceEndpoint endPoint) {
-    this.endPoint = endPoint;
-  }
-}

register-app/src/main/java/se/citerus/registerapp/validation/AbstractFormValidationDecorator.java

@@ -1,41 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.util.HashMap;
-import java.util.Map.Entry;
-
-import javax.swing.JComponent;
-
-public abstract class AbstractFormValidationDecorator implements FormValidationDecorator{
-  private HashMap<JComponent, ComponentValidator> validators = new HashMap<JComponent, ComponentValidator>();
-
-  public void add(final JComponent component, ComponentValidator validator) {
-    this.validators.put(component, validator);
-
-    component.addKeyListener(new KeyListener(){
-      public void keyPressed(KeyEvent e) {
-        for (final Entry<JComponent, ComponentValidator> entry : validators.entrySet()) {
-          undecorate(entry.getKey());
-        }
-      }
-
-      public void keyReleased(KeyEvent e) {}
-      public void keyTyped(KeyEvent e) {}
-    });
-  }
-
-  public boolean validate() {
-    boolean allValidated = true;
-    for (final Entry<JComponent, ComponentValidator> entry : validators.entrySet()) {
-      if (!entry.getValue().validate(entry.getKey())){
-        decorate(entry.getKey(), entry.getValue());
-        allValidated = false;
-      }
-    }
-    return allValidated;
-  }
-  
-  public abstract void decorate(JComponent component, ComponentValidator validator);
-  public abstract void undecorate(JComponent component);
-}

register-app/src/main/java/se/citerus/registerapp/validation/AbstractValidator.java

@@ -1,96 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-
-import javax.swing.ImageIcon;
-import javax.swing.InputVerifier;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-public abstract class AbstractValidator extends InputVerifier implements KeyListener{
-  private static final Color ERROR_COMPONENT_COLOR = Color.PINK;
-  private static final Color POPUP_COLOR = new Color(243, 255, 159);
-  private JPanel popup;
-  private JLabel messageLabel = new JLabel();;
-  private JLabel image = new JLabel();
-  private JFrame parent;
-  private String message;;
-
-  
-  
-  public AbstractValidator(String message) {
-    this.message = message;
-  }
-  
-  public String getMessage(){
-    return message;
-  }
-
-  public AbstractValidator(JFrame parent, JComponent c, String message) {
-    c.addKeyListener(this);
-    popup = new JPanel();
-    this.parent = parent;
-    messageLabel = new JLabel(message + " ");
-    image = new JLabel(new ImageIcon("/icon/error_16x16.png"));
-    initComponents();
-  }
-
-  /**
-   * Implement the actual validation logic in this method. The method should
-   * return false if data is invalid and true if it is valid.
-   * 
-   * @param c The JComponent to be validated.
-   * @return false if data is invalid. true if it is valid.
-   */
-  protected abstract boolean validate(JComponent c);
-
-  @Override
-  public boolean verify(JComponent component) {
-    if (!validate(component)) {
-
-//      
-//      Dimension compSize = component.getSize();
-//      Point compPos = popup.getLocation();
-//      
-//      component.setBackground(ERROR_COMPONENT_COLOR);
-//
-//      popup.setLocation(
-//          compPos.x - (int) compSize.getWidth() / 2, 
-//          compPos.y + (int) compSize.getHeight() / 2);
-      
-      parent.setGlassPane(popup);
-      component.setBackground(ERROR_COMPONENT_COLOR);
-      popup.setVisible(true);
-      return false;
-    } else {
-      component.setBackground(Color.WHITE);
-      return true;
-    }
-  }
-
-  public void keyPressed(KeyEvent e) {
-    popup.setVisible(false);    
-  }
-
-  public void keyReleased(KeyEvent e) {}
-
-  public void keyTyped(KeyEvent e) {}
-  
-  
-  private void initComponents() {
-    popup.setLayout(new FlowLayout());
-//    popup.setUndecorated(true);
-    popup.setBackground(POPUP_COLOR);
-    popup.add(image);
-    popup.add(messageLabel);
-//    popup.setOpaque(false);
-//    popup.setFocusableWindowState(false);
-  }
-
-
-}

register-app/src/main/java/se/citerus/registerapp/validation/ComponentValidator.java

@@ -1,8 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import javax.swing.JComponent;
-
-public interface ComponentValidator {
-  boolean validate(JComponent c);
-  String getMessage();
-}

register-app/src/main/java/se/citerus/registerapp/validation/FormValidationDecorator.java

@@ -1,13 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import javax.swing.JComponent;
-
-
-public interface FormValidationDecorator {
-
-  void add(final JComponent component, ComponentValidator validator);
-
-  boolean validate();
-
-  
-}

register-app/src/main/java/se/citerus/registerapp/validation/FormValidationSwingDecorator.java

@@ -1,118 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Point;
-import java.util.HashMap;
-
-import javax.swing.ImageIcon;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-public class FormValidationSwingDecorator extends AbstractFormValidationDecorator{
-
-  private static final int POPUP_Y_OFFSET = 0;
-  private static final int POPUP_X_OFFSET = 12;
-  private Color oldColor = Color.WHITE;
-  private JFrame form;
-  private String message;
-  private HashMap<JComponent, JPanel> popups = new HashMap<JComponent, JPanel>();
-  private JPanel glassPane = new JPanel();
-
-  public FormValidationSwingDecorator(JFrame form) {
-    assert form != null : "Can't decorate null frame";
-    
-    this.form = form;
-    glassPane.setOpaque(false);
-    glassPane.setVisible(false);
-    glassPane.setLayout(null);
-//    glassPane.setPreferredSize(form.getPreferredSize());
-    glassPane.setSize(form.getSize());
-    
-    form.setGlassPane(glassPane);
-    
-    
-  }
-
-  public FormValidationSwingDecorator(JFrame form, String message) {
-    this(form);
-    
-    this.message = message;
-  }
-
-  private JPanel createPopupRelativeTo(JComponent component) {
-    JPanel popupPane = null;
-    
-    if (popups.containsKey(component)){
-      popupPane = popups.get(component);
-    } else {
-      popupPane = new JPanel(new FlowLayout());
-      glassPane.add(popupPane);
-      glassPane.setVisible(true);
-      
-      popupPane.add(getIconLabel());
-      popupPane.add(getMessageLabel());
-      popupPane.setLocation(getPopupPositionRelativeTo(component));
-      popupPane.setVisible(true);
-      popupPane.setOpaque(false);
-      popupPane.validate();
-      popupPane.setSize(popupPane.getPreferredSize());
-     
-    }
-    
-    return popupPane;
-  }
-
-  private Point getPopupPositionRelativeTo(JComponent component) {
-    Point compPos = component.getLocation();
-    Dimension compDim = component.getSize();
-    Point popupPos = new Point(compPos.x + POPUP_X_OFFSET, compPos.y + compDim.height + POPUP_Y_OFFSET);
-    
-    System.out.println("Comp pos: " + compPos + " - Popup pos: " + popupPos);
-    return popupPos;
-  }
-
-  private JLabel getMessageLabel() {
-    JLabel label = new JLabel(message != null ? message : "");
-    label.setOpaque(false);
-    return label;
-  }
-
-  private JLabel getIconLabel() {
-    JLabel label = new JLabel();
-    
-    java.net.URL imageURL = this.getClass().getResource("/icon/error_16x16.png");
-    if (imageURL != null){
-      ImageIcon icon = new ImageIcon(imageURL);
-      label.setIcon(icon);
-    } else {
-      System.out.println("No icon found");
-    }
-    
-    
-    label.setOpaque(false);
-    return label;
-  }
-  
-  @Override
-  public void decorate(JComponent component, ComponentValidator validator) {
-    this.message = validator.getMessage();
-    this.oldColor = component.getBackground();
-    component.setBackground(Color.PINK);
-    JPanel panel = createPopupRelativeTo(component);
-    popups.put(component, panel);
-    panel.setVisible(true);
-  }
-
-  @Override
-  public void undecorate(JComponent component) {
-    component.setBackground(oldColor);
-    JPanel panel = popups.get(component);
-    if (panel != null){
-      panel.setVisible(false);
-    }
-  }
-}

register-app/src/main/java/se/citerus/registerapp/validation/MandatoryTextFieldValidator.java

@@ -1,25 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import javax.swing.JComponent;
-import javax.swing.JTextField;
-
-public class MandatoryTextFieldValidator implements ComponentValidator {
-  private String message;
-
-  public MandatoryTextFieldValidator(String message) {
-    this.message = message;
-  }
-
-  public boolean validate(JComponent c) {
-    JTextField field = (JTextField) c;
-    
-    boolean valid = !"".equals(field.getText());
-    
-    return valid;
-  }
-
-  public String getMessage() {
-    return message;
-  }
-
-}

register-app/src/main/resources/app.properties

@@ -1 +0,0 @@
-wsdl.url=http://localhost:8080/dddsample/ws/RegisterEvent?wsdl

register-app/src/main/resources/context-app.xml

@@ -1,36 +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 class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="locations" value="file:app.properties"/>
-    <property name="order" value="1"/>
-    <property name="ignoreResourceNotFound" value="true"/>
-    <property name="ignoreUnresolvablePlaceholders" value="true"/>
-  </bean>
-
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="locations" value="classpath:app.properties"/>
-    <property name="order" value="2"/>
-  </bean>
-
-  <bean id="registerApp" class="se.citerus.registerapp.RegisterApp">
-    <property name="handlingEventService" ref="handlingEventServiceWs"/>
-    <property name="debugUI" value="false" />
-  </bean>
-
-  <bean id="handlingEventServiceWs" class="se.citerus.registerapp.service.HandlingEventServiceWs">
-    <property name="endPoint" ref="handlingEventWebServiceEndPoint"/>
-  </bean>
-
-  <bean id="handlingEventWebServiceEndPoint" class="org.springframework.remoting.jaxws.JaxWsPortProxyFactoryBean">
-    <property name="serviceInterface" value="se.citerus.dddsample.application.ws.HandlingEventServiceEndpoint" />
-    <property name="wsdlDocumentUrl" value="${wsdl.url}" />
-    <property name="namespaceUri" value="http://ws.application.dddsample.citerus.se/" />
-    <property name="serviceName" value="HandlingEventServiceEndpointImplService" />
-    <property name="portName" value="HandlingEventServiceEndpointImplPort" />
-  </bean>
-
-</beans>

register-app/src/main/resources/log4j.properties

@@ -1,23 +0,0 @@
-# For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml!
-# For all other servers: Comment out the Log4J listener in web.xml to activate Log4J.
-log4j.rootLogger=info, stdout, logfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
-
-log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.File=${java.io.tmpdir}/registration-app.log
-log4j.appender.logfile.MaxFileSize=512KB
-# Keep three backup files.
-log4j.appender.logfile.MaxBackupIndex=3
-# Pattern to output: date priority [category] - message
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
-
-log4j.logger.se.citerus.dddsample=debug
-log4j.logger.net.sf.ehcache.config.ConfigurationFactory=error
-log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=debug
-
-#log4j.logger.org.springframework.orm=debug
-#log4j.logger.org.springframework.transaction=debug

register-app/src/test/java/se/citerus/AppTest.java

@@ -1,38 +0,0 @@
-package se.citerus;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

register-app/src/test/java/se/citerus/registerapp/validation/ValidationTest.java

@@ -1,120 +0,0 @@
-package se.citerus.registerapp.validation;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JTextField;
-
-import junit.framework.TestCase;
-
-public class ValidationTest extends TestCase {
-  private boolean actionPerformed;
-
-  public void testValidationScenario() throws Exception {
-    JFrame frame = new JFrame();
-    
-    final FormValidationDecorator validationDecorator = new FormValidationSwingDecorator(frame);
-    
-    JTextField field1 = new JTextField();
-    JTextField field2 = new JTextField();
-    JButton button = new JButton();
-    frame.add(field1);
-    frame.add(field2);
-    frame.add(button);
-    
-    
-    ValidatorMock validator1 = createValidator("No Way!", true);
-    validationDecorator.add(field1, validator1);
-    
-    ValidatorMock validator2 = createValidator("My Way!", true);
-    validationDecorator.add(field2, validator2);
-    
-   button.addActionListener(new ActionListener(){
-    public void actionPerformed(ActionEvent e) {
-      if (validationDecorator.validate()){
-        onAction();
-      }
-    }
-   });
-   
-   
-   
-   field1.setText("Field1");
-   field2.setText("");
-   button.doClick();
-   assertTrue("Field1 not validated", validator1.isValidated());
-   assertTrue("Field2 not validated", validator2.isValidated());
-   assertTrue("Button action not performed", actionPerformed);
-  }
-  
-  public void testValidationFailure() throws Exception {
-    JFrame frame = new JFrame();
-    final FormValidationDecorator validator = new FormValidationSwingDecorator(frame);
-    
-    JTextField field1 = new JTextField();
-    JTextField field2 = new JTextField();
-    JButton button = new JButton();
-    frame.add(field1);
-    frame.add(field2);
-    frame.add(button);
-    
-    ValidatorMock validator1 = createValidator("No Way!", true);
-    validator.add(field1, validator1);
-    
-    ValidatorMock validator2 = createValidator("My Way!", false);
-    validator.add(field2, validator2);
-    
-   button.addActionListener(new ActionListener(){
-    public void actionPerformed(ActionEvent e) {
-      if (validator.validate()){
-        onAction();
-      }
-    }
-   });
-   
-   field1.setText("Field1");
-   field2.setText("");
-   button.doClick();
-   assertTrue("Field1 not validated", validator1.isValidated());
-   assertTrue("Field2 not validated", validator2.isValidated());
-   assertFalse("Button action should not be performed", actionPerformed);
-  }
-  
-
-  private ValidatorMock createValidator(String message, boolean result) {
-    return new ValidatorMock(message, result);
-  }
-
-  protected void onAction() {
-    this.actionPerformed = true;
-    // Do some action...
-  }
-  
-  private static final class ValidatorMock implements ComponentValidator{
-    private final boolean result;
-    private boolean validated;
-    private String message;
-    
-    public ValidatorMock(String message, boolean result) {
-      this.message = message;
-      this.result = result;
-    }
-
-    public boolean validate(JComponent c) {
-      validated = true;
-      return result;
-    }
-
-    public boolean isValidated() {
-      return validated;
-    }
-
-    public String getMessage() {
-      return message;
-    }
-    
-  }
-}

register-app/startApp.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java -classpath .:target/register-app-1.0-SNAPSHOT-jar-with-dependencies.jar se.citerus.App

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

@@ -18,7 +18,6 @@ public final class JmsDomainEventNotifierImpl implements DomainEventNotifier {
 
   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());

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

@@ -47,7 +47,6 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   }
 
   public CargoRoutingDTO loadCargoForRouting(String trackingId) {
-    // TODO lock
     final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
     final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
     return assembler.toDTO(cargo);
@@ -56,7 +55,6 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   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() {

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

@@ -12,14 +12,14 @@ public class CargoRoutingDTOAssembler {
   public CargoRoutingDTO toDTO(final Cargo cargo) {
     final CargoRoutingDTO dto = new CargoRoutingDTO(
       cargo.trackingId().idString(),
-      cargo.origin().toString(),
-      cargo.destination().toString()
+      cargo.origin().unLocode().idString(),
+      cargo.destination().unLocode().idString()
     );
     for (Leg leg : cargo.itinerary().legs()) {
       dto.addLeg(
         leg.carrierMovement().carrierMovementId().idString(),
-        leg.from().toString(),
-        leg.to().toString()
+        leg.from().unLocode().idString(),
+        leg.to().unLocode().idString()
       );
     }
     return dto;

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

@@ -1,6 +1,7 @@
 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/cargo/CargoRepository.java → src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -27,10 +27,6 @@ public interface CargoRepository {
   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/RouteSpecification.java → src/main/java/se/citerus/dddsample/domain/model/cargo/RouteSpecification.java

@@ -33,23 +33,6 @@ public class RouteSpecification implements ValueObject<RouteSpecification>, Spec
     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;
@@ -65,7 +48,7 @@ public class RouteSpecification implements ValueObject<RouteSpecification>, Spec
   }
 
   public boolean isSatisfiedBy(Itinerary itinerary) {
-    // TODO implement
+    // Stub implementation for now
     return true;
   }
 

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

@@ -17,7 +17,6 @@ public interface HandlingEventRepository {
   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.

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

@@ -80,16 +80,6 @@ public final class Location implements Entity<Location> {
     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
   }

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

@@ -28,7 +28,7 @@ public class TrackingServiceImpl implements TrackingService {
 
     final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
-      logger.warn("Can't notify listeners for non-existing cargo " + trackingId);
+      logger.warn("Can't inspect non-existing cargo " + trackingId);
       return;
     }
 
@@ -41,14 +41,13 @@ public class TrackingServiceImpl implements TrackingService {
   }
 
   private void notifyCustomerOfAvailability(Cargo cargo) {
-    // TODO: more elaborate notifications
     logger.info("Cargo " + cargo.trackingId() + " has been unloaded " +
-      "at its final destination " + cargo.destination());
+                "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());
+                "Last event was " + cargo.deliveryHistory().lastEvent());
   }
 
   public void setCargoRepository(CargoRepository cargoRepository) {