diff --git a/deep_sequencing_unit/etc/tracking-service.properties b/deep_sequencing_unit/etc/tracking-service.properties index 8e9bfb8ccd228f286313ab0e99883dfdfbf9b181..d1e820b24398ed43c18120ecdbe440d1979aeb3e 100644 --- a/deep_sequencing_unit/etc/tracking-service.properties +++ b/deep_sequencing_unit/etc/tracking-service.properties @@ -1,6 +1,6 @@ -openbis-user=tpylak +openbis-user=kohleman openbis-password=xxx -openbis-server-url = http://localhost:8888/openbis +openbis-server-url = http://localhost:8888/openbis/rmi-tracking # SMTP properties (must start with 'mail' to be considered). diff --git a/deep_sequencing_unit/resource/DSU TrackingClient.launch b/deep_sequencing_unit/resource/DSU TrackingClient.launch new file mode 100644 index 0000000000000000000000000000000000000000..2b5cc3f75d02b078f2e980e5ab5f2d6cb0a42063 --- /dev/null +++ b/deep_sequencing_unit/resource/DSU TrackingClient.launch @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.ethz.bsse.cisd.dsu.tracking.main.TrackingClient"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="deep_sequencing_unit"/> +</launchConfiguration> diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/TrackedEntities.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackedEntities.java similarity index 97% rename from deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/TrackedEntities.java rename to deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackedEntities.java index b5b9fcac7ac2fb7b8a99cdf7f61856fb57f3ce70..341bdee24c530d907e277f79ee48c6dd6a3f68f4 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/TrackedEntities.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackedEntities.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.ethz.bsse.cisd.dsu.tracking; +package ch.ethz.bsse.cisd.dsu.tracking.dto; import java.util.List; diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingStateDTO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java similarity index 97% rename from deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingStateDTO.java rename to deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java index 16d873fc5a88ffbc3c767c44ddb5a4d45310f16c..36b9be85d215c2154eedf20ba9ff40cf274c5e01 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingStateDTO.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/dto/TrackingStateDTO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.ethz.bsse.cisd.dsu.tracking.main; +package ch.ethz.bsse.cisd.dsu.tracking.dto; import ch.systemsx.cisd.common.annotation.BeanProperty; diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java index 1cd2e8dbb996bac5d38ba2e04d9d9a0994259298..7ec603455bb1c655ea38c898476bc71633795ebb 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailDataManager.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import ch.ethz.bsse.cisd.dsu.tracking.TrackedEntities; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackedEntities; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java index 452dfd66ae258b3c78049c83626ecfcc53a5bb70..723f67c0c9eaabba9c902e1d7c5914f1bad02a86 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/EntityTrackingEmailGenerator.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import ch.ethz.bsse.cisd.dsu.tracking.TrackedEntities; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackedEntities; import ch.ethz.bsse.cisd.dsu.tracking.email.EntityTrackingEmailData.SequencingSampleData; import ch.systemsx.cisd.common.utilities.PropertyUtils; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/IEntityTrackingEmailGenerator.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/IEntityTrackingEmailGenerator.java index d01fa2ab6cf0cb9408bf7b0fba97d44607dc7c31..812d6168575874908b51ae8b92d8e15be2fd038e 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/IEntityTrackingEmailGenerator.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/email/IEntityTrackingEmailGenerator.java @@ -18,7 +18,7 @@ package ch.ethz.bsse.cisd.dsu.tracking.email; import java.util.List; -import ch.ethz.bsse.cisd.dsu.tracking.TrackedEntities; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackedEntities; /** * @author Piotr Buczek diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java index 26652055ddc5792e30600e65ffc3eba732306efd..66011ec34c06e95605694eb3dd8797a0e8cf6eca 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/FileBasedTrackingDAO.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackingStateDTO; import ch.ethz.bsse.cisd.dsu.tracking.utils.LogUtils; import ch.systemsx.cisd.common.parser.AbstractParserObjectFactory; import ch.systemsx.cisd.common.parser.IParserObjectFactory; diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/ITrackingDAO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/ITrackingDAO.java index 0a3cf3bb9a38820584ba9a4c72732a91b15ab750..10ac486dafa50763fc38da8fc73fd7dcbf0649b1 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/ITrackingDAO.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/ITrackingDAO.java @@ -16,6 +16,8 @@ package ch.ethz.bsse.cisd.dsu.tracking.main; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackingStateDTO; + /** * @author Tomasz Pylak */ diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java index ed766c6d9c9e9495b944c496cb1031fb10624ecc..750bdf40b003e8ce7d513e4cc0d0c05c893ae379 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java @@ -18,7 +18,8 @@ package ch.ethz.bsse.cisd.dsu.tracking.main; import java.util.List; -import ch.ethz.bsse.cisd.dsu.tracking.TrackedEntities; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackedEntities; +import ch.ethz.bsse.cisd.dsu.tracking.dto.TrackingStateDTO; import ch.ethz.bsse.cisd.dsu.tracking.email.Email; import ch.ethz.bsse.cisd.dsu.tracking.email.IEntityTrackingEmailGenerator; import ch.systemsx.cisd.common.mail.From;