Restructured the reporting context.

dddsample/external/reporting/pom.xml

@@ -14,6 +14,11 @@
   <description>Reporting context</description>
   <dependencies>
     <dependency>
+      <groupId>se.citerus.dddsample.external</groupId>
+      <artifactId>reporting-api</artifactId>
+      <version>1.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
     </dependency>

dddsample/external/reporting/src/main/java/com/reporting2/Constants.java

@@ -0,0 +1,10 @@
+package com.reporting2;
+
+import java.text.DateFormat;
+import java.util.Locale;
+
+public interface Constants {
+
+  DateFormat US_DATETIME = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.US);
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/Fixture.java

@@ -0,0 +1,28 @@
+package com.reporting2;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+import javax.sql.DataSource;
+
+public class Fixture implements InitializingBean {
+
+  private SimpleJdbcTemplate jdbc;
+  private Resource schema;
+  private Resource testdata;
+
+  public Fixture(DataSource dataSource, Resource schema, Resource testdata) {
+    this.jdbc = new SimpleJdbcTemplate(dataSource);
+    this.testdata = testdata;
+    this.schema = schema;
+  }
+
+  @Override
+  public void afterPropertiesSet() throws Exception {
+    jdbc.update(IOUtils.toString(schema.getInputStream()));
+    jdbc.update(IOUtils.toString(testdata.getInputStream()));
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/ReportingService.java

@@ -0,0 +1,65 @@
+package com.reporting2;
+
+import static com.reporting2.Constants.US_DATETIME;
+import com.reporting2.db.ReportDAO;
+import com.reporting2.reports.CargoReport;
+import com.reporting2.reports.VoyageReport;
+import se.citerus.dddsample.reporting.api.CargoDetails;
+import se.citerus.dddsample.reporting.api.Handling;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import static javax.ws.rs.core.Response.ok;
+import static javax.ws.rs.core.Response.status;
+import java.text.ParseException;
+
+@Produces({"application/json", "application/pdf"})
+@Consumes("application/json")
+@Path("/")
+public class ReportingService {
+
+  private ReportDAO reportDAO;
+
+  public ReportingService(ReportDAO reportDAO) {
+    this.reportDAO = reportDAO;
+  }
+
+  @GET
+  @Path("/cargo/{trackingId}")
+  public Response getCargoReport(@PathParam("trackingId") String trackingId) throws ParseException {
+    CargoReport cargoReport = reportDAO.loadCargoReport(trackingId);
+    if (cargoReport == null) return status(404).build();
+
+    return ok(cargoReport).
+      lastModified(US_DATETIME.parse(cargoReport.getCargo().getLastUpdatedOn())).
+      build();
+  }
+
+  @GET
+  @Path("/voyage/{voyageNumber}")
+  public Response getVoyageReport(@PathParam("voyageNumber") String voyageNumber) throws ParseException {
+    VoyageReport voyageReport = reportDAO.loadVoyageReport(voyageNumber);
+    if (voyageReport == null) return status(404).build();
+
+    return ok(voyageReport).
+      lastModified(US_DATETIME.parse(voyageReport.getVoyage().getLastUpdatedOn())).
+      build();
+  }
+
+  @PUT
+  @Path("/cargo")
+  public void reportCargoDetails(CargoDetails cargoDetails) {
+    // TODO
+  }
+
+  @PUT
+  @Path("/cargo/{trackingId}/handled")
+  public void reportHandling(@PathParam("trackingId") String trackingId, Handling handling) {
+    // TODO
+  }
+
+  ReportingService() {
+    // Needed by CGLIB
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/db/CargoReportRowMapper.java

@@ -0,0 +1,30 @@
+package com.reporting2.db;
+
+import static com.reporting2.Constants.US_DATETIME;
+import com.reporting2.reports.CargoReport;
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+import se.citerus.dddsample.reporting.api.CargoDetails;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class CargoReportRowMapper implements ParameterizedRowMapper<CargoReport> {
+
+  @Override
+  public CargoReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+    CargoReport cargoReport = new CargoReport();
+    CargoDetails cargoDetails = new CargoDetails();
+    cargoDetails.setTrackingId(rs.getString("cargo_tracking_id"));
+    cargoDetails.setArrivalDeadline(US_DATETIME.format(rs.getTimestamp("arrival_deadline")));
+    cargoDetails.setCurrentLocation(rs.getString("current_location"));
+    cargoDetails.setCurrentStatus(rs.getString("current_status"));
+    cargoDetails.setCurrentVoyage(rs.getString("current_voyage_number"));
+    cargoDetails.setEta(US_DATETIME.format(rs.getTimestamp("eta")));
+    cargoDetails.setFinalDestination(rs.getString("destination"));
+    cargoDetails.setLastUpdatedOn(US_DATETIME.format(rs.getTimestamp("last_updated_on")));
+    cargoDetails.setReceivedIn(rs.getString("received_in"));
+    cargoReport.setCargo(cargoDetails);
+    return cargoReport;
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/db/HandlingRowMapper.java

@@ -0,0 +1,22 @@
+package com.reporting2.db;
+
+import static com.reporting2.Constants.US_DATETIME;
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+import se.citerus.dddsample.reporting.api.Handling;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class HandlingRowMapper implements ParameterizedRowMapper<Handling> {
+
+  @Override
+  public Handling mapRow(ResultSet rs, int rowNum) throws SQLException {
+    Handling handling = new Handling();
+    handling.setCompletedOn(US_DATETIME.format(rs.getTimestamp("completed_on")));
+    handling.setLocation(rs.getString("location"));
+    handling.setType(rs.getString("type"));
+    handling.setVoyage(rs.getString("voyage_number"));
+    return handling;
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/db/ReportDAO.java

@@ -0,0 +1,90 @@
+package com.reporting2.db;
+
+import com.reporting2.reports.CargoReport;
+import com.reporting2.reports.VoyageReport;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowCallbackHandler;
+import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.reporting.api.Handling;
+import se.citerus.dddsample.reporting.api.OnboardCargo;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReportDAO {
+  
+  private JdbcTemplate jdbc;
+  private HandlingRowMapper handlingRowMapper;
+  private CargoReportRowMapper cargoReportRowMapper;
+  private VoyageReportRowMapper rowMapper;
+  private VoyageCargoRowMapper voyageCargoRowMapper;
+
+  public ReportDAO(DataSource dataSource) {
+    this.jdbc = new JdbcTemplate(dataSource);
+    this.handlingRowMapper = new HandlingRowMapper();
+    this.cargoReportRowMapper = new CargoReportRowMapper();
+    this.rowMapper = new VoyageReportRowMapper();
+    this.voyageCargoRowMapper = new VoyageCargoRowMapper();
+  }
+
+  @Transactional(readOnly = true)
+  public CargoReport loadCargoReport(String trackingId) {
+    try {
+      String[] args = {trackingId};
+      String sql = "select * from cargo where cargo_tracking_id = ?";
+      CargoReport cargoReport = (CargoReport) jdbc.queryForObject(sql, args, cargoReportRowMapper);
+      cargoReport.setHandlings(loadHandlings(trackingId));
+      return cargoReport;
+    } catch (EmptyResultDataAccessException e) {
+      return null;
+    }
+  }
+
+  @Transactional(readOnly = true)
+  public VoyageReport loadVoyageReport(String voyageNumber) {
+    String[] args = {voyageNumber};
+    String sql = "select * from voyage where voyage_number = ?";
+    try {
+      VoyageReport voyageReport = (VoyageReport) jdbc.queryForObject(sql, args, rowMapper);
+      voyageReport.setOnboardCargos(loadOnboardCargos(voyageNumber));
+      return voyageReport;
+    } catch (EmptyResultDataAccessException e) {
+      return null;
+    }
+  }
+
+  private List<Handling> loadHandlings(String trackingId) {
+    final List<Handling> handlings = new ArrayList<Handling>();
+    RowCallbackHandler handler = new RowCallbackHandler() {
+      @Override
+      public void processRow(ResultSet rs) throws SQLException {
+        handlings.add(handlingRowMapper.mapRow(rs, rs.getRow()));
+      }
+    };
+    String[] args = {trackingId};
+    String sql = "select * from handling where cargo_tracking_id = ?";
+    jdbc.query(sql, args, handler);
+    return handlings;
+  }
+
+  private List<OnboardCargo> loadOnboardCargos(String voyageNumber) {
+    final List<OnboardCargo> onboardCargos = new ArrayList<OnboardCargo>();
+    String[] args = {voyageNumber};
+    String sql = "select cargo_tracking_id, destination from cargo where current_voyage_number = ?";
+    jdbc.query(sql, args, new RowCallbackHandler() {
+      @Override
+      public void processRow(ResultSet rs) throws SQLException {
+        onboardCargos.add(voyageCargoRowMapper.mapRow(rs, rs.getRow()));
+      }
+    });
+
+    return onboardCargos;
+  }
+
+  ReportDAO() {
+  }
+}

dddsample/external/reporting/src/main/java/com/reporting2/db/VoyageCargoRowMapper.java

@@ -0,0 +1,17 @@
+package com.reporting2.db;
+
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+import se.citerus.dddsample.reporting.api.OnboardCargo;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class VoyageCargoRowMapper implements ParameterizedRowMapper<OnboardCargo> {
+  @Override
+    public OnboardCargo mapRow(ResultSet rs, int rowNum) throws SQLException {
+    OnboardCargo onboardCargo = new OnboardCargo();
+    onboardCargo.setTrackingId(rs.getString("cargo_tracking_id"));
+    onboardCargo.setFinalDestination(rs.getString("destination"));
+    return onboardCargo;
+  }
+}

dddsample/external/reporting/src/main/java/com/reporting2/db/VoyageReportRowMapper.java

@@ -0,0 +1,25 @@
+package com.reporting2.db;
+
+import static com.reporting2.Constants.US_DATETIME;
+import com.reporting2.reports.VoyageReport;
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+import se.citerus.dddsample.reporting.api.VoyageDetails;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class VoyageReportRowMapper implements ParameterizedRowMapper<VoyageReport> {
+  @Override
+  public VoyageReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+    VoyageReport voyageReport = new VoyageReport();
+    VoyageDetails voyageDetails = new VoyageDetails();
+    voyageDetails.setVoyageNumber(rs.getString("voyage_number"));
+    voyageDetails.setCurrentStatus(rs.getString("current_status"));
+    voyageDetails.setDelayedByMinutes(rs.getInt("delayed_by_min"));
+    voyageDetails.setEtaNextStop(US_DATETIME.format(rs.getTimestamp("eta_next_stop")));
+    voyageDetails.setLastUpdatedOn(US_DATETIME.format(rs.getTimestamp("last_updated_on")));
+    voyageDetails.setNextStop(rs.getString("next_stop"));
+    voyageReport.setVoyage(voyageDetails);
+    return voyageReport;
+  }
+}

dddsample/external/reporting/src/main/java/com/reporting2/pdf/PDFCargoReportProvider.java

@@ -0,0 +1,50 @@
+package com.reporting2.pdf;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import static com.lowagie.text.FontFactory.HELVETICA_BOLD;
+import static com.lowagie.text.FontFactory.getFont;
+import com.lowagie.text.Paragraph;
+import com.lowagie.text.pdf.PdfPTable;
+import com.reporting2.reports.CargoReport;
+import se.citerus.dddsample.reporting.api.CargoDetails;
+import se.citerus.dddsample.reporting.api.Handling;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.ext.Provider;
+
+@Produces("application/pdf")
+@Provider
+public class PDFCargoReportProvider extends PDFMessageBodyWriter<CargoReport> {
+
+  @Override
+  protected Class<CargoReport> getSupportedClass() {
+    return CargoReport.class;
+  }
+
+  @Override
+  protected void buildDocument(CargoReport cargoReport, Document document) {
+    try {
+      CargoDetails cargoDetails = cargoReport.getCargo();
+      document.add(new Paragraph("Cargo " + cargoDetails.getTrackingId(), getFont(HELVETICA_BOLD, 18.0f)));
+      document.add(new Paragraph("Status: " + cargoDetails.getCurrentStatus()));
+      document.add(new Paragraph("Location: " + cargoDetails.getCurrentLocation()));
+      document.add(new Paragraph("Voyage: " + cargoDetails.getCurrentVoyage()));
+      document.add(new Paragraph("Destination: " + cargoDetails.getFinalDestination()));
+      document.add(new Paragraph("Arrival deadline: " + cargoDetails.getArrivalDeadline()));
+      document.add(new Paragraph("ETA: " + cargoDetails.getEta()));
+
+      document.add(new Paragraph("Handling history", getFont(HELVETICA_BOLD)));
+      PdfPTable table = new PdfPTable(4);
+      for (Handling handling : cargoReport.getHandlings()) {
+        table.addCell(handling.getType());
+        table.addCell(handling.getLocation());
+        table.addCell(handling.getVoyage());
+        table.addCell(handling.getCompletedOn());
+      }
+    } catch (DocumentException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/pdf/PDFMessageBodyWriter.java

@@ -0,0 +1,48 @@
+package com.reporting2.pdf;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.pdf.PdfWriter;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+public abstract class PDFMessageBodyWriter<T> implements MessageBodyWriter<T> {
+
+  public long getSize(T t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mt) {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    writeDocumentToStream(t, baos);
+    return baos.toByteArray().length;
+  }
+
+  public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mt) {
+    return getSupportedClass().isAssignableFrom(type);
+  }
+
+  public void writeTo(T t, Class<?> clazz, Type type, Annotation[] a, MediaType mt, MultivaluedMap<String, Object> headers, OutputStream os) throws IOException {
+    writeDocumentToStream(t, os);
+  }
+
+  protected void writeDocumentToStream(T t, OutputStream os) {
+    Document document = new Document();
+    try {
+      PdfWriter.getInstance(document, os);
+    } catch (DocumentException e) {
+      throw new RuntimeException(e);
+    }
+    document.open();
+    buildDocument(t, document);
+    document.close();
+  }
+
+  protected abstract void buildDocument(T t, Document document);
+
+  protected abstract Class<T> getSupportedClass();
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/pdf/PDFVoyageReportProvider.java

@@ -0,0 +1,29 @@
+package com.reporting2.pdf;
+
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Paragraph;
+import com.reporting2.reports.VoyageReport;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.ext.Provider;
+
+@Produces("application/pdf")
+@Provider
+public class PDFVoyageReportProvider extends PDFMessageBodyWriter<VoyageReport> {
+
+  @Override
+  protected Class<VoyageReport> getSupportedClass() {
+    return VoyageReport.class;
+  }
+
+  @Override
+  protected void buildDocument(VoyageReport voyageReport, Document document) {
+    try {
+      document.add(new Paragraph("Voyage " + voyageReport.getVoyage().getVoyageNumber()));
+    } catch (DocumentException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/reports/CargoReport.java

@@ -0,0 +1,31 @@
+package com.reporting2.reports;
+
+import se.citerus.dddsample.reporting.api.CargoDetails;
+import se.citerus.dddsample.reporting.api.Handling;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+@XmlRootElement
+public class CargoReport {
+
+  CargoDetails cargoDetails;
+  List<Handling> handlings;
+
+  public CargoDetails getCargo() {
+    return cargoDetails;
+  }
+
+  public void setCargo(CargoDetails cargoDetails) {
+    this.cargoDetails = cargoDetails;
+  }
+
+  public List<Handling> getHandlings() {
+    return handlings;
+  }
+
+  public void setHandlings(List<Handling> handlings) {
+    this.handlings = handlings;
+  }
+
+}

dddsample/external/reporting/src/main/java/com/reporting2/reports/VoyageReport.java

@@ -0,0 +1,32 @@
+package com.reporting2.reports;
+
+import se.citerus.dddsample.reporting.api.OnboardCargo;
+import se.citerus.dddsample.reporting.api.VoyageDetails;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlRootElement
+public class VoyageReport {
+
+  private VoyageDetails voyage;
+  private List<OnboardCargo> onboardOnboardCargos = new ArrayList<OnboardCargo>();
+
+  public List<OnboardCargo> getOnboardCargos() {
+    return onboardOnboardCargos;
+  }
+
+  public void setOnboardCargos(List<OnboardCargo> onboardOnboardCargos) {
+    this.onboardOnboardCargos = onboardOnboardCargos;
+  }
+
+  public VoyageDetails getVoyage() {
+    return voyage;
+  }
+
+  public void setVoyage(VoyageDetails voyage) {
+    this.voyage = voyage;
+  }
+
+}

dddsample/external/reporting/src/main/resources/app.properties

@@ -0,0 +1,3 @@
+db.url=jdbc:hsqldb:mem:reporting
+server.address=/
+http.extension=cxf-extension-http.xml

dddsample/external/reporting/src/main/resources/context-cxf.xml

@@ -3,21 +3,27 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
         http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+  <util:properties id="cfg" location="classpath:app.properties"/>
+
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
   <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/>
 
   <jaxrs:server address="/">
     <jaxrs:serviceBeans>
       <ref bean="reportingService"/>
     </jaxrs:serviceBeans>
+    <jaxrs:providers>
+      <bean class="com.reporting2.pdf.PDFCargoReportProvider"/>
+      <bean class="com.reporting2.pdf.PDFVoyageReportProvider"/>
+    </jaxrs:providers>
   </jaxrs:server>
 
 </beans>

dddsample/external/reporting/src/test/resources/context-test-setup.xml → dddsample/external/reporting/src/main/resources/context-test-setup.xml

@@ -4,10 +4,10 @@
        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="com.reporting.Fixture">
+  <bean class="com.reporting2.Fixture">
     <constructor-arg ref="dataSource"/>
     <constructor-arg value="classpath:schema.sql"/>
-    <constructor-arg value="classpath:testdata.sql"/>
+    <constructor-arg value="classpath:sample_data.sql"/>
   </bean>
 
 </beans>

dddsample/external/reporting/src/main/resources/context.xml

@@ -15,10 +15,14 @@
 
   <tx:annotation-driven transaction-manager="transactionManager"/>
 
-  <bean id="reportingService" class="com.reporting.ReportingService">
+  <bean id="reportDAO" class="com.reporting2.db.ReportDAO">
     <constructor-arg ref="dataSource"/>
   </bean>
 
+  <bean id="reportingService" class="com.reporting2.ReportingService">
+    <constructor-arg ref="reportDAO"/>
+  </bean>
+
   <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
     <property name="url" value="jdbc:hsqldb:mem:reporting"/>
     <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>

dddsample/external/reporting/src/main/resources/log4j.properties

@@ -3,4 +3,4 @@ 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.logger.com.reporting=INFO
+log4j.logger.com.reporting2=INFO

dddsample/external/reporting/src/test/resources/testdata.sql → dddsample/external/reporting/src/main/resources/sample_data.sql

@@ -16,7 +16,7 @@ insert into cargo (
   '2009-06-12 18:30:00.000',
   'Onboard voyage',
   'V0100',
-  'Tokyo',
+  null,
   '2009-06-08 14:23:12.123'
 );
 
@@ -32,6 +32,29 @@ values ('ABC','Unload', 'Long Beach','V0100','2009-06-04 19:01:00.000');
 insert into handling (cargo_tracking_id, type,location,voyage_number,completed_on)
 values ('ABC','Load',   'Long Beach','V0200','2009-06-06 22:50:00.000');
 
+insert into cargo (
+  cargo_tracking_id,
+  received_in,
+  destination,
+  arrival_deadline,
+  eta,
+  current_status,
+  current_voyage_number,
+  current_location,
+  last_updated_on
+) values (
+  'DEF',
+  'Hongkong',
+  'Stockholm',
+  '2009-06-15 12:00:00.000',
+  '2009-06-12 18:30:00.000',
+  'In port',
+  null,
+  'Tokyo',
+  '2009-06-08 14:23:12.123'
+);
+
+
 insert into voyage (
   voyage_number,
   next_stop,

dddsample/external/reporting/src/main/webapp/WEB-INF/web.xml

@@ -24,6 +24,7 @@
     <param-value>
       classpath:context.xml
       classpath:context-cxf.xml
+      classpath:context-test-setup.xml
     </param-value>
   </context-param>
 
@@ -35,7 +36,7 @@
 
   <servlet-mapping>
     <servlet-name>cxf</servlet-name>
-    <url-pattern>/*</url-pattern>
+    <url-pattern>/rest/*</url-pattern>
   </servlet-mapping>
 
 </web-app>

dddsample/external/reporting/src/main/webapp/index.jsp

@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+  <script type="text/javascript" src="jquery-1.3.2.js"></script>
+  <title>Reporting</title>
+</head>
+<body>
+  <h1 id="apa">Reporting</h1>
+  <div>
+    <form action="" method="get" onsubmit="search(); return false;">
+      Search:
+      <input id="query" name="query" type="text"/>
+      <input id="submit" name="submit" type="submit" value="Search"/>
+    </form>
+  </div>
+  <div id="result"></div>
+  <script type="text/javascript">
+    $('#query').focus();
+
+    function search() {
+      $.ajax({
+          url: "http://localhost:8080/reporting/rest/cargo/" + $("#query").val(),
+          type: 'GET',
+          contentType: 'application/json',
+          success: function(response) {
+            var json = eval('(' + response + ')');
+            var cargo = json.cargoReport.cargo;
+            $('#result').empty();
+            $('#result').
+              append('<h2>Cargo ' + cargo.trackingId + '</h2>').
+              append('<p>Destination: ' + cargo.finalDestination + ' (at ' + cargo.arrivalDeadline + ')</p>')
+
+            if (cargo.currentLocation) {
+              $('#result').append('<p>Status: ' + cargo.currentStatus + ' ' + cargo.currentLocation + '</p>');
+            } else if (cargo.currentVoyage) {
+              $('#result').append('<p>Status: ' + cargo.currentStatus + ' ' + cargo.currentVoyage + '</p>');
+            }
+
+            $('#result').append('<p>Updated on: ' + cargo.lastUpdatedOn + '</p>');
+          },
+          error: function(response) {
+            if (response.status == 404) {
+              $('#result').text('No cargo with tracking id ' + $("#query").val());
+            }
+          }
+      });
+    }
+  </script>
+</body>
+</html>
+

dddsample/external/reporting/src/test/java/com/reporting/Fixture.java → dddsample/external/reporting/src/test/java/temp/pkg/Fixture.java

@@ -4,7 +4,7 @@
  * @created 2009-okt-03
  * $Id$
  */
-package com.reporting;
+package temp.pkg;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.context.ApplicationEvent;

dddsample/external/reporting/src/test/java/com/reporting/ReportServiceTest.java → dddsample/external/reporting/src/test/java/temp/pkg/ReportServiceTest.java

@@ -1,19 +1,18 @@
-package com.reporting;
+package temp.pkg;
 
 import org.apache.commons.io.IOUtils;
-import org.codehaus.jettison.json.JSONObject;
-import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONArray;
-import static org.junit.Assert.assertEquals;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
 import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.io.IOException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations={"/context.xml", "/context-cxf.xml", "/context-test-setup.xml"})

dddsample/external/reporting/src/test/resources/app.properties

@@ -0,0 +1,3 @@
+db.url=jdbc:hsqldb:mem:reporting
+server.address=http://localhost:14000
+http.extension=classpath:META-INF/cxf/cxf-extension-http-jetty.xml

dddsample/external/reporting/src/test/resources/context-cxf.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-        http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
-        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <import resource="classpath:META-INF/cxf/cxf.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
-  <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
-
-  <jaxrs:server address="http://localhost:14000" id="jaxRsService">
-    <jaxrs:serviceBeans>
-      <ref bean="reportingService"/>
-    </jaxrs:serviceBeans>
-    <jaxrs:providers>
-      <bean class="com.reporting.PDFCargoReportProvider"/>
-      <bean class="com.reporting.PDFVoyageReportProvider"/>
-    </jaxrs:providers>
-  </jaxrs:server>
-
-</beans>