From d710fc19f01238a769ec3a0dfc58b0cc959054ac Mon Sep 17 00:00:00 2001 From: Ben Leinfelder Date: Fri, 30 May 2014 20:50:46 +0000 Subject: [PATCH] Maven-ize the EML Datamanager library. Note that we can still build the emlparser.war and the datamanager.jar using Ant, but we can also use maven to create a datamanager-x.x.x.jar artifact. But bear in mind that many of the dependencies in this project are not available or resolvable in other maven repos so any project that uses the datamanager-x.x.x.jar will need to include those (configxml.jar and Ecogrid-stub jars). --- build.xml | 21 +- lib/eml.jar | Bin 27802 -> 31273 bytes pom.xml | 147 +++ .../datamanager/DataManager.java | 0 .../datamanager/database/ANDRelation.java | 0 .../database/AggregateSelectionItem.java | 0 .../datamanager/database/Condition.java | 0 .../database/ConditionInterface.java | 0 .../ConnectionNotAvailableException.java | 0 .../DataNotMatchingMetadataException.java | 0 .../datamanager/database/DatabaseAdapter.java | 0 .../DatabaseConnectionPoolInterface.java | 0 .../datamanager/database/DatabaseHandler.java | 0 .../datamanager/database/DatabaseLoader.java | 0 .../datamanager/database/DelimitedReader.java | 0 .../datamanager/database/GroupBy.java | 0 .../datamanager/database/HSQLAdapter.java | 0 .../datamanager/database/Join.java | 0 .../datamanager/database/LogicalRelation.java | 0 .../database/NoTableSpaceException.java | 0 .../datamanager/database/ORRelation.java | 0 .../datamanager/database/OracleAdapter.java | 0 .../datamanager/database/PostgresAdapter.java | 0 .../datamanager/database/Query.java | 0 .../datamanager/database/SelectionItem.java | 0 .../database/SimpleDatabaseLoader.java | 0 .../database/StaticSelectionItem.java | 0 .../datamanager/database/SubQueryClause.java | 0 .../datamanager/database/TableItem.java | 0 .../datamanager/database/TableMonitor.java | 0 .../database/TextComplexFormatDataReader.java | 0 .../datamanager/database/TextDataReader.java | 0 .../database/UnWellFormedQueryException.java | 0 .../datamanager/database/Union.java | 0 .../datamanager/database/VectorReader.java | 0 .../datamanager/database/WhereClause.java | 0 .../DatabaseConnectionPoolFactory.java | 0 .../pooling/HSQLDatabaseConnectionPool.java | 0 .../PostgresDatabaseConnectionPool.java | 0 .../datamanager/dataquery/BasicNode.java | 0 .../dataquery/DataquerySpecification.java | 0 .../download/ArchivedDataHandler.java | 0 ...AuthenticatedEcogridEndPointInterface.java | 0 .../download/CompressedDataHandler.java | 0 .../download/ConfigurableEcogridEndPoint.java | 0 .../DataDownloadNotFinishedException.java | 0 .../download/DataSourceNotFoundException.java | 0 .../download/DataStorageInterface.java | 0 .../datamanager/download/DocumentHandler.java | 0 .../datamanager/download/DownloadHandler.java | 0 .../download/EcogridEndPointInterface.java | 0 .../datamanager/download/GZipDataHandler.java | 0 .../datamanager/download/TarDataHandler.java | 0 .../datamanager/download/ZipDataHandler.java | 0 .../document/DocumentDataPackageHandler.java | 0 .../datamanager/parser/Attribute.java | 0 .../datamanager/parser/AttributeList.java | 0 .../datamanager/parser/Constraint.java | 0 .../parser/DataObjectDescription.java | 0 .../datamanager/parser/DataPackage.java | 0 .../datamanager/parser/DateTimeDomain.java | 0 .../datamanager/parser/Domain.java | 0 .../datamanager/parser/Entity.java | 0 .../datamanager/parser/EnumeratedDomain.java | 0 .../datamanager/parser/ForeignKey.java | 0 .../parser/JoinConditionConstraint.java | 0 .../datamanager/parser/NotNullConstraint.java | 0 .../datamanager/parser/NumericDomain.java | 4 +- .../datamanager/parser/Party.java | 0 .../datamanager/parser/PrimaryKey.java | 0 .../datamanager/parser/StorageType.java | 0 .../parser/TextComplexDataFormat.java | 0 .../parser/TextDelimitedDataFormat.java | 0 .../datamanager/parser/TextDomain.java | 0 .../parser/TextWidthFixedDataFormat.java | 0 .../UnWellFormedConstraintException.java | 0 .../datamanager/parser/UniqueKey.java | 0 .../parser/document/DocumentDataPackage.java | 0 .../document/DocumentDataPackageParser.java | 0 .../datamanager/parser/eml/Eml200Parser.java | 0 .../generic/DataPackageParserInterface.java | 0 .../generic/Eml200DataPackageParser.java | 0 .../generic/GenericDataPackageParser.java | 0 .../datamanager/quality/EntityReport.java | 0 .../datamanager/quality/QualityCheck.java | 0 .../datamanager/quality/QualityReport.java | 0 .../datamanager/sample/EMLInspectionApp.java | 0 .../datamanager/sample/EcogridEndPoint.java | 0 .../datamanager/sample/SampleCallingApp.java | 0 .../datamanager/sample/SampleDataStorage.java | 0 .../datamanager/transpose/DataTranspose.java | 0 .../util/DocumentDownloadUtil.java | 0 .../datamanager/util/TableGenerator.java | 0 .../org/ecoinformatics/eml/EMLParser.java | 0 .../eml/EMLParserException.java | 0 .../ecoinformatics/eml/EMLParserServlet.java | 0 .../eml/MakeProjectionDictionary.java | 0 .../org/ecoinformatics/eml/SAXValidate.java | 0 .../org/ecoinformatics/export/HtmlToPdf.java | 0 .../resources}/datamanager.properties | 0 src/{ => main/resources}/endpoint.properties | 0 src/{ => main/resources}/log4j.properties | 0 .../datamanager/DataManagerTest.java | 0 .../datamanager/DataPackagePopulator.java | 0 .../datamanager/UnionPerformanceTest.java | 0 .../datamanager/database/ANDRelationTest.java | 0 .../database/AggregateQueryTest.java | 0 .../datamanager/database/ConditionTest.java | 0 .../database/DatabaseAdapterTest.java | 0 .../DatabaseConnectionPoolInterfaceTest.java | 0 .../database/DatabaseHandlerTest.java | 0 .../database/DatabaseLoaderTest.java | 0 .../datamanager/database/HSQLAdapterTest.java | 0 .../datamanager/database/JoinTest.java | 0 .../database/PostgresAdapterTest.java | 0 .../datamanager/database/QueryTest.java | 0 .../database/SelectionItemTest.java | 0 .../database/SubQueryClauseTest.java | 0 .../datamanager/database/TableItemTest.java | 0 .../database/TableMonitorTest.java | 0 .../datamanager/database/UnionTest.java | 0 .../datamanager/database/WhereClauseTest.java | 0 .../dataquery/DataquerySpecificationTest.java | 0 .../datamanager/download/DataStorageTest.java | 0 .../download/DownloadHandlerTest.java | 0 .../EcogridEndPointInterfaceTest.java | 0 .../download/GZipDataHandlerTest.java | 0 .../download/TarDataHandlerTest.java | 0 .../download/ZipDataHandlerTest.java | 0 .../datamanager/parser/AttributeListTest.java | 0 .../datamanager/parser/AttributeTest.java | 0 .../parser/DataObjectDescriptionTest.java | 0 .../datamanager/parser/DataPackageTest.java | 0 .../parser/DateTimeDomainTest.java | 0 .../datamanager/parser/EntityTest.java | 0 .../parser/EnumeratedDomainTest.java | 0 .../datamanager/parser/ForeignKeyTest.java | 0 .../parser/JoinConditionConstraintTest.java | 0 .../parser/NotNullConstraintTest.java | 0 .../datamanager/parser/NumericDomainTest.java | 0 .../datamanager/parser/PrimaryKeyTest.java | 0 .../parser/TextDelimitedDataFormatTest.java | 0 .../datamanager/parser/TextDomainTest.java | 0 .../parser/TextWidthFixedDataFormatTest.java | 0 .../datamanager/parser/UniqueKeyTest.java | 0 .../DocumentDataPackageParserTest.java | 0 .../parser/eml/Eml200ParserTest.java | 0 .../generic/Eml200DataPackageParserTest.java | 0 .../generic/GenericDataPackageParserTest.java | 0 .../ecoinformatics/emltest/EMLParserTest.java | 0 .../emltest/SaxValidateTest.java | 0 .../ecoinformatics/export/HtmlToPdfTest.java | 0 .../citation-sbclter-bibliography.201.xml | 0 .../citation-sbclter-bibliography.202.xml | 0 .../citation-sbclter-bibliography.203.xml | 0 .../citation-sbclter-bibliography.211.xml | 0 .../citation-sbclter-bibliography.231.xml | 0 .../citation-sbclter-bibliography.232.xml | 0 .../citation-sbclter-bibliography.233.xml | 0 .../citation-sbclter-bibliography.279.xml | 0 .../citation-sbclter-bibliography.280.xml | 0 .../citation-sbclter-bibliography.284.xml | 0 .../citation-sbclter-bibliography.285.xml | 0 .../citation-sbclter-bibliography.289.xml | 0 .../citation-sbclter-bibliography.296.xml | 0 .../citation-sbclter-bibliography.297.xml | 0 .../citation-sbclter-bibliography.50.xml | 0 .../citation-sbclter-bibliography.51.xml | 0 {test => src/test/resources}/eml-access.xml | 0 .../test/resources}/eml-attribute.xml | 0 .../resources}/eml-citationWithContact.xml | 0 .../eml-citationWithContactReference.xml | 0 .../test/resources}/eml-dataTable.xml | 0 {test => src/test/resources}/eml-dataset.xml | 0 .../test/resources}/eml-datasetGRing.xml | 0 .../test/resources}/eml-datasetGringpoint.xml | 0 .../eml-datasetMultipleDistribution.xml | 0 .../eml-datasetWhitespacePatterns.xml | 0 .../test/resources}/eml-datasetWithAccess.xml | 0 .../eml-datasetWithAccessOverride.xml | 0 ...ml-datasetWithAccessUnitsLiteralLayout.xml | 0 .../eml-datasetWithAttributelevelMethods.xml | 0 .../resources}/eml-datasetWithCitation.xml | 0 .../eml-datasetWithNonwordCharacters.xml | 0 .../test/resources}/eml-datasetWithUnits.xml | 0 {test => src/test/resources}/eml-entity.xml | 0 {test => src/test/resources}/eml-i18n.xml | 0 {test => src/test/resources}/eml-inline.xml | 0 .../test/resources}/eml-literature.xml | 0 .../test/resources}/eml-literatureInPress.xml | 0 {test => src/test/resources}/eml-method.xml | 0 {test => src/test/resources}/eml-offline.xml | 0 {test => src/test/resources}/eml-party.xml | 0 .../eml-physical-inline-cdatasection.xml | 0 .../test/resources}/eml-physical-inline.xml | 0 {test => src/test/resources}/eml-physical.xml | 0 {test => src/test/resources}/eml-project.xml | 0 {test => src/test/resources}/eml-protocol.xml | 0 {test => src/test/resources}/eml-sample.xml | 0 {test => src/test/resources}/eml-software.xml | 0 .../eml-softwareWithAcessDistribution.xml | 0 .../test/resources}/eml-spatialVector.xml | 0 .../test/resources}/eml-storedProcedure.xml | 0 {test => src/test/resources}/eml-text.xml | 0 src/test/resources/eml-unitDictionary.xml | 1057 +++++++++++++++++ {test => src/test/resources}/eml-view.xml | 0 {test => src/test/resources}/eml.xml | 0 .../eml-datasetInvalidGringpoint.xml | 0 .../invalidEML/eml-error-references.xml | 0 .../test/resources}/invalidEML/eml-error1.xml | 0 .../test/resources}/invalidEML/eml-error3.xml | 0 .../test/resources}/invalidEML/eml-error4.xml | 0 .../sampleLTERIntellectualRights.xml | 0 .../stmml_dictionaryWithDefintion.xml | 0 .../test/resources}/test2008.cdr958608.1.xml | 0 215 files changed, 1217 insertions(+), 12 deletions(-) create mode 100644 pom.xml rename src/{ => main/java}/org/ecoinformatics/datamanager/DataManager.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/ANDRelation.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/AggregateSelectionItem.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/Condition.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/ConditionInterface.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/ConnectionNotAvailableException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/DataNotMatchingMetadataException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/DatabaseAdapter.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterface.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/DatabaseHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/DatabaseLoader.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/DelimitedReader.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/GroupBy.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/HSQLAdapter.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/Join.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/LogicalRelation.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/NoTableSpaceException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/ORRelation.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/OracleAdapter.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/PostgresAdapter.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/Query.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/SelectionItem.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/SimpleDatabaseLoader.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/StaticSelectionItem.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/SubQueryClause.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/TableItem.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/TableMonitor.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/TextComplexFormatDataReader.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/TextDataReader.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/UnWellFormedQueryException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/Union.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/VectorReader.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/WhereClause.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/pooling/DatabaseConnectionPoolFactory.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/pooling/HSQLDatabaseConnectionPool.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/database/pooling/PostgresDatabaseConnectionPool.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/dataquery/BasicNode.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/dataquery/DataquerySpecification.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/ArchivedDataHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/AuthenticatedEcogridEndPointInterface.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/CompressedDataHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/ConfigurableEcogridEndPoint.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/DataDownloadNotFinishedException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/DataSourceNotFoundException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/DataStorageInterface.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/DocumentHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/DownloadHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/EcogridEndPointInterface.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/GZipDataHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/TarDataHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/ZipDataHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/download/document/DocumentDataPackageHandler.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/Attribute.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/AttributeList.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/Constraint.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/DataObjectDescription.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/DataPackage.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/DateTimeDomain.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/Domain.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/Entity.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/EnumeratedDomain.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/ForeignKey.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/JoinConditionConstraint.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/NotNullConstraint.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/NumericDomain.java (96%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/Party.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/PrimaryKey.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/StorageType.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/TextComplexDataFormat.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormat.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/TextDomain.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormat.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/UnWellFormedConstraintException.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/UniqueKey.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/document/DocumentDataPackage.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParser.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/eml/Eml200Parser.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/generic/DataPackageParserInterface.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParser.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParser.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/quality/EntityReport.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/quality/QualityCheck.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/quality/QualityReport.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/sample/EMLInspectionApp.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/sample/EcogridEndPoint.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/sample/SampleCallingApp.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/sample/SampleDataStorage.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/transpose/DataTranspose.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/util/DocumentDownloadUtil.java (100%) rename src/{ => main/java}/org/ecoinformatics/datamanager/util/TableGenerator.java (100%) rename src/{ => main/java}/org/ecoinformatics/eml/EMLParser.java (100%) rename src/{ => main/java}/org/ecoinformatics/eml/EMLParserException.java (100%) rename src/{ => main/java}/org/ecoinformatics/eml/EMLParserServlet.java (100%) rename src/{ => main/java}/org/ecoinformatics/eml/MakeProjectionDictionary.java (100%) rename src/{ => main/java}/org/ecoinformatics/eml/SAXValidate.java (100%) rename src/{ => main/java}/org/ecoinformatics/export/HtmlToPdf.java (100%) rename src/{ => main/resources}/datamanager.properties (100%) rename src/{ => main/resources}/endpoint.properties (100%) rename src/{ => main/resources}/log4j.properties (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/DataManagerTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/DataPackagePopulator.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/UnionPerformanceTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/ANDRelationTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/AggregateQueryTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/ConditionTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/DatabaseAdapterTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterfaceTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/DatabaseHandlerTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/DatabaseLoaderTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/HSQLAdapterTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/JoinTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/PostgresAdapterTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/QueryTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/SelectionItemTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/SubQueryClauseTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/TableItemTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/TableMonitorTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/UnionTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/database/WhereClauseTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/dataquery/DataquerySpecificationTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/download/DataStorageTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/download/DownloadHandlerTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/download/EcogridEndPointInterfaceTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/download/GZipDataHandlerTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/download/TarDataHandlerTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/download/ZipDataHandlerTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/AttributeListTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/AttributeTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/DataObjectDescriptionTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/DataPackageTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/DateTimeDomainTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/EntityTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/EnumeratedDomainTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/ForeignKeyTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/JoinConditionConstraintTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/NotNullConstraintTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/NumericDomainTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/PrimaryKeyTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormatTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/TextDomainTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormatTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/UniqueKeyTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParserTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/eml/Eml200ParserTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParserTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParserTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/emltest/EMLParserTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/emltest/SaxValidateTest.java (100%) rename {test => src/test/java}/org/ecoinformatics/export/HtmlToPdfTest.java (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.201.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.202.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.203.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.211.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.231.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.232.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.233.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.279.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.280.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.284.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.285.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.289.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.296.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.297.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.50.xml (100%) rename {test => src/test/resources}/citation-sbclter-bibliography.51.xml (100%) rename {test => src/test/resources}/eml-access.xml (100%) rename {test => src/test/resources}/eml-attribute.xml (100%) rename {test => src/test/resources}/eml-citationWithContact.xml (100%) rename {test => src/test/resources}/eml-citationWithContactReference.xml (100%) rename {test => src/test/resources}/eml-dataTable.xml (100%) rename {test => src/test/resources}/eml-dataset.xml (100%) rename {test => src/test/resources}/eml-datasetGRing.xml (100%) rename {test => src/test/resources}/eml-datasetGringpoint.xml (100%) rename {test => src/test/resources}/eml-datasetMultipleDistribution.xml (100%) rename {test => src/test/resources}/eml-datasetWhitespacePatterns.xml (100%) rename {test => src/test/resources}/eml-datasetWithAccess.xml (100%) rename {test => src/test/resources}/eml-datasetWithAccessOverride.xml (100%) rename {test => src/test/resources}/eml-datasetWithAccessUnitsLiteralLayout.xml (100%) rename {test => src/test/resources}/eml-datasetWithAttributelevelMethods.xml (100%) rename {test => src/test/resources}/eml-datasetWithCitation.xml (100%) rename {test => src/test/resources}/eml-datasetWithNonwordCharacters.xml (100%) rename {test => src/test/resources}/eml-datasetWithUnits.xml (100%) rename {test => src/test/resources}/eml-entity.xml (100%) rename {test => src/test/resources}/eml-i18n.xml (100%) rename {test => src/test/resources}/eml-inline.xml (100%) rename {test => src/test/resources}/eml-literature.xml (100%) rename {test => src/test/resources}/eml-literatureInPress.xml (100%) rename {test => src/test/resources}/eml-method.xml (100%) rename {test => src/test/resources}/eml-offline.xml (100%) rename {test => src/test/resources}/eml-party.xml (100%) rename {test => src/test/resources}/eml-physical-inline-cdatasection.xml (100%) rename {test => src/test/resources}/eml-physical-inline.xml (100%) rename {test => src/test/resources}/eml-physical.xml (100%) rename {test => src/test/resources}/eml-project.xml (100%) rename {test => src/test/resources}/eml-protocol.xml (100%) rename {test => src/test/resources}/eml-sample.xml (100%) rename {test => src/test/resources}/eml-software.xml (100%) rename {test => src/test/resources}/eml-softwareWithAcessDistribution.xml (100%) rename {test => src/test/resources}/eml-spatialVector.xml (100%) rename {test => src/test/resources}/eml-storedProcedure.xml (100%) rename {test => src/test/resources}/eml-text.xml (100%) create mode 100644 src/test/resources/eml-unitDictionary.xml rename {test => src/test/resources}/eml-view.xml (100%) rename {test => src/test/resources}/eml.xml (100%) rename {test => src/test/resources}/invalidEML/eml-datasetInvalidGringpoint.xml (100%) rename {test => src/test/resources}/invalidEML/eml-error-references.xml (100%) rename {test => src/test/resources}/invalidEML/eml-error1.xml (100%) rename {test => src/test/resources}/invalidEML/eml-error3.xml (100%) rename {test => src/test/resources}/invalidEML/eml-error4.xml (100%) rename {test => src/test/resources}/sampleLTERIntellectualRights.xml (100%) rename {test => src/test/resources}/stmml_dictionaryWithDefintion.xml (100%) rename {test => src/test/resources}/test2008.cdr958608.1.xml (100%) diff --git a/build.xml b/build.xml index c0b1a8e6..4fa35e8a 100644 --- a/build.xml +++ b/build.xml @@ -97,9 +97,11 @@ - - - + + + + + @@ -137,7 +139,7 @@ - + @@ -246,7 +248,7 @@ - + @@ -466,7 +468,7 @@ - + @@ -560,8 +562,7 @@ tofile="${servlet.install.dir}/WEB-INF/lib/xml-apis.jar"/> - + + + org.xhtmlrenderer + core-renderer + R8 + + + net.sf.jtidy + jtidy + r938 + + + + xerces + xercesImpl + 2.9.1 + + + xalan + xalan + 2.7.1 + + + + edu.ucsb.nceas + utilities + 2.0.0-SNAPSHOT + + + + axis + axis + 1.4 + + + servlets.com + cos + 05Nov2002 + + + hsqldb + hsqldb + 1.8.0.10 + + + postgresql + postgresql + 8.0-312.jdbc3 + + + javatar + javatar + 2.5 + + + commons-net + commons-net + 3.3 + + + javax.servlet + servlet-api + 2.5 + + + jdom + jdom + 1.0b8 + + + + + log4j + log4j + 1.2.17 + + + junit + junit + 4.8.2 + test + + + + + edu.ucsb.nceas + configxml + 0.9.0 + system + ${basedir}/lib/configxml.jar + + + org.ecoinformatics.ecogrid + AuthenticatedQueryService-stub + 0.9.0 + system + ${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.AuthenticatedQueryService-stub.jar + + + org.ecoinformatics.ecogrid + AuthenticationService-stub + 0.9.0 + system + ${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.AuthenticationService-stub.jar + + + org.ecoinformatics.ecogrid + PutService-stub + 0.9.0 + system + ${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.PutService-stub.jar + + + org.ecoinformatics.ecogrid + QueryService-stub + 0.9.0 + system + ${basedir}/lib/datamanager/org.ecoinformatics.ecogrid.QueryService-stub.jar + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3 + + 1.6 + 1.6 + + + + + diff --git a/src/org/ecoinformatics/datamanager/DataManager.java b/src/main/java/org/ecoinformatics/datamanager/DataManager.java similarity index 100% rename from src/org/ecoinformatics/datamanager/DataManager.java rename to src/main/java/org/ecoinformatics/datamanager/DataManager.java diff --git a/src/org/ecoinformatics/datamanager/database/ANDRelation.java b/src/main/java/org/ecoinformatics/datamanager/database/ANDRelation.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/ANDRelation.java rename to src/main/java/org/ecoinformatics/datamanager/database/ANDRelation.java diff --git a/src/org/ecoinformatics/datamanager/database/AggregateSelectionItem.java b/src/main/java/org/ecoinformatics/datamanager/database/AggregateSelectionItem.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/AggregateSelectionItem.java rename to src/main/java/org/ecoinformatics/datamanager/database/AggregateSelectionItem.java diff --git a/src/org/ecoinformatics/datamanager/database/Condition.java b/src/main/java/org/ecoinformatics/datamanager/database/Condition.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/Condition.java rename to src/main/java/org/ecoinformatics/datamanager/database/Condition.java diff --git a/src/org/ecoinformatics/datamanager/database/ConditionInterface.java b/src/main/java/org/ecoinformatics/datamanager/database/ConditionInterface.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/ConditionInterface.java rename to src/main/java/org/ecoinformatics/datamanager/database/ConditionInterface.java diff --git a/src/org/ecoinformatics/datamanager/database/ConnectionNotAvailableException.java b/src/main/java/org/ecoinformatics/datamanager/database/ConnectionNotAvailableException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/ConnectionNotAvailableException.java rename to src/main/java/org/ecoinformatics/datamanager/database/ConnectionNotAvailableException.java diff --git a/src/org/ecoinformatics/datamanager/database/DataNotMatchingMetadataException.java b/src/main/java/org/ecoinformatics/datamanager/database/DataNotMatchingMetadataException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/DataNotMatchingMetadataException.java rename to src/main/java/org/ecoinformatics/datamanager/database/DataNotMatchingMetadataException.java diff --git a/src/org/ecoinformatics/datamanager/database/DatabaseAdapter.java b/src/main/java/org/ecoinformatics/datamanager/database/DatabaseAdapter.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/DatabaseAdapter.java rename to src/main/java/org/ecoinformatics/datamanager/database/DatabaseAdapter.java diff --git a/src/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterface.java b/src/main/java/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterface.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterface.java rename to src/main/java/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterface.java diff --git a/src/org/ecoinformatics/datamanager/database/DatabaseHandler.java b/src/main/java/org/ecoinformatics/datamanager/database/DatabaseHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/DatabaseHandler.java rename to src/main/java/org/ecoinformatics/datamanager/database/DatabaseHandler.java diff --git a/src/org/ecoinformatics/datamanager/database/DatabaseLoader.java b/src/main/java/org/ecoinformatics/datamanager/database/DatabaseLoader.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/DatabaseLoader.java rename to src/main/java/org/ecoinformatics/datamanager/database/DatabaseLoader.java diff --git a/src/org/ecoinformatics/datamanager/database/DelimitedReader.java b/src/main/java/org/ecoinformatics/datamanager/database/DelimitedReader.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/DelimitedReader.java rename to src/main/java/org/ecoinformatics/datamanager/database/DelimitedReader.java diff --git a/src/org/ecoinformatics/datamanager/database/GroupBy.java b/src/main/java/org/ecoinformatics/datamanager/database/GroupBy.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/GroupBy.java rename to src/main/java/org/ecoinformatics/datamanager/database/GroupBy.java diff --git a/src/org/ecoinformatics/datamanager/database/HSQLAdapter.java b/src/main/java/org/ecoinformatics/datamanager/database/HSQLAdapter.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/HSQLAdapter.java rename to src/main/java/org/ecoinformatics/datamanager/database/HSQLAdapter.java diff --git a/src/org/ecoinformatics/datamanager/database/Join.java b/src/main/java/org/ecoinformatics/datamanager/database/Join.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/Join.java rename to src/main/java/org/ecoinformatics/datamanager/database/Join.java diff --git a/src/org/ecoinformatics/datamanager/database/LogicalRelation.java b/src/main/java/org/ecoinformatics/datamanager/database/LogicalRelation.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/LogicalRelation.java rename to src/main/java/org/ecoinformatics/datamanager/database/LogicalRelation.java diff --git a/src/org/ecoinformatics/datamanager/database/NoTableSpaceException.java b/src/main/java/org/ecoinformatics/datamanager/database/NoTableSpaceException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/NoTableSpaceException.java rename to src/main/java/org/ecoinformatics/datamanager/database/NoTableSpaceException.java diff --git a/src/org/ecoinformatics/datamanager/database/ORRelation.java b/src/main/java/org/ecoinformatics/datamanager/database/ORRelation.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/ORRelation.java rename to src/main/java/org/ecoinformatics/datamanager/database/ORRelation.java diff --git a/src/org/ecoinformatics/datamanager/database/OracleAdapter.java b/src/main/java/org/ecoinformatics/datamanager/database/OracleAdapter.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/OracleAdapter.java rename to src/main/java/org/ecoinformatics/datamanager/database/OracleAdapter.java diff --git a/src/org/ecoinformatics/datamanager/database/PostgresAdapter.java b/src/main/java/org/ecoinformatics/datamanager/database/PostgresAdapter.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/PostgresAdapter.java rename to src/main/java/org/ecoinformatics/datamanager/database/PostgresAdapter.java diff --git a/src/org/ecoinformatics/datamanager/database/Query.java b/src/main/java/org/ecoinformatics/datamanager/database/Query.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/Query.java rename to src/main/java/org/ecoinformatics/datamanager/database/Query.java diff --git a/src/org/ecoinformatics/datamanager/database/SelectionItem.java b/src/main/java/org/ecoinformatics/datamanager/database/SelectionItem.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/SelectionItem.java rename to src/main/java/org/ecoinformatics/datamanager/database/SelectionItem.java diff --git a/src/org/ecoinformatics/datamanager/database/SimpleDatabaseLoader.java b/src/main/java/org/ecoinformatics/datamanager/database/SimpleDatabaseLoader.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/SimpleDatabaseLoader.java rename to src/main/java/org/ecoinformatics/datamanager/database/SimpleDatabaseLoader.java diff --git a/src/org/ecoinformatics/datamanager/database/StaticSelectionItem.java b/src/main/java/org/ecoinformatics/datamanager/database/StaticSelectionItem.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/StaticSelectionItem.java rename to src/main/java/org/ecoinformatics/datamanager/database/StaticSelectionItem.java diff --git a/src/org/ecoinformatics/datamanager/database/SubQueryClause.java b/src/main/java/org/ecoinformatics/datamanager/database/SubQueryClause.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/SubQueryClause.java rename to src/main/java/org/ecoinformatics/datamanager/database/SubQueryClause.java diff --git a/src/org/ecoinformatics/datamanager/database/TableItem.java b/src/main/java/org/ecoinformatics/datamanager/database/TableItem.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/TableItem.java rename to src/main/java/org/ecoinformatics/datamanager/database/TableItem.java diff --git a/src/org/ecoinformatics/datamanager/database/TableMonitor.java b/src/main/java/org/ecoinformatics/datamanager/database/TableMonitor.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/TableMonitor.java rename to src/main/java/org/ecoinformatics/datamanager/database/TableMonitor.java diff --git a/src/org/ecoinformatics/datamanager/database/TextComplexFormatDataReader.java b/src/main/java/org/ecoinformatics/datamanager/database/TextComplexFormatDataReader.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/TextComplexFormatDataReader.java rename to src/main/java/org/ecoinformatics/datamanager/database/TextComplexFormatDataReader.java diff --git a/src/org/ecoinformatics/datamanager/database/TextDataReader.java b/src/main/java/org/ecoinformatics/datamanager/database/TextDataReader.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/TextDataReader.java rename to src/main/java/org/ecoinformatics/datamanager/database/TextDataReader.java diff --git a/src/org/ecoinformatics/datamanager/database/UnWellFormedQueryException.java b/src/main/java/org/ecoinformatics/datamanager/database/UnWellFormedQueryException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/UnWellFormedQueryException.java rename to src/main/java/org/ecoinformatics/datamanager/database/UnWellFormedQueryException.java diff --git a/src/org/ecoinformatics/datamanager/database/Union.java b/src/main/java/org/ecoinformatics/datamanager/database/Union.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/Union.java rename to src/main/java/org/ecoinformatics/datamanager/database/Union.java diff --git a/src/org/ecoinformatics/datamanager/database/VectorReader.java b/src/main/java/org/ecoinformatics/datamanager/database/VectorReader.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/VectorReader.java rename to src/main/java/org/ecoinformatics/datamanager/database/VectorReader.java diff --git a/src/org/ecoinformatics/datamanager/database/WhereClause.java b/src/main/java/org/ecoinformatics/datamanager/database/WhereClause.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/WhereClause.java rename to src/main/java/org/ecoinformatics/datamanager/database/WhereClause.java diff --git a/src/org/ecoinformatics/datamanager/database/pooling/DatabaseConnectionPoolFactory.java b/src/main/java/org/ecoinformatics/datamanager/database/pooling/DatabaseConnectionPoolFactory.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/pooling/DatabaseConnectionPoolFactory.java rename to src/main/java/org/ecoinformatics/datamanager/database/pooling/DatabaseConnectionPoolFactory.java diff --git a/src/org/ecoinformatics/datamanager/database/pooling/HSQLDatabaseConnectionPool.java b/src/main/java/org/ecoinformatics/datamanager/database/pooling/HSQLDatabaseConnectionPool.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/pooling/HSQLDatabaseConnectionPool.java rename to src/main/java/org/ecoinformatics/datamanager/database/pooling/HSQLDatabaseConnectionPool.java diff --git a/src/org/ecoinformatics/datamanager/database/pooling/PostgresDatabaseConnectionPool.java b/src/main/java/org/ecoinformatics/datamanager/database/pooling/PostgresDatabaseConnectionPool.java similarity index 100% rename from src/org/ecoinformatics/datamanager/database/pooling/PostgresDatabaseConnectionPool.java rename to src/main/java/org/ecoinformatics/datamanager/database/pooling/PostgresDatabaseConnectionPool.java diff --git a/src/org/ecoinformatics/datamanager/dataquery/BasicNode.java b/src/main/java/org/ecoinformatics/datamanager/dataquery/BasicNode.java similarity index 100% rename from src/org/ecoinformatics/datamanager/dataquery/BasicNode.java rename to src/main/java/org/ecoinformatics/datamanager/dataquery/BasicNode.java diff --git a/src/org/ecoinformatics/datamanager/dataquery/DataquerySpecification.java b/src/main/java/org/ecoinformatics/datamanager/dataquery/DataquerySpecification.java similarity index 100% rename from src/org/ecoinformatics/datamanager/dataquery/DataquerySpecification.java rename to src/main/java/org/ecoinformatics/datamanager/dataquery/DataquerySpecification.java diff --git a/src/org/ecoinformatics/datamanager/download/ArchivedDataHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/ArchivedDataHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/ArchivedDataHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/ArchivedDataHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/AuthenticatedEcogridEndPointInterface.java b/src/main/java/org/ecoinformatics/datamanager/download/AuthenticatedEcogridEndPointInterface.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/AuthenticatedEcogridEndPointInterface.java rename to src/main/java/org/ecoinformatics/datamanager/download/AuthenticatedEcogridEndPointInterface.java diff --git a/src/org/ecoinformatics/datamanager/download/CompressedDataHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/CompressedDataHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/CompressedDataHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/CompressedDataHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/ConfigurableEcogridEndPoint.java b/src/main/java/org/ecoinformatics/datamanager/download/ConfigurableEcogridEndPoint.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/ConfigurableEcogridEndPoint.java rename to src/main/java/org/ecoinformatics/datamanager/download/ConfigurableEcogridEndPoint.java diff --git a/src/org/ecoinformatics/datamanager/download/DataDownloadNotFinishedException.java b/src/main/java/org/ecoinformatics/datamanager/download/DataDownloadNotFinishedException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/DataDownloadNotFinishedException.java rename to src/main/java/org/ecoinformatics/datamanager/download/DataDownloadNotFinishedException.java diff --git a/src/org/ecoinformatics/datamanager/download/DataSourceNotFoundException.java b/src/main/java/org/ecoinformatics/datamanager/download/DataSourceNotFoundException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/DataSourceNotFoundException.java rename to src/main/java/org/ecoinformatics/datamanager/download/DataSourceNotFoundException.java diff --git a/src/org/ecoinformatics/datamanager/download/DataStorageInterface.java b/src/main/java/org/ecoinformatics/datamanager/download/DataStorageInterface.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/DataStorageInterface.java rename to src/main/java/org/ecoinformatics/datamanager/download/DataStorageInterface.java diff --git a/src/org/ecoinformatics/datamanager/download/DocumentHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/DocumentHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/DocumentHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/DocumentHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/DownloadHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/DownloadHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/DownloadHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/DownloadHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/EcogridEndPointInterface.java b/src/main/java/org/ecoinformatics/datamanager/download/EcogridEndPointInterface.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/EcogridEndPointInterface.java rename to src/main/java/org/ecoinformatics/datamanager/download/EcogridEndPointInterface.java diff --git a/src/org/ecoinformatics/datamanager/download/GZipDataHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/GZipDataHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/GZipDataHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/GZipDataHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/TarDataHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/TarDataHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/TarDataHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/TarDataHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/ZipDataHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/ZipDataHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/ZipDataHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/ZipDataHandler.java diff --git a/src/org/ecoinformatics/datamanager/download/document/DocumentDataPackageHandler.java b/src/main/java/org/ecoinformatics/datamanager/download/document/DocumentDataPackageHandler.java similarity index 100% rename from src/org/ecoinformatics/datamanager/download/document/DocumentDataPackageHandler.java rename to src/main/java/org/ecoinformatics/datamanager/download/document/DocumentDataPackageHandler.java diff --git a/src/org/ecoinformatics/datamanager/parser/Attribute.java b/src/main/java/org/ecoinformatics/datamanager/parser/Attribute.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/Attribute.java rename to src/main/java/org/ecoinformatics/datamanager/parser/Attribute.java diff --git a/src/org/ecoinformatics/datamanager/parser/AttributeList.java b/src/main/java/org/ecoinformatics/datamanager/parser/AttributeList.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/AttributeList.java rename to src/main/java/org/ecoinformatics/datamanager/parser/AttributeList.java diff --git a/src/org/ecoinformatics/datamanager/parser/Constraint.java b/src/main/java/org/ecoinformatics/datamanager/parser/Constraint.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/Constraint.java rename to src/main/java/org/ecoinformatics/datamanager/parser/Constraint.java diff --git a/src/org/ecoinformatics/datamanager/parser/DataObjectDescription.java b/src/main/java/org/ecoinformatics/datamanager/parser/DataObjectDescription.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/DataObjectDescription.java rename to src/main/java/org/ecoinformatics/datamanager/parser/DataObjectDescription.java diff --git a/src/org/ecoinformatics/datamanager/parser/DataPackage.java b/src/main/java/org/ecoinformatics/datamanager/parser/DataPackage.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/DataPackage.java rename to src/main/java/org/ecoinformatics/datamanager/parser/DataPackage.java diff --git a/src/org/ecoinformatics/datamanager/parser/DateTimeDomain.java b/src/main/java/org/ecoinformatics/datamanager/parser/DateTimeDomain.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/DateTimeDomain.java rename to src/main/java/org/ecoinformatics/datamanager/parser/DateTimeDomain.java diff --git a/src/org/ecoinformatics/datamanager/parser/Domain.java b/src/main/java/org/ecoinformatics/datamanager/parser/Domain.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/Domain.java rename to src/main/java/org/ecoinformatics/datamanager/parser/Domain.java diff --git a/src/org/ecoinformatics/datamanager/parser/Entity.java b/src/main/java/org/ecoinformatics/datamanager/parser/Entity.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/Entity.java rename to src/main/java/org/ecoinformatics/datamanager/parser/Entity.java diff --git a/src/org/ecoinformatics/datamanager/parser/EnumeratedDomain.java b/src/main/java/org/ecoinformatics/datamanager/parser/EnumeratedDomain.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/EnumeratedDomain.java rename to src/main/java/org/ecoinformatics/datamanager/parser/EnumeratedDomain.java diff --git a/src/org/ecoinformatics/datamanager/parser/ForeignKey.java b/src/main/java/org/ecoinformatics/datamanager/parser/ForeignKey.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/ForeignKey.java rename to src/main/java/org/ecoinformatics/datamanager/parser/ForeignKey.java diff --git a/src/org/ecoinformatics/datamanager/parser/JoinConditionConstraint.java b/src/main/java/org/ecoinformatics/datamanager/parser/JoinConditionConstraint.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/JoinConditionConstraint.java rename to src/main/java/org/ecoinformatics/datamanager/parser/JoinConditionConstraint.java diff --git a/src/org/ecoinformatics/datamanager/parser/NotNullConstraint.java b/src/main/java/org/ecoinformatics/datamanager/parser/NotNullConstraint.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/NotNullConstraint.java rename to src/main/java/org/ecoinformatics/datamanager/parser/NotNullConstraint.java diff --git a/src/org/ecoinformatics/datamanager/parser/NumericDomain.java b/src/main/java/org/ecoinformatics/datamanager/parser/NumericDomain.java similarity index 96% rename from src/org/ecoinformatics/datamanager/parser/NumericDomain.java rename to src/main/java/org/ecoinformatics/datamanager/parser/NumericDomain.java index 1e843faa..80a28627 100644 --- a/src/org/ecoinformatics/datamanager/parser/NumericDomain.java +++ b/src/main/java/org/ecoinformatics/datamanager/parser/NumericDomain.java @@ -58,7 +58,7 @@ public class NumericDomain implements Domain * Constructor of numeric domain * * @param numberType the number type of the numeric domain. In EML, a - * measurement’s numberType should be defined as "real", + * measurement's numberType should be defined as "real", * "natural", "whole" or "integer". * @param minimum lower bound for values this numeric domain * @param maximum upper bound for values in this numeric domain @@ -77,7 +77,7 @@ public NumericDomain(String numberType, Double minimum, Double maximum) /** * Method to get the numberType value. * - * @return the numberType, a String. In EML, a measurement’s numberType + * @return the numberType, a String. In EML, a measurement's numberType * should be defined as real, natural, whole or integer. */ public String getNumberType() diff --git a/src/org/ecoinformatics/datamanager/parser/Party.java b/src/main/java/org/ecoinformatics/datamanager/parser/Party.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/Party.java rename to src/main/java/org/ecoinformatics/datamanager/parser/Party.java diff --git a/src/org/ecoinformatics/datamanager/parser/PrimaryKey.java b/src/main/java/org/ecoinformatics/datamanager/parser/PrimaryKey.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/PrimaryKey.java rename to src/main/java/org/ecoinformatics/datamanager/parser/PrimaryKey.java diff --git a/src/org/ecoinformatics/datamanager/parser/StorageType.java b/src/main/java/org/ecoinformatics/datamanager/parser/StorageType.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/StorageType.java rename to src/main/java/org/ecoinformatics/datamanager/parser/StorageType.java diff --git a/src/org/ecoinformatics/datamanager/parser/TextComplexDataFormat.java b/src/main/java/org/ecoinformatics/datamanager/parser/TextComplexDataFormat.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/TextComplexDataFormat.java rename to src/main/java/org/ecoinformatics/datamanager/parser/TextComplexDataFormat.java diff --git a/src/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormat.java b/src/main/java/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormat.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormat.java rename to src/main/java/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormat.java diff --git a/src/org/ecoinformatics/datamanager/parser/TextDomain.java b/src/main/java/org/ecoinformatics/datamanager/parser/TextDomain.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/TextDomain.java rename to src/main/java/org/ecoinformatics/datamanager/parser/TextDomain.java diff --git a/src/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormat.java b/src/main/java/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormat.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormat.java rename to src/main/java/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormat.java diff --git a/src/org/ecoinformatics/datamanager/parser/UnWellFormedConstraintException.java b/src/main/java/org/ecoinformatics/datamanager/parser/UnWellFormedConstraintException.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/UnWellFormedConstraintException.java rename to src/main/java/org/ecoinformatics/datamanager/parser/UnWellFormedConstraintException.java diff --git a/src/org/ecoinformatics/datamanager/parser/UniqueKey.java b/src/main/java/org/ecoinformatics/datamanager/parser/UniqueKey.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/UniqueKey.java rename to src/main/java/org/ecoinformatics/datamanager/parser/UniqueKey.java diff --git a/src/org/ecoinformatics/datamanager/parser/document/DocumentDataPackage.java b/src/main/java/org/ecoinformatics/datamanager/parser/document/DocumentDataPackage.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/document/DocumentDataPackage.java rename to src/main/java/org/ecoinformatics/datamanager/parser/document/DocumentDataPackage.java diff --git a/src/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParser.java b/src/main/java/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParser.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParser.java rename to src/main/java/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParser.java diff --git a/src/org/ecoinformatics/datamanager/parser/eml/Eml200Parser.java b/src/main/java/org/ecoinformatics/datamanager/parser/eml/Eml200Parser.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/eml/Eml200Parser.java rename to src/main/java/org/ecoinformatics/datamanager/parser/eml/Eml200Parser.java diff --git a/src/org/ecoinformatics/datamanager/parser/generic/DataPackageParserInterface.java b/src/main/java/org/ecoinformatics/datamanager/parser/generic/DataPackageParserInterface.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/generic/DataPackageParserInterface.java rename to src/main/java/org/ecoinformatics/datamanager/parser/generic/DataPackageParserInterface.java diff --git a/src/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParser.java b/src/main/java/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParser.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParser.java rename to src/main/java/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParser.java diff --git a/src/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParser.java b/src/main/java/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParser.java similarity index 100% rename from src/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParser.java rename to src/main/java/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParser.java diff --git a/src/org/ecoinformatics/datamanager/quality/EntityReport.java b/src/main/java/org/ecoinformatics/datamanager/quality/EntityReport.java similarity index 100% rename from src/org/ecoinformatics/datamanager/quality/EntityReport.java rename to src/main/java/org/ecoinformatics/datamanager/quality/EntityReport.java diff --git a/src/org/ecoinformatics/datamanager/quality/QualityCheck.java b/src/main/java/org/ecoinformatics/datamanager/quality/QualityCheck.java similarity index 100% rename from src/org/ecoinformatics/datamanager/quality/QualityCheck.java rename to src/main/java/org/ecoinformatics/datamanager/quality/QualityCheck.java diff --git a/src/org/ecoinformatics/datamanager/quality/QualityReport.java b/src/main/java/org/ecoinformatics/datamanager/quality/QualityReport.java similarity index 100% rename from src/org/ecoinformatics/datamanager/quality/QualityReport.java rename to src/main/java/org/ecoinformatics/datamanager/quality/QualityReport.java diff --git a/src/org/ecoinformatics/datamanager/sample/EMLInspectionApp.java b/src/main/java/org/ecoinformatics/datamanager/sample/EMLInspectionApp.java similarity index 100% rename from src/org/ecoinformatics/datamanager/sample/EMLInspectionApp.java rename to src/main/java/org/ecoinformatics/datamanager/sample/EMLInspectionApp.java diff --git a/src/org/ecoinformatics/datamanager/sample/EcogridEndPoint.java b/src/main/java/org/ecoinformatics/datamanager/sample/EcogridEndPoint.java similarity index 100% rename from src/org/ecoinformatics/datamanager/sample/EcogridEndPoint.java rename to src/main/java/org/ecoinformatics/datamanager/sample/EcogridEndPoint.java diff --git a/src/org/ecoinformatics/datamanager/sample/SampleCallingApp.java b/src/main/java/org/ecoinformatics/datamanager/sample/SampleCallingApp.java similarity index 100% rename from src/org/ecoinformatics/datamanager/sample/SampleCallingApp.java rename to src/main/java/org/ecoinformatics/datamanager/sample/SampleCallingApp.java diff --git a/src/org/ecoinformatics/datamanager/sample/SampleDataStorage.java b/src/main/java/org/ecoinformatics/datamanager/sample/SampleDataStorage.java similarity index 100% rename from src/org/ecoinformatics/datamanager/sample/SampleDataStorage.java rename to src/main/java/org/ecoinformatics/datamanager/sample/SampleDataStorage.java diff --git a/src/org/ecoinformatics/datamanager/transpose/DataTranspose.java b/src/main/java/org/ecoinformatics/datamanager/transpose/DataTranspose.java similarity index 100% rename from src/org/ecoinformatics/datamanager/transpose/DataTranspose.java rename to src/main/java/org/ecoinformatics/datamanager/transpose/DataTranspose.java diff --git a/src/org/ecoinformatics/datamanager/util/DocumentDownloadUtil.java b/src/main/java/org/ecoinformatics/datamanager/util/DocumentDownloadUtil.java similarity index 100% rename from src/org/ecoinformatics/datamanager/util/DocumentDownloadUtil.java rename to src/main/java/org/ecoinformatics/datamanager/util/DocumentDownloadUtil.java diff --git a/src/org/ecoinformatics/datamanager/util/TableGenerator.java b/src/main/java/org/ecoinformatics/datamanager/util/TableGenerator.java similarity index 100% rename from src/org/ecoinformatics/datamanager/util/TableGenerator.java rename to src/main/java/org/ecoinformatics/datamanager/util/TableGenerator.java diff --git a/src/org/ecoinformatics/eml/EMLParser.java b/src/main/java/org/ecoinformatics/eml/EMLParser.java similarity index 100% rename from src/org/ecoinformatics/eml/EMLParser.java rename to src/main/java/org/ecoinformatics/eml/EMLParser.java diff --git a/src/org/ecoinformatics/eml/EMLParserException.java b/src/main/java/org/ecoinformatics/eml/EMLParserException.java similarity index 100% rename from src/org/ecoinformatics/eml/EMLParserException.java rename to src/main/java/org/ecoinformatics/eml/EMLParserException.java diff --git a/src/org/ecoinformatics/eml/EMLParserServlet.java b/src/main/java/org/ecoinformatics/eml/EMLParserServlet.java similarity index 100% rename from src/org/ecoinformatics/eml/EMLParserServlet.java rename to src/main/java/org/ecoinformatics/eml/EMLParserServlet.java diff --git a/src/org/ecoinformatics/eml/MakeProjectionDictionary.java b/src/main/java/org/ecoinformatics/eml/MakeProjectionDictionary.java similarity index 100% rename from src/org/ecoinformatics/eml/MakeProjectionDictionary.java rename to src/main/java/org/ecoinformatics/eml/MakeProjectionDictionary.java diff --git a/src/org/ecoinformatics/eml/SAXValidate.java b/src/main/java/org/ecoinformatics/eml/SAXValidate.java similarity index 100% rename from src/org/ecoinformatics/eml/SAXValidate.java rename to src/main/java/org/ecoinformatics/eml/SAXValidate.java diff --git a/src/org/ecoinformatics/export/HtmlToPdf.java b/src/main/java/org/ecoinformatics/export/HtmlToPdf.java similarity index 100% rename from src/org/ecoinformatics/export/HtmlToPdf.java rename to src/main/java/org/ecoinformatics/export/HtmlToPdf.java diff --git a/src/datamanager.properties b/src/main/resources/datamanager.properties similarity index 100% rename from src/datamanager.properties rename to src/main/resources/datamanager.properties diff --git a/src/endpoint.properties b/src/main/resources/endpoint.properties similarity index 100% rename from src/endpoint.properties rename to src/main/resources/endpoint.properties diff --git a/src/log4j.properties b/src/main/resources/log4j.properties similarity index 100% rename from src/log4j.properties rename to src/main/resources/log4j.properties diff --git a/test/org/ecoinformatics/datamanager/DataManagerTest.java b/src/test/java/org/ecoinformatics/datamanager/DataManagerTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/DataManagerTest.java rename to src/test/java/org/ecoinformatics/datamanager/DataManagerTest.java diff --git a/test/org/ecoinformatics/datamanager/DataPackagePopulator.java b/src/test/java/org/ecoinformatics/datamanager/DataPackagePopulator.java similarity index 100% rename from test/org/ecoinformatics/datamanager/DataPackagePopulator.java rename to src/test/java/org/ecoinformatics/datamanager/DataPackagePopulator.java diff --git a/test/org/ecoinformatics/datamanager/UnionPerformanceTest.java b/src/test/java/org/ecoinformatics/datamanager/UnionPerformanceTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/UnionPerformanceTest.java rename to src/test/java/org/ecoinformatics/datamanager/UnionPerformanceTest.java diff --git a/test/org/ecoinformatics/datamanager/database/ANDRelationTest.java b/src/test/java/org/ecoinformatics/datamanager/database/ANDRelationTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/ANDRelationTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/ANDRelationTest.java diff --git a/test/org/ecoinformatics/datamanager/database/AggregateQueryTest.java b/src/test/java/org/ecoinformatics/datamanager/database/AggregateQueryTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/AggregateQueryTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/AggregateQueryTest.java diff --git a/test/org/ecoinformatics/datamanager/database/ConditionTest.java b/src/test/java/org/ecoinformatics/datamanager/database/ConditionTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/ConditionTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/ConditionTest.java diff --git a/test/org/ecoinformatics/datamanager/database/DatabaseAdapterTest.java b/src/test/java/org/ecoinformatics/datamanager/database/DatabaseAdapterTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/DatabaseAdapterTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/DatabaseAdapterTest.java diff --git a/test/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterfaceTest.java b/src/test/java/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterfaceTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterfaceTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/DatabaseConnectionPoolInterfaceTest.java diff --git a/test/org/ecoinformatics/datamanager/database/DatabaseHandlerTest.java b/src/test/java/org/ecoinformatics/datamanager/database/DatabaseHandlerTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/DatabaseHandlerTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/DatabaseHandlerTest.java diff --git a/test/org/ecoinformatics/datamanager/database/DatabaseLoaderTest.java b/src/test/java/org/ecoinformatics/datamanager/database/DatabaseLoaderTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/DatabaseLoaderTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/DatabaseLoaderTest.java diff --git a/test/org/ecoinformatics/datamanager/database/HSQLAdapterTest.java b/src/test/java/org/ecoinformatics/datamanager/database/HSQLAdapterTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/HSQLAdapterTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/HSQLAdapterTest.java diff --git a/test/org/ecoinformatics/datamanager/database/JoinTest.java b/src/test/java/org/ecoinformatics/datamanager/database/JoinTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/JoinTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/JoinTest.java diff --git a/test/org/ecoinformatics/datamanager/database/PostgresAdapterTest.java b/src/test/java/org/ecoinformatics/datamanager/database/PostgresAdapterTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/PostgresAdapterTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/PostgresAdapterTest.java diff --git a/test/org/ecoinformatics/datamanager/database/QueryTest.java b/src/test/java/org/ecoinformatics/datamanager/database/QueryTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/QueryTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/QueryTest.java diff --git a/test/org/ecoinformatics/datamanager/database/SelectionItemTest.java b/src/test/java/org/ecoinformatics/datamanager/database/SelectionItemTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/SelectionItemTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/SelectionItemTest.java diff --git a/test/org/ecoinformatics/datamanager/database/SubQueryClauseTest.java b/src/test/java/org/ecoinformatics/datamanager/database/SubQueryClauseTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/SubQueryClauseTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/SubQueryClauseTest.java diff --git a/test/org/ecoinformatics/datamanager/database/TableItemTest.java b/src/test/java/org/ecoinformatics/datamanager/database/TableItemTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/TableItemTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/TableItemTest.java diff --git a/test/org/ecoinformatics/datamanager/database/TableMonitorTest.java b/src/test/java/org/ecoinformatics/datamanager/database/TableMonitorTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/TableMonitorTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/TableMonitorTest.java diff --git a/test/org/ecoinformatics/datamanager/database/UnionTest.java b/src/test/java/org/ecoinformatics/datamanager/database/UnionTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/UnionTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/UnionTest.java diff --git a/test/org/ecoinformatics/datamanager/database/WhereClauseTest.java b/src/test/java/org/ecoinformatics/datamanager/database/WhereClauseTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/database/WhereClauseTest.java rename to src/test/java/org/ecoinformatics/datamanager/database/WhereClauseTest.java diff --git a/test/org/ecoinformatics/datamanager/dataquery/DataquerySpecificationTest.java b/src/test/java/org/ecoinformatics/datamanager/dataquery/DataquerySpecificationTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/dataquery/DataquerySpecificationTest.java rename to src/test/java/org/ecoinformatics/datamanager/dataquery/DataquerySpecificationTest.java diff --git a/test/org/ecoinformatics/datamanager/download/DataStorageTest.java b/src/test/java/org/ecoinformatics/datamanager/download/DataStorageTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/download/DataStorageTest.java rename to src/test/java/org/ecoinformatics/datamanager/download/DataStorageTest.java diff --git a/test/org/ecoinformatics/datamanager/download/DownloadHandlerTest.java b/src/test/java/org/ecoinformatics/datamanager/download/DownloadHandlerTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/download/DownloadHandlerTest.java rename to src/test/java/org/ecoinformatics/datamanager/download/DownloadHandlerTest.java diff --git a/test/org/ecoinformatics/datamanager/download/EcogridEndPointInterfaceTest.java b/src/test/java/org/ecoinformatics/datamanager/download/EcogridEndPointInterfaceTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/download/EcogridEndPointInterfaceTest.java rename to src/test/java/org/ecoinformatics/datamanager/download/EcogridEndPointInterfaceTest.java diff --git a/test/org/ecoinformatics/datamanager/download/GZipDataHandlerTest.java b/src/test/java/org/ecoinformatics/datamanager/download/GZipDataHandlerTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/download/GZipDataHandlerTest.java rename to src/test/java/org/ecoinformatics/datamanager/download/GZipDataHandlerTest.java diff --git a/test/org/ecoinformatics/datamanager/download/TarDataHandlerTest.java b/src/test/java/org/ecoinformatics/datamanager/download/TarDataHandlerTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/download/TarDataHandlerTest.java rename to src/test/java/org/ecoinformatics/datamanager/download/TarDataHandlerTest.java diff --git a/test/org/ecoinformatics/datamanager/download/ZipDataHandlerTest.java b/src/test/java/org/ecoinformatics/datamanager/download/ZipDataHandlerTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/download/ZipDataHandlerTest.java rename to src/test/java/org/ecoinformatics/datamanager/download/ZipDataHandlerTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/AttributeListTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/AttributeListTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/AttributeListTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/AttributeListTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/AttributeTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/AttributeTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/AttributeTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/AttributeTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/DataObjectDescriptionTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/DataObjectDescriptionTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/DataObjectDescriptionTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/DataObjectDescriptionTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/DataPackageTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/DataPackageTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/DataPackageTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/DataPackageTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/DateTimeDomainTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/DateTimeDomainTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/DateTimeDomainTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/DateTimeDomainTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/EntityTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/EntityTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/EntityTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/EntityTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/EnumeratedDomainTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/EnumeratedDomainTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/EnumeratedDomainTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/EnumeratedDomainTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/ForeignKeyTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/ForeignKeyTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/ForeignKeyTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/ForeignKeyTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/JoinConditionConstraintTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/JoinConditionConstraintTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/JoinConditionConstraintTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/JoinConditionConstraintTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/NotNullConstraintTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/NotNullConstraintTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/NotNullConstraintTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/NotNullConstraintTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/NumericDomainTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/NumericDomainTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/NumericDomainTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/NumericDomainTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/PrimaryKeyTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/PrimaryKeyTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/PrimaryKeyTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/PrimaryKeyTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormatTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormatTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormatTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/TextDelimitedDataFormatTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/TextDomainTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/TextDomainTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/TextDomainTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/TextDomainTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormatTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormatTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormatTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/TextWidthFixedDataFormatTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/UniqueKeyTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/UniqueKeyTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/UniqueKeyTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/UniqueKeyTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParserTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParserTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParserTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/document/DocumentDataPackageParserTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/eml/Eml200ParserTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/eml/Eml200ParserTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/eml/Eml200ParserTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/eml/Eml200ParserTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParserTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParserTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParserTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/generic/Eml200DataPackageParserTest.java diff --git a/test/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParserTest.java b/src/test/java/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParserTest.java similarity index 100% rename from test/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParserTest.java rename to src/test/java/org/ecoinformatics/datamanager/parser/generic/GenericDataPackageParserTest.java diff --git a/test/org/ecoinformatics/emltest/EMLParserTest.java b/src/test/java/org/ecoinformatics/emltest/EMLParserTest.java similarity index 100% rename from test/org/ecoinformatics/emltest/EMLParserTest.java rename to src/test/java/org/ecoinformatics/emltest/EMLParserTest.java diff --git a/test/org/ecoinformatics/emltest/SaxValidateTest.java b/src/test/java/org/ecoinformatics/emltest/SaxValidateTest.java similarity index 100% rename from test/org/ecoinformatics/emltest/SaxValidateTest.java rename to src/test/java/org/ecoinformatics/emltest/SaxValidateTest.java diff --git a/test/org/ecoinformatics/export/HtmlToPdfTest.java b/src/test/java/org/ecoinformatics/export/HtmlToPdfTest.java similarity index 100% rename from test/org/ecoinformatics/export/HtmlToPdfTest.java rename to src/test/java/org/ecoinformatics/export/HtmlToPdfTest.java diff --git a/test/citation-sbclter-bibliography.201.xml b/src/test/resources/citation-sbclter-bibliography.201.xml similarity index 100% rename from test/citation-sbclter-bibliography.201.xml rename to src/test/resources/citation-sbclter-bibliography.201.xml diff --git a/test/citation-sbclter-bibliography.202.xml b/src/test/resources/citation-sbclter-bibliography.202.xml similarity index 100% rename from test/citation-sbclter-bibliography.202.xml rename to src/test/resources/citation-sbclter-bibliography.202.xml diff --git a/test/citation-sbclter-bibliography.203.xml b/src/test/resources/citation-sbclter-bibliography.203.xml similarity index 100% rename from test/citation-sbclter-bibliography.203.xml rename to src/test/resources/citation-sbclter-bibliography.203.xml diff --git a/test/citation-sbclter-bibliography.211.xml b/src/test/resources/citation-sbclter-bibliography.211.xml similarity index 100% rename from test/citation-sbclter-bibliography.211.xml rename to src/test/resources/citation-sbclter-bibliography.211.xml diff --git a/test/citation-sbclter-bibliography.231.xml b/src/test/resources/citation-sbclter-bibliography.231.xml similarity index 100% rename from test/citation-sbclter-bibliography.231.xml rename to src/test/resources/citation-sbclter-bibliography.231.xml diff --git a/test/citation-sbclter-bibliography.232.xml b/src/test/resources/citation-sbclter-bibliography.232.xml similarity index 100% rename from test/citation-sbclter-bibliography.232.xml rename to src/test/resources/citation-sbclter-bibliography.232.xml diff --git a/test/citation-sbclter-bibliography.233.xml b/src/test/resources/citation-sbclter-bibliography.233.xml similarity index 100% rename from test/citation-sbclter-bibliography.233.xml rename to src/test/resources/citation-sbclter-bibliography.233.xml diff --git a/test/citation-sbclter-bibliography.279.xml b/src/test/resources/citation-sbclter-bibliography.279.xml similarity index 100% rename from test/citation-sbclter-bibliography.279.xml rename to src/test/resources/citation-sbclter-bibliography.279.xml diff --git a/test/citation-sbclter-bibliography.280.xml b/src/test/resources/citation-sbclter-bibliography.280.xml similarity index 100% rename from test/citation-sbclter-bibliography.280.xml rename to src/test/resources/citation-sbclter-bibliography.280.xml diff --git a/test/citation-sbclter-bibliography.284.xml b/src/test/resources/citation-sbclter-bibliography.284.xml similarity index 100% rename from test/citation-sbclter-bibliography.284.xml rename to src/test/resources/citation-sbclter-bibliography.284.xml diff --git a/test/citation-sbclter-bibliography.285.xml b/src/test/resources/citation-sbclter-bibliography.285.xml similarity index 100% rename from test/citation-sbclter-bibliography.285.xml rename to src/test/resources/citation-sbclter-bibliography.285.xml diff --git a/test/citation-sbclter-bibliography.289.xml b/src/test/resources/citation-sbclter-bibliography.289.xml similarity index 100% rename from test/citation-sbclter-bibliography.289.xml rename to src/test/resources/citation-sbclter-bibliography.289.xml diff --git a/test/citation-sbclter-bibliography.296.xml b/src/test/resources/citation-sbclter-bibliography.296.xml similarity index 100% rename from test/citation-sbclter-bibliography.296.xml rename to src/test/resources/citation-sbclter-bibliography.296.xml diff --git a/test/citation-sbclter-bibliography.297.xml b/src/test/resources/citation-sbclter-bibliography.297.xml similarity index 100% rename from test/citation-sbclter-bibliography.297.xml rename to src/test/resources/citation-sbclter-bibliography.297.xml diff --git a/test/citation-sbclter-bibliography.50.xml b/src/test/resources/citation-sbclter-bibliography.50.xml similarity index 100% rename from test/citation-sbclter-bibliography.50.xml rename to src/test/resources/citation-sbclter-bibliography.50.xml diff --git a/test/citation-sbclter-bibliography.51.xml b/src/test/resources/citation-sbclter-bibliography.51.xml similarity index 100% rename from test/citation-sbclter-bibliography.51.xml rename to src/test/resources/citation-sbclter-bibliography.51.xml diff --git a/test/eml-access.xml b/src/test/resources/eml-access.xml similarity index 100% rename from test/eml-access.xml rename to src/test/resources/eml-access.xml diff --git a/test/eml-attribute.xml b/src/test/resources/eml-attribute.xml similarity index 100% rename from test/eml-attribute.xml rename to src/test/resources/eml-attribute.xml diff --git a/test/eml-citationWithContact.xml b/src/test/resources/eml-citationWithContact.xml similarity index 100% rename from test/eml-citationWithContact.xml rename to src/test/resources/eml-citationWithContact.xml diff --git a/test/eml-citationWithContactReference.xml b/src/test/resources/eml-citationWithContactReference.xml similarity index 100% rename from test/eml-citationWithContactReference.xml rename to src/test/resources/eml-citationWithContactReference.xml diff --git a/test/eml-dataTable.xml b/src/test/resources/eml-dataTable.xml similarity index 100% rename from test/eml-dataTable.xml rename to src/test/resources/eml-dataTable.xml diff --git a/test/eml-dataset.xml b/src/test/resources/eml-dataset.xml similarity index 100% rename from test/eml-dataset.xml rename to src/test/resources/eml-dataset.xml diff --git a/test/eml-datasetGRing.xml b/src/test/resources/eml-datasetGRing.xml similarity index 100% rename from test/eml-datasetGRing.xml rename to src/test/resources/eml-datasetGRing.xml diff --git a/test/eml-datasetGringpoint.xml b/src/test/resources/eml-datasetGringpoint.xml similarity index 100% rename from test/eml-datasetGringpoint.xml rename to src/test/resources/eml-datasetGringpoint.xml diff --git a/test/eml-datasetMultipleDistribution.xml b/src/test/resources/eml-datasetMultipleDistribution.xml similarity index 100% rename from test/eml-datasetMultipleDistribution.xml rename to src/test/resources/eml-datasetMultipleDistribution.xml diff --git a/test/eml-datasetWhitespacePatterns.xml b/src/test/resources/eml-datasetWhitespacePatterns.xml similarity index 100% rename from test/eml-datasetWhitespacePatterns.xml rename to src/test/resources/eml-datasetWhitespacePatterns.xml diff --git a/test/eml-datasetWithAccess.xml b/src/test/resources/eml-datasetWithAccess.xml similarity index 100% rename from test/eml-datasetWithAccess.xml rename to src/test/resources/eml-datasetWithAccess.xml diff --git a/test/eml-datasetWithAccessOverride.xml b/src/test/resources/eml-datasetWithAccessOverride.xml similarity index 100% rename from test/eml-datasetWithAccessOverride.xml rename to src/test/resources/eml-datasetWithAccessOverride.xml diff --git a/test/eml-datasetWithAccessUnitsLiteralLayout.xml b/src/test/resources/eml-datasetWithAccessUnitsLiteralLayout.xml similarity index 100% rename from test/eml-datasetWithAccessUnitsLiteralLayout.xml rename to src/test/resources/eml-datasetWithAccessUnitsLiteralLayout.xml diff --git a/test/eml-datasetWithAttributelevelMethods.xml b/src/test/resources/eml-datasetWithAttributelevelMethods.xml similarity index 100% rename from test/eml-datasetWithAttributelevelMethods.xml rename to src/test/resources/eml-datasetWithAttributelevelMethods.xml diff --git a/test/eml-datasetWithCitation.xml b/src/test/resources/eml-datasetWithCitation.xml similarity index 100% rename from test/eml-datasetWithCitation.xml rename to src/test/resources/eml-datasetWithCitation.xml diff --git a/test/eml-datasetWithNonwordCharacters.xml b/src/test/resources/eml-datasetWithNonwordCharacters.xml similarity index 100% rename from test/eml-datasetWithNonwordCharacters.xml rename to src/test/resources/eml-datasetWithNonwordCharacters.xml diff --git a/test/eml-datasetWithUnits.xml b/src/test/resources/eml-datasetWithUnits.xml similarity index 100% rename from test/eml-datasetWithUnits.xml rename to src/test/resources/eml-datasetWithUnits.xml diff --git a/test/eml-entity.xml b/src/test/resources/eml-entity.xml similarity index 100% rename from test/eml-entity.xml rename to src/test/resources/eml-entity.xml diff --git a/test/eml-i18n.xml b/src/test/resources/eml-i18n.xml similarity index 100% rename from test/eml-i18n.xml rename to src/test/resources/eml-i18n.xml diff --git a/test/eml-inline.xml b/src/test/resources/eml-inline.xml similarity index 100% rename from test/eml-inline.xml rename to src/test/resources/eml-inline.xml diff --git a/test/eml-literature.xml b/src/test/resources/eml-literature.xml similarity index 100% rename from test/eml-literature.xml rename to src/test/resources/eml-literature.xml diff --git a/test/eml-literatureInPress.xml b/src/test/resources/eml-literatureInPress.xml similarity index 100% rename from test/eml-literatureInPress.xml rename to src/test/resources/eml-literatureInPress.xml diff --git a/test/eml-method.xml b/src/test/resources/eml-method.xml similarity index 100% rename from test/eml-method.xml rename to src/test/resources/eml-method.xml diff --git a/test/eml-offline.xml b/src/test/resources/eml-offline.xml similarity index 100% rename from test/eml-offline.xml rename to src/test/resources/eml-offline.xml diff --git a/test/eml-party.xml b/src/test/resources/eml-party.xml similarity index 100% rename from test/eml-party.xml rename to src/test/resources/eml-party.xml diff --git a/test/eml-physical-inline-cdatasection.xml b/src/test/resources/eml-physical-inline-cdatasection.xml similarity index 100% rename from test/eml-physical-inline-cdatasection.xml rename to src/test/resources/eml-physical-inline-cdatasection.xml diff --git a/test/eml-physical-inline.xml b/src/test/resources/eml-physical-inline.xml similarity index 100% rename from test/eml-physical-inline.xml rename to src/test/resources/eml-physical-inline.xml diff --git a/test/eml-physical.xml b/src/test/resources/eml-physical.xml similarity index 100% rename from test/eml-physical.xml rename to src/test/resources/eml-physical.xml diff --git a/test/eml-project.xml b/src/test/resources/eml-project.xml similarity index 100% rename from test/eml-project.xml rename to src/test/resources/eml-project.xml diff --git a/test/eml-protocol.xml b/src/test/resources/eml-protocol.xml similarity index 100% rename from test/eml-protocol.xml rename to src/test/resources/eml-protocol.xml diff --git a/test/eml-sample.xml b/src/test/resources/eml-sample.xml similarity index 100% rename from test/eml-sample.xml rename to src/test/resources/eml-sample.xml diff --git a/test/eml-software.xml b/src/test/resources/eml-software.xml similarity index 100% rename from test/eml-software.xml rename to src/test/resources/eml-software.xml diff --git a/test/eml-softwareWithAcessDistribution.xml b/src/test/resources/eml-softwareWithAcessDistribution.xml similarity index 100% rename from test/eml-softwareWithAcessDistribution.xml rename to src/test/resources/eml-softwareWithAcessDistribution.xml diff --git a/test/eml-spatialVector.xml b/src/test/resources/eml-spatialVector.xml similarity index 100% rename from test/eml-spatialVector.xml rename to src/test/resources/eml-spatialVector.xml diff --git a/test/eml-storedProcedure.xml b/src/test/resources/eml-storedProcedure.xml similarity index 100% rename from test/eml-storedProcedure.xml rename to src/test/resources/eml-storedProcedure.xml diff --git a/test/eml-text.xml b/src/test/resources/eml-text.xml similarity index 100% rename from test/eml-text.xml rename to src/test/resources/eml-text.xml diff --git a/src/test/resources/eml-unitDictionary.xml b/src/test/resources/eml-unitDictionary.xml new file mode 100644 index 00000000..860df07f --- /dev/null +++ b/src/test/resources/eml-unitDictionary.xml @@ -0,0 +1,1057 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a designation asserting the absence of an associated unit + + + + SI unit of time + + + + SI unit of length + + + + SI unit of mass + + + + SI unit of temperature + + + + SI unit of charge + + + + SI unit of electrical current + + + + SI unit of substance amount + + + + SI unit of luminosity + + + + a number + + + + cubic meter + + + + + + one minute excluding leap seconds, 60 seconds + + + one hour excluding leap seconds, 3600 seconds + + + one day excluding leap seconds, 86400 seconds + + + one day excluding leap seconds, 604800 seconds + + + one year excluding leap seconds and leap days, 31536000 seconds + + + one 366 day year excluding leap seconds, 31622400 seconds + + + + + 0.000000000001 kg + + + 0.000000001 kg + + + 0.000001 kg + + + 0.00001 kg + + + 0.0001 kg + + + 0.001 kg + + + .01 kg + + + .1 kg + + + 1000 kg + + + + metric ton or tonne + + + + 1 pound in the Avoirdupois (commerce) scale + + + standard US (short) ton = 2000 lbs + + + + + A common unit of temperature + + + + An obsolescent unit of temperature still used in popular meteorology + + + + + .000000001 meters + + + .000001 meters + + + .000001 meters + + + .001 meters + + + .01 meters + + + .1 meters + + + 10 meters + + + 100 meters + + + 1000 meters + + + 1000000 meters + + + 1/10000000000 meter + + + + An imperial measure of length + + + 12 inches + + + 12 inches + + + 12 inches + + + 6 feet + + + nautical mile + + + 3 feet + + + This is an ESRI unit and the multiplier comes from ESRI. It + may not be accurate. + + + This is an ESRI unit and the multiplier comes from ESRI. It + may not be accurate. + + + This is an ESRI unit and the multiplier comes from ESRI. It + may not be accurate. + + + 5280 ft or 1609.344 meters + + + + + 1/1000000 of a second + + + 1/100000 of a second + + + 1/1000 of a second + + + 1/100 of a second + + + 1/10 of a second + + + 10 seconds + + + 100 seconds + + + 1000 seconds + + + 1000000 seconds + + + 60 seconds + + + 3600 seconds + + + + + 1 cubic meter + + + 1/1000000 of a liter + + + 1/1000 of a liter + + + 1000 cm^3 + + + + US liquid gallon + + + US liquid quart + + + + 1 bushel = 35.23907 liters + + + + cubic inch + + + + US liquid pint + + + + + + 2 pi radians comprise a unit circle. + + + 360 degrees comprise a unit circle + + + a plane angle equivalent to 1/400 of a full circle + + + + + megahertz + + + kilohertz + + + hertz + + + millihertz + + + + + newton + + + + + joule = N*m + + + 1 cal = 4.1868 J + + + 1 btu = 1055.0559 J + + + 1 ft-lbs = 1.355818 J + + + + + lumen + + + + + lux + + + + + becquerel + + + + + gray + + + + + sievert + + + + + katal + + + + + henry + + + + + megawatt + + + kilowatt + + + watt = J/s + + + milliwatt + + + + + megavolt + + + kilovolt + + + volt + + + millivolt + + + + + farad + + + + + ohm + + + + + ohm meters + + + + + siemen + + + + + weber + + + + + tesla + + + + + pascal + + + megapascal + + + kilopascal + + + + 1 atmosphere = 101325 pascals + + + 1 bar = 100000 pascals + + + millibar + + + + + kilograms per square meter + + + grams per square meter + + + milligrams Per Square Meter + + + kilograms per hectare + + + metric ton or tonne per hectare + + + lbs/square inch + + + + + kilogram per cubic meter + + + milligrams per milliliter + + + grams per liter + + + milligrams Per Cubic Meter + + + micrograms / liter + + + milligrams / liter + + + grams per cubic centimeter + + + grams per milliliter + + + + + grams Per (Liter Per Day) + + + + + liters per second + + + cubic meters per second + + + cubic feet per second + + + + + square meters + + + 100 square meters + + + 1 hectare is 10^4 square meters + + + square kilometers + + + square millmeters + + + square centimeters + + + + 1 acre = 4046.8564 square meters or 1 hectare = 2.4710 acres + + + + 12 inches squared + + + 36 inches squared + + + 1 mile squared + + + + + liters per square meter + + + bushels per acre -- 1 bushel = 35.23907 liters/1 acre = 4046.8564 squareMeters + + + liters per hectare + + + + + square meters per kilogram + + + + + meters per second + + + meters per day + + + feet per day + + + feet per second + + + feet per hour + + + yards per second + + + miles per hour + + + miles per second + + + miles per minute + + + centimeters per second + + + millimeters per second + + + centimeter Per Year + + + knots + + + km/hr + + + + + meters per second squared + + + + + 1/meters + + + + + cubic meters per kilogram + + + + cubic micrometers per gram + + + + + ampere per meter squared + + + + + ampere per meter + + + + + mole per cubic meter + + + molarity = moles/liter + + + + + molality = moles/kg + + + + + candela Per Square Meter + + + + + meters squared per second + + + meters squared per day + + + feet squared per day + + + + + kilograms per meter sqared per second + + + grams Per Centimeter Squared Per Second + + + grams Per Meter Squared Per Year + + + grams Per Hectare Squared Per Day + + + kilograms Per Hectare Per Year + + + kilograms Per Meter Squared Per Year + + + + + moles per kilogram + + + moles per gram + + + millimoles per gram + + + + + moles per kilogram per second + + + nanomoles Per Gram Per Second + + + + + kilograms per second + + + tonnes Per Year + + + grams Per Year + + + + + number per meter squared + + + number per kilometer squared + + + + + number per meter cubed + + + + number of entities per liter + + + + number of entities per milliliter + + + + + meters per gram + + + + + number of entities per gram + + + + + grams per gram + + + micrograms per gram + + + + + cubic centimeters per cubic centimeter + + + + + diff --git a/test/eml-view.xml b/src/test/resources/eml-view.xml similarity index 100% rename from test/eml-view.xml rename to src/test/resources/eml-view.xml diff --git a/test/eml.xml b/src/test/resources/eml.xml similarity index 100% rename from test/eml.xml rename to src/test/resources/eml.xml diff --git a/test/invalidEML/eml-datasetInvalidGringpoint.xml b/src/test/resources/invalidEML/eml-datasetInvalidGringpoint.xml similarity index 100% rename from test/invalidEML/eml-datasetInvalidGringpoint.xml rename to src/test/resources/invalidEML/eml-datasetInvalidGringpoint.xml diff --git a/test/invalidEML/eml-error-references.xml b/src/test/resources/invalidEML/eml-error-references.xml similarity index 100% rename from test/invalidEML/eml-error-references.xml rename to src/test/resources/invalidEML/eml-error-references.xml diff --git a/test/invalidEML/eml-error1.xml b/src/test/resources/invalidEML/eml-error1.xml similarity index 100% rename from test/invalidEML/eml-error1.xml rename to src/test/resources/invalidEML/eml-error1.xml diff --git a/test/invalidEML/eml-error3.xml b/src/test/resources/invalidEML/eml-error3.xml similarity index 100% rename from test/invalidEML/eml-error3.xml rename to src/test/resources/invalidEML/eml-error3.xml diff --git a/test/invalidEML/eml-error4.xml b/src/test/resources/invalidEML/eml-error4.xml similarity index 100% rename from test/invalidEML/eml-error4.xml rename to src/test/resources/invalidEML/eml-error4.xml diff --git a/test/sampleLTERIntellectualRights.xml b/src/test/resources/sampleLTERIntellectualRights.xml similarity index 100% rename from test/sampleLTERIntellectualRights.xml rename to src/test/resources/sampleLTERIntellectualRights.xml diff --git a/test/stmml_dictionaryWithDefintion.xml b/src/test/resources/stmml_dictionaryWithDefintion.xml similarity index 100% rename from test/stmml_dictionaryWithDefintion.xml rename to src/test/resources/stmml_dictionaryWithDefintion.xml diff --git a/test/test2008.cdr958608.1.xml b/src/test/resources/test2008.cdr958608.1.xml similarity index 100% rename from test/test2008.cdr958608.1.xml rename to src/test/resources/test2008.cdr958608.1.xml