From 01dcb6f40c1f2ca3b92b44161869e8730b655557 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 21:11:14 +0000
Subject: [PATCH] Move XMLInfrastructure from utilities to xml package.
SVN: 27014
---
.../java/ch/systemsx/cisd/common/xml/JaxbXmlParser.java | 1 -
.../cisd/common/{utilities => xml}/XMLInfraStructure.java | 2 +-
.../cisd/common/{utilities => xml}/XMLInfraStructureTest.java | 4 +++-
.../openbis/generic/server/business/bo/PropertyTypeBO.java | 2 +-
.../systemsx/cisd/openbis/generic/shared/util/XmlUtils.java | 2 +-
.../generic/server/business/bo/PropertyTypeBOTest.java | 2 +-
.../cisd/openbis/generic/shared/util/XmlUtilsTest.java | 2 +-
.../cisd/openbis/etlserver/proteomics/ProtXMLLoader.java | 2 +-
8 files changed, 9 insertions(+), 8 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{utilities => xml}/XMLInfraStructure.java (99%)
rename common/sourceTest/java/ch/systemsx/cisd/common/{utilities => xml}/XMLInfraStructureTest.java (98%)
diff --git a/common/source/java/ch/systemsx/cisd/common/xml/JaxbXmlParser.java b/common/source/java/ch/systemsx/cisd/common/xml/JaxbXmlParser.java
index 87c5add4b6f..b55526bf063 100644
--- a/common/source/java/ch/systemsx/cisd/common/xml/JaxbXmlParser.java
+++ b/common/source/java/ch/systemsx/cisd/common/xml/JaxbXmlParser.java
@@ -32,7 +32,6 @@ import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.utilities.XMLInfraStructure;
/**
* Loads an XML file to the bean of the specified class. The bean should be annotated with JAXB
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/XMLInfraStructure.java b/common/source/java/ch/systemsx/cisd/common/xml/XMLInfraStructure.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/XMLInfraStructure.java
rename to common/source/java/ch/systemsx/cisd/common/xml/XMLInfraStructure.java
index bb46c8a3330..192720d92ee 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/XMLInfraStructure.java
+++ b/common/source/java/ch/systemsx/cisd/common/xml/XMLInfraStructure.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.xml;
import java.io.File;
import java.io.InputStream;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/XMLInfraStructureTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/xml/XMLInfraStructureTest.java
similarity index 98%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/XMLInfraStructureTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/xml/XMLInfraStructureTest.java
index 1195f14ac46..6365c9b08cf 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/XMLInfraStructureTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/xml/XMLInfraStructureTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.xml;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -31,6 +31,8 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import ch.systemsx.cisd.common.xml.XMLInfraStructure;
+
/**
* @author Franz-Josef Elmer
*/
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java
index 54bd2f4babd..3c2438638c9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
-import ch.systemsx.cisd.common.utilities.XMLInfraStructure;
+import ch.systemsx.cisd.common.xml.XMLInfraStructure;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java
index 310c595635a..3388155555c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java
@@ -43,7 +43,7 @@ import org.xml.sax.SAXException;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.utilities.XMLInfraStructure;
+import ch.systemsx.cisd.common.xml.XMLInfraStructure;
/**
* Utility methods for parsing, validating and transforming XML files.
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java
index cf60eaef577..782cd6e0056 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java
@@ -22,7 +22,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.utilities.XMLInfraStructure;
+import ch.systemsx.cisd.common.xml.XMLInfraStructure;
import ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool;
import ch.systemsx.cisd.openbis.generic.shared.CommonTestUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java
index 0a45ac26128..8763fe0e04b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java
@@ -29,7 +29,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.utilities.XMLInfraStructure;
+import ch.systemsx.cisd.common.xml.XMLInfraStructure;
/**
* Tests of {@link XmlUtils}.
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ProtXMLLoader.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ProtXMLLoader.java
index 6507eb3aba4..8ad3ee911bd 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ProtXMLLoader.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ProtXMLLoader.java
@@ -31,7 +31,7 @@ import org.xml.sax.SAXException;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.utilities.XMLInfraStructure;
+import ch.systemsx.cisd.common.xml.XMLInfraStructure;
import ch.systemsx.cisd.openbis.etlserver.proteomics.dto.ProteinProphetDetails;
import ch.systemsx.cisd.openbis.etlserver.proteomics.dto.ProteinSummary;
--
GitLab