From 751f3411cc26dae4871dd5b055d7e8bc0ae2d364 Mon Sep 17 00:00:00 2001 From: cramakri <cramakri> Date: Mon, 7 Jun 2010 08:23:22 +0000 Subject: [PATCH] LMS-1502 Renamed the project for labview-specific code. SVN: 16284 --- .../{dss => shared}/labview/AbstractLVDataElement.java | 2 +- .../cisd/cina/{dss => shared}/labview/Cluster.java | 2 +- .../systemsx/cisd/cina/{dss => shared}/labview/DBL.java | 2 +- .../systemsx/cisd/cina/{dss => shared}/labview/I32.java | 2 +- .../cisd/cina/{dss => shared}/labview/LVData.java | 2 +- .../cisd/cina/{dss => shared}/labview/LVDataParser.java | 2 +- .../cisd/cina/{dss => shared}/labview/LVDataString.java | 2 +- .../cina/{dss => shared}/labview/LVDataTimestamp.java | 2 +- .../cisd/cina/{dss => shared}/labview/package-info.java | 2 +- .../cisd/cina/{dss => shared}/labview/LVDataTest.java | 8 ++++++-- .../systemsx/cisd/cina/{dss => shared}/labview/lvdata.xml | 0 11 files changed, 15 insertions(+), 11 deletions(-) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/AbstractLVDataElement.java (96%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/Cluster.java (98%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/DBL.java (95%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/I32.java (93%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/LVData.java (96%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/LVDataParser.java (99%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/LVDataString.java (95%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/LVDataTimestamp.java (93%) rename rtd_cina/source/java/ch/systemsx/cisd/cina/{dss => shared}/labview/package-info.java (87%) rename rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/{dss => shared}/labview/LVDataTest.java (84%) rename rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/{dss => shared}/labview/lvdata.xml (100%) diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/AbstractLVDataElement.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/AbstractLVDataElement.java similarity index 96% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/AbstractLVDataElement.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/AbstractLVDataElement.java index aefae837188..fee9c0174ea 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/AbstractLVDataElement.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/AbstractLVDataElement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import javax.xml.bind.annotation.XmlElement; diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/Cluster.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/Cluster.java similarity index 98% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/Cluster.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/Cluster.java index 02047c7b0bb..c7a900fd01d 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/Cluster.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/Cluster.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import java.util.List; diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/DBL.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/DBL.java similarity index 95% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/DBL.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/DBL.java index 7cdd158bb20..0f10f8d875d 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/DBL.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/DBL.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import javax.xml.bind.annotation.XmlElement; diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/I32.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/I32.java similarity index 93% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/I32.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/I32.java index 32dc5d26f84..f5de27a69af 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/I32.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/I32.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; /** * @author Chandrasekhar Ramakrishnan diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVData.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVData.java similarity index 96% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVData.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVData.java index c313723638c..fa37543e229 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVData.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import java.util.List; diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataParser.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataParser.java similarity index 99% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataParser.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataParser.java index 2e273aa6522..4ff0e76590f 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataParser.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import java.io.File; import java.io.IOException; diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataString.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataString.java similarity index 95% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataString.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataString.java index 8710b656e74..8d2cd32a8c8 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataString.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataString.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import javax.xml.bind.annotation.XmlElement; diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataTimestamp.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataTimestamp.java similarity index 93% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataTimestamp.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataTimestamp.java index 4a3b27413fa..1dc3ca6608d 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/LVDataTimestamp.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/LVDataTimestamp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; /** * @author Chandrasekhar Ramakrishnan diff --git a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/package-info.java b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/package-info.java similarity index 87% rename from rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/package-info.java rename to rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/package-info.java index 71816af0415..cb55cc2123d 100644 --- a/rtd_cina/source/java/ch/systemsx/cisd/cina/dss/labview/package-info.java +++ b/rtd_cina/source/java/ch/systemsx/cisd/cina/shared/labview/package-info.java @@ -3,4 +3,4 @@ { @javax.xml.bind.annotation.XmlNs(prefix = "lv", namespaceURI = "http://www.ni.com/LVData"), @javax.xml.bind.annotation.XmlNs(prefix = "xsd", namespaceURI = "http://www.w3.org/2001/XMLSchema") }) -package ch.systemsx.cisd.cina.dss.labview; \ No newline at end of file +package ch.systemsx.cisd.cina.shared.labview; \ No newline at end of file diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/LVDataTest.java b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/LVDataTest.java similarity index 84% rename from rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/LVDataTest.java rename to rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/LVDataTest.java index 5aad269a7a2..2e337e86944 100644 --- a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/LVDataTest.java +++ b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/LVDataTest.java @@ -14,13 +14,17 @@ * limitations under the License. */ -package ch.systemsx.cisd.cina.dss.labview; +package ch.systemsx.cisd.cina.shared.labview; import java.io.File; import org.testng.AssertJUnit; import org.testng.annotations.Test; +import ch.systemsx.cisd.cina.shared.labview.Cluster; +import ch.systemsx.cisd.cina.shared.labview.LVData; +import ch.systemsx.cisd.cina.shared.labview.LVDataParser; + /** * @author Chandrasekhar Ramakrishnan */ @@ -35,7 +39,7 @@ public class LVDataTest extends AssertJUnit @Test public void testParseFile() { - LVData lvdata = parse("sourceTest/java/ch/systemsx/cisd/cina/dss/labview/lvdata.xml"); + LVData lvdata = parse("sourceTest/java/ch/systemsx/cisd/cina/shared/labview/lvdata.xml"); assertNotNull(lvdata); assertEquals("8.6.1", lvdata.getVersion()); diff --git a/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/lvdata.xml b/rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/lvdata.xml similarity index 100% rename from rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/dss/labview/lvdata.xml rename to rtd_cina/sourceTest/java/ch/systemsx/cisd/cina/shared/labview/lvdata.xml -- GitLab