Renamed package

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

@@ -1,4 +1,4 @@
-package com.reporting2;
+package com.reporting;
 
 import java.text.DateFormat;
 import java.util.Locale;

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

@@ -1,4 +1,4 @@
-package com.reporting2;
+package com.reporting;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.InitializingBean;

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

@@ -1,9 +1,9 @@
-package com.reporting2;
+package com.reporting;
 
-import static com.reporting2.Constants.US_DATETIME;
-import com.reporting2.db.ReportDAO;
-import com.reporting2.reports.CargoReport;
-import com.reporting2.reports.VoyageReport;
+import static com.reporting.Constants.US_DATETIME;
+import com.reporting.db.ReportDAO;
+import com.reporting.reports.CargoReport;
+import com.reporting.reports.VoyageReport;
 import se.citerus.dddsample.reporting.api.CargoDetails;
 import se.citerus.dddsample.reporting.api.Handling;
 

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

@@ -1,7 +1,7 @@
-package com.reporting2.db;
+package com.reporting.db;
 
-import static com.reporting2.Constants.US_DATETIME;
-import com.reporting2.reports.CargoReport;
+import static com.reporting.Constants.US_DATETIME;
+import com.reporting.reports.CargoReport;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import se.citerus.dddsample.reporting.api.CargoDetails;
 

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

@@ -1,6 +1,6 @@
-package com.reporting2.db;
+package com.reporting.db;
 
-import static com.reporting2.Constants.US_DATETIME;
+import static com.reporting.Constants.US_DATETIME;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import se.citerus.dddsample.reporting.api.Handling;
 

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

@@ -1,7 +1,7 @@
-package com.reporting2.db;
+package com.reporting.db;
 
-import com.reporting2.reports.CargoReport;
-import com.reporting2.reports.VoyageReport;
+import com.reporting.reports.CargoReport;
+import com.reporting.reports.VoyageReport;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;

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

@@ -1,4 +1,4 @@
-package com.reporting2.db;
+package com.reporting.db;
 
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import se.citerus.dddsample.reporting.api.OnboardCargo;

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

@@ -1,7 +1,7 @@
-package com.reporting2.db;
+package com.reporting.db;
 
-import static com.reporting2.Constants.US_DATETIME;
-import com.reporting2.reports.VoyageReport;
+import static com.reporting.Constants.US_DATETIME;
+import com.reporting.reports.VoyageReport;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import se.citerus.dddsample.reporting.api.VoyageDetails;
 

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

@@ -1,4 +1,4 @@
-package com.reporting2.pdf;
+package com.reporting.pdf;
 
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -6,7 +6,7 @@ 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 com.reporting.reports.CargoReport;
 import se.citerus.dddsample.reporting.api.CargoDetails;
 import se.citerus.dddsample.reporting.api.Handling;
 

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

@@ -1,4 +1,4 @@
-package com.reporting2.pdf;
+package com.reporting.pdf;
 
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;

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

@@ -1,9 +1,9 @@
-package com.reporting2.pdf;
+package com.reporting.pdf;
 
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Paragraph;
-import com.reporting2.reports.VoyageReport;
+import com.reporting.reports.VoyageReport;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.ext.Provider;

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

@@ -1,4 +1,4 @@
-package com.reporting2.reports;
+package com.reporting.reports;
 
 import se.citerus.dddsample.reporting.api.CargoDetails;
 import se.citerus.dddsample.reporting.api.Handling;

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

@@ -1,4 +1,4 @@
-package com.reporting2.reports;
+package com.reporting.reports;
 
 import se.citerus.dddsample.reporting.api.OnboardCargo;
 import se.citerus.dddsample.reporting.api.VoyageDetails;

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