Place classpath-root files under resources/ directory, which is the prefered location.

Split context files per layer, allowing easy testing of a subset of the layers.

Split Jdbc and Hibernate configuration in separate test and production files, where that makes sense, and keep common properties in a single location (context file). Properties files are pulled into the context by Spring.  

Split out a javax.sql.DataSource bean, which is handy for a number of reasons.

Hibernate configuration prepared, but no classes are mapped. Test config is in-memory and verbose, production is file-based and quieter.

Transaction is annotation-driven in the service layer.

Jetty Maven plugin added, and added context loading listener to web.xml. It's now possible to run "mvn jetty:run" and find the tracking page on localhost:8080/dddsample.

Added dev.java.net maven repository with JTA artifact available.

dddsample/pom.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>se.citerus</groupId>
   <artifactId>dddsample</artifactId>
@@ -10,7 +9,14 @@
     Domain Driven Design implemented in Enterprise Java.
   </description>
   <url>http://sourceforge.net/projects/dddsample/</url>
-  <ciManagement />
+  <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>
+    </repository>
+  </repositories>
   <developers>
     <developer>
       <id>peba</id>
@@ -18,7 +24,7 @@
       <email>peter.backlund@citerus.se</email>
       <organization>Citerus</organization>
       <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>CET</timezone>
+      <timezone>GMT+1</timezone>
     </developer>
     <developer>
       <id>patrikfr</id>
@@ -26,7 +32,7 @@
       <email>patrikfr@users.sourceforge.net</email>
       <organization>Citerus</organization>
       <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>CET</timezone>
+      <timezone>GMT+1</timezone>
     </developer>
     <developer>
       <id>jeham</id>
@@ -34,7 +40,7 @@
       <email>jeham@users.sourceforge.net</email>
       <organization>Citerus</organization>
       <organizationUrl>http://www.citerus.se</organizationUrl>
-      <timezone>CET</timezone>
+      <timezone>GMT+1</timezone>
     </developer>
     <developer>
       <id>jorgen_falk</id>
@@ -48,6 +54,8 @@
   <licenses>
     <license>
       <name>MIT</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>
+      <distribution>repo</distribution>
     </license>
   </licenses>
   <scm>
@@ -56,6 +64,7 @@
   </scm>
   <build>
     <plugins>
+      <!-- Compiler -->
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
@@ -64,6 +73,12 @@
           <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>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -91,7 +106,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>20030203.000129</version>
+      <version>2.3</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

dddsample/src/main/resources/applicationContext.xml

@@ -1,52 +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.0.xsd">
-
-	<!-- 
-		Properties
-	-->
-	<bean id="propertyConfigurer"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>classpath:jdbc.properties</value>
-				<value>classpath:log4j.properties</value>
-			</list>
-		</property>
-	</bean>
-
-	<!-- 
-		Beans
-	-->
-	<bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryInMem">
-	</bean>
-
-	<bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
-		<property name="cargoRepository" ref="cargoRepository" />
-	</bean>
-
-
-	<!-- 
-		<bean id="testDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="${jdbc.driverClassName}" />
-		<property name="url" value="${jdbc.url}" />
-		<property name="username" value="${jdbc.username}" />
-		<property name="password" value="${jdbc.password}" />
-		</bean>
-		
-		<bean id="hibernateSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource" ref="testataSource" />
-		<property name="mappingResources">
-		<list>
-		<value>cargo.hbm.xml</value>
-		</list>
-		</property>
-		<property name="hibernateProperties">
-		<value>
-		hibernate.dialect=org.hibernate.dialect.HSQLDialect
-		</value>
-		</property>
-		</bean>
-	-->
-</beans>

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

@@ -0,0 +1,36 @@
+<?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.springframework.jdbc.datasource.DriverManagerDataSource">
+    <property name="url" value="${jdbc.url}"/>
+    <property name="driverClassName" value="${jdbc.driverClassName}"/>
+    <property name="username" value="${jdbc.username}"/>
+    <property name="password" value="${jdbc.password}"/>
+  </bean>
+
+  <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+    <property name="dataSource" ref="dataSource"/>
+    <property name="hibernateProperties">
+      <props>
+        <!-- These are properties that are common for test and production -->
+        <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
+        <prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>
+      </props>
+    </property>
+  </bean>
+
+  <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+    <property name="sessionFactory" ref="sessionFactory"/>
+  </bean>
+
+  <bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryInMem">
+  </bean>
+
+</beans>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       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
+        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+
+  <tx:annotation-driven transaction-manager="transactionManager"/>
+
+  <bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
+    <property name="cargoRepository" ref="cargoRepository"/>
+  </bean>
+
+</beans>

dddsample/src/main/resources/hibernate.properties

@@ -0,0 +1,3 @@
+hibernate.hbm2ddl.auto=create-drop
+hibernate.show_sql=false
+hibernate.format_sql=false

dddsample/src/main/resources/jdbc.properties

@@ -1,4 +1,4 @@
 jdbc.driverClassName=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:file:testdb
+jdbc.url=jdbc:hsqldb:file:target/dddsample
 jdbc.username=sa
 jdbc.password=

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -3,8 +3,6 @@
   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.0.xsd">
 
-  <import resource="classpath:applicationContext.xml"/>
-
   <bean name="/start.html" class="se.citerus.dddsample.web.CargoTrackingController">
     <property name="sessionForm" value="true"/>
     <property name="commandName" value="trackCommand"/>

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

@@ -6,6 +6,15 @@
 
 <display-name>DDDSample</display-name>
 
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>classpath:context-*.xml</param-value>
+  </context-param>
+
   <servlet>
     <servlet-name>dispatch</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>

dddsample/src/test/resources/applicationContext.xml

@@ -1,52 +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.0.xsd">
-
-	<!-- 
-		Properties
-	-->
-	<bean id="propertyConfigurer"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>jdbc.properties</value>
-				<value>log4j.properties</value>
-			</list>
-		</property>
-	</bean>
-
-	<!-- 
-		Beans
-	-->
-	<bean id="cargoRepository" class="se.citerus.dddsample.repository.CargoRepositoryInMem">
-	</bean>
-
-	<bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
-		<property name="cargoRepository" ref="cargoRepository" />
-	</bean>
-
-
-	<!-- 
-		<bean id="testDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="${jdbc.driverClassName}" />
-		<property name="url" value="${jdbc.url}" />
-		<property name="username" value="${jdbc.username}" />
-		<property name="password" value="${jdbc.password}" />
-		</bean>
-		
-		<bean id="hibernateSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="dataSource" ref="testataSource" />
-		<property name="mappingResources">
-		<list>
-		<value>cargo.hbm.xml</value>
-		</list>
-		</property>
-		<property name="hibernateProperties">
-		<value>
-		hibernate.dialect=org.hibernate.dialect.HSQLDialect
-		</value>
-		</property>
-		</bean>
-	-->
-</beans>

dddsample/src/test/resources/hibernate.properties

@@ -0,0 +1,3 @@
+hibernate.hbm2ddl.auto=create-drop
+hibernate.show_sql=true
+hibernate.format_sql=true

dddsample/src/test/resources/jdbc.properties

@@ -1,4 +1,4 @@
 jdbc.driverClassName=org.hsqldb.jdbcDriver
-jdbc.url=jdbc:hsqldb:file:testdb
+jdbc.url=jdbc:hsqldb:mem:dddsample_test
 jdbc.username=sa
 jdbc.password=

dddsample/src/test/resources/log4j.properties

@@ -6,14 +6,5 @@ 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}/dddsample.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
-
 # Mute some packages
 log4j.logger.org=warn