This is an automated email from the git hooks/post-receive script. New commit to branch feature/7676 in repository observe. See http://git.codelutin.com/observe.git commit 42cfc22205ccea9655ba55b2d7af4cc5e40d1b7d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 4 11:15:45 2015 +0100 deplacement du pakages GPS pour eviter un conflit avec les mêmes classes pour les DTO (refs #7676) --- .../validation/validator/entities/ActivitySimpleSpeedValidator.java | 4 ++-- .../observe/validation/validator/entities/ActivitySpeedValidator.java | 4 ++-- .../main/java/fr/ird/observe/{business => entities}/gps/GPSPoint.java | 2 +- .../java/fr/ird/observe/{business => entities}/gps/GPSPointImpl.java | 2 +- .../fr/ird/observe/{business => entities}/gps/GPSPointInterval.java | 2 +- .../ird/observe/{business => entities}/gps/GPSPointIntervalImpl.java | 2 +- .../main/java/fr/ird/observe/{business => entities}/gps/GPSRoute.java | 2 +- .../java/fr/ird/observe/{business => entities}/gps/GPSRouteImpl.java | 2 +- .../java/fr/ird/observe/{business => entities}/gps/GpsPoints.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java index ea0eeca..0dbfe0c 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java @@ -25,11 +25,11 @@ package fr.ird.observe.validation.validator.entities; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import fr.ird.observe.entities.gps.GPSPoint; +import fr.ird.observe.entities.gps.GpsPoints; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GpsPoints; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java index ed430e5..bfb68d2 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java @@ -25,10 +25,10 @@ package fr.ird.observe.validation.validator.entities; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import fr.ird.observe.entities.gps.GPSPoint; +import fr.ird.observe.entities.gps.GpsPoints; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GpsPoints; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPoint.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPoint.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java index f7f88fc..47cd525 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPoint.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java index 9638bc7..1bd45a4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; import fr.ird.observe.entities.GPSAble; import fr.ird.type.CoordinateHelper; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java index f1f92d2..e6e6529 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java index a1c22c7..b2bba23 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; import java.util.Date; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRoute.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRoute.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java index 166ebd4..11aace9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRoute.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java index 485c4e1..2e00f47 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; import java.util.Date; import java.util.List; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GpsPoints.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GpsPoints.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java index cf55641..c957e00 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GpsPoints.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.