From cf041c5c859e3c269aac906e2a6ea2ec7c93c4db Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 24 Nov 2009 14:36:37 +0000
Subject: [PATCH] LMS-1264 DSU tracking system: introduce dto package
SVN: 13502
---
deep_sequencing_unit/etc/tracking-service.properties | 4 ++--
.../resource/DSU TrackingClient.launch | 11 +++++++++++
.../cisd/dsu/tracking/{ => dto}/TrackedEntities.java | 2 +-
.../dsu/tracking/{main => dto}/TrackingStateDTO.java | 2 +-
.../email/EntityTrackingEmailDataManager.java | 2 +-
.../tracking/email/EntityTrackingEmailGenerator.java | 2 +-
.../tracking/email/IEntityTrackingEmailGenerator.java | 2 +-
.../cisd/dsu/tracking/main/FileBasedTrackingDAO.java | 1 +
.../bsse/cisd/dsu/tracking/main/ITrackingDAO.java | 2 ++
.../ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java | 3 ++-
10 files changed, 23 insertions(+), 8 deletions(-)
create mode 100644 deep_sequencing_unit/resource/DSU TrackingClient.launch
rename deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/{ => dto}/TrackedEntities.java (97%)
rename deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/{main => dto}/TrackingStateDTO.java (97%)
diff --git a/deep_sequencing_unit/etc/tracking-service.properties b/deep_sequencing_unit/etc/tracking-service.properties
index 8e9bfb8ccd2..d1e820b2439 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 00000000000..2b5cc3f75d0
--- /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 b5b9fcac7ac..341bdee24c5 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 16d873fc5a8..36b9be85d21 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 1cd2e8dbb99..7ec603455bb 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 452dfd66ae2..723f67c0c9e 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 d01fa2ab6cf..812d6168575 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 26652055ddc..66011ec34c0 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 0a3cf3bb9a3..10ac486dafa 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 ed766c6d9c9..750bdf40b00 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;
--
GitLab