Commit bf2666449638b3cdb0b62fadb5625e357a0db221

Authored by Richard Eckart de Castilho
1 parent b405b168

Move towards standard Maven directory layout:

- move Java production sources to src/main/java
- move Java test sources to src/test/java
- move test data to src/test/resources (and adjust unit tests to read the data from there)
- left JavaCC source files inside the Java source tree for the time being (src/main/java)
- left the production resources at their present location for the moment, need to understand better how they are processed
Showing 191 changed files with 1718 additions and 1717 deletions

Too many changes to show.

To preserve performance only 100 of 191 files are displayed.

... ... @@ -35,8 +35,6 @@
35 35 </developer>
36 36 </developers>
37 37 <build>
38   - <sourceDirectory>src</sourceDirectory>
39   - <testSourceDirectory>junit</testSourceDirectory>
40 38 <resources>
41 39 <resource>
42 40 <directory>src/docker</directory>
... ... @@ -102,7 +100,7 @@
102 100 <jdkVersion>1.5</jdkVersion>
103 101 <javadocFriendlyComments>true</javadocFriendlyComments>
104 102 <packageName>mtas.parser.cql</packageName>
105   - <sourceDirectory>${project.basedir}/src/mtas/parser/cql</sourceDirectory>
  103 + <sourceDirectory>${project.basedir}/src/main/java/mtas/parser/cql</sourceDirectory>
106 104 </configuration>
107 105 </execution>
108 106 <execution>
... ... @@ -115,7 +113,7 @@
115 113 <jdkVersion>1.5</jdkVersion>
116 114 <javadocFriendlyComments>true</javadocFriendlyComments>
117 115 <packageName>mtas.parser.function</packageName>
118   - <sourceDirectory>${project.basedir}/src/mtas/parser/function/</sourceDirectory>
  116 + <sourceDirectory>${project.basedir}/src/main/java/mtas/parser/function/</sourceDirectory>
119 117 </configuration>
120 118 </execution>
121 119 </executions>
... ...
src/mtas/analysis/MtasTokenizer.java renamed to src/main/java/mtas/analysis/MtasTokenizer.java
src/mtas/analysis/parser/MtasBasicParser.java renamed to src/main/java/mtas/analysis/parser/MtasBasicParser.java
src/mtas/analysis/parser/MtasCRMParser.java renamed to src/main/java/mtas/analysis/parser/MtasCRMParser.java
src/mtas/analysis/parser/MtasChatParser.java renamed to src/main/java/mtas/analysis/parser/MtasChatParser.java
src/mtas/analysis/parser/MtasElanParser.java renamed to src/main/java/mtas/analysis/parser/MtasElanParser.java
src/mtas/analysis/parser/MtasFoliaParser.java renamed to src/main/java/mtas/analysis/parser/MtasFoliaParser.java
src/mtas/analysis/parser/MtasParser.java renamed to src/main/java/mtas/analysis/parser/MtasParser.java
src/mtas/analysis/parser/MtasSketchParser.java renamed to src/main/java/mtas/analysis/parser/MtasSketchParser.java
src/mtas/analysis/parser/MtasTEIParser.java renamed to src/main/java/mtas/analysis/parser/MtasTEIParser.java
src/mtas/analysis/parser/MtasXMLParser.java renamed to src/main/java/mtas/analysis/parser/MtasXMLParser.java
src/mtas/analysis/token/MtasOffset.java renamed to src/main/java/mtas/analysis/token/MtasOffset.java
src/mtas/analysis/token/MtasPosition.java renamed to src/main/java/mtas/analysis/token/MtasPosition.java
src/mtas/analysis/token/MtasToken.java renamed to src/main/java/mtas/analysis/token/MtasToken.java
src/mtas/analysis/token/MtasTokenCollection.java renamed to src/main/java/mtas/analysis/token/MtasTokenCollection.java
src/mtas/analysis/token/MtasTokenIdFactory.java renamed to src/main/java/mtas/analysis/token/MtasTokenIdFactory.java
src/mtas/analysis/token/MtasTokenString.java renamed to src/main/java/mtas/analysis/token/MtasTokenString.java
src/mtas/analysis/util/MtasBufferedReader.java renamed to src/main/java/mtas/analysis/util/MtasBufferedReader.java
src/mtas/analysis/util/MtasCharFilterFactory.java renamed to src/main/java/mtas/analysis/util/MtasCharFilterFactory.java
src/mtas/analysis/util/MtasConfigException.java renamed to src/main/java/mtas/analysis/util/MtasConfigException.java
src/mtas/analysis/util/MtasConfiguration.java renamed to src/main/java/mtas/analysis/util/MtasConfiguration.java
src/mtas/analysis/util/MtasFetchData.java renamed to src/main/java/mtas/analysis/util/MtasFetchData.java
src/mtas/analysis/util/MtasParserException.java renamed to src/main/java/mtas/analysis/util/MtasParserException.java
src/mtas/analysis/util/MtasPrefixTokenFilterFactory.java renamed to src/main/java/mtas/analysis/util/MtasPrefixTokenFilterFactory.java
src/mtas/analysis/util/MtasTokenizerFactory.java renamed to src/main/java/mtas/analysis/util/MtasTokenizerFactory.java
src/mtas/codec/MtasCodec.java renamed to src/main/java/mtas/codec/MtasCodec.java
src/mtas/codec/MtasCodecPostingsFormat.java renamed to src/main/java/mtas/codec/MtasCodecPostingsFormat.java
src/mtas/codec/MtasFieldsConsumer.java renamed to src/main/java/mtas/codec/MtasFieldsConsumer.java
src/mtas/codec/MtasFieldsProducer.java renamed to src/main/java/mtas/codec/MtasFieldsProducer.java
src/mtas/codec/MtasSimpleTextCodec.java renamed to src/main/java/mtas/codec/MtasSimpleTextCodec.java
src/mtas/codec/MtasTerms.java renamed to src/main/java/mtas/codec/MtasTerms.java
src/mtas/codec/payload/MtasBitInputStream.java renamed to src/main/java/mtas/codec/payload/MtasBitInputStream.java
src/mtas/codec/payload/MtasBitOutputStream.java renamed to src/main/java/mtas/codec/payload/MtasBitOutputStream.java
src/mtas/codec/payload/MtasPayloadDecoder.java renamed to src/main/java/mtas/codec/payload/MtasPayloadDecoder.java
src/mtas/codec/payload/MtasPayloadEncoder.java renamed to src/main/java/mtas/codec/payload/MtasPayloadEncoder.java
src/mtas/codec/tree/IntervalRBTree.java renamed to src/main/java/mtas/codec/tree/IntervalRBTree.java
src/mtas/codec/tree/IntervalRBTreeNode.java renamed to src/main/java/mtas/codec/tree/IntervalRBTreeNode.java
src/mtas/codec/tree/IntervalTree.java renamed to src/main/java/mtas/codec/tree/IntervalTree.java
src/mtas/codec/tree/IntervalTreeNode.java renamed to src/main/java/mtas/codec/tree/IntervalTreeNode.java
src/mtas/codec/tree/IntervalTreeNodeData.java renamed to src/main/java/mtas/codec/tree/IntervalTreeNodeData.java
src/mtas/codec/tree/MtasRBTree.java renamed to src/main/java/mtas/codec/tree/MtasRBTree.java
src/mtas/codec/tree/MtasRBTreeNode.java renamed to src/main/java/mtas/codec/tree/MtasRBTreeNode.java
src/mtas/codec/tree/MtasTree.java renamed to src/main/java/mtas/codec/tree/MtasTree.java
src/mtas/codec/tree/MtasTreeNode.java renamed to src/main/java/mtas/codec/tree/MtasTreeNode.java
src/mtas/codec/tree/MtasTreeNodeId.java renamed to src/main/java/mtas/codec/tree/MtasTreeNodeId.java
src/mtas/codec/util/CodecCollector.java renamed to src/main/java/mtas/codec/util/CodecCollector.java
src/mtas/codec/util/CodecComponent.java renamed to src/main/java/mtas/codec/util/CodecComponent.java
src/mtas/codec/util/CodecInfo.java renamed to src/main/java/mtas/codec/util/CodecInfo.java
src/mtas/codec/util/CodecSearchTree.java renamed to src/main/java/mtas/codec/util/CodecSearchTree.java
src/mtas/codec/util/CodecUtil.java renamed to src/main/java/mtas/codec/util/CodecUtil.java
src/mtas/codec/util/DataCollector.java renamed to src/main/java/mtas/codec/util/DataCollector.java
src/mtas/codec/util/collector/MtasDataAdvanced.java renamed to src/main/java/mtas/codec/util/collector/MtasDataAdvanced.java
src/mtas/codec/util/collector/MtasDataBasic.java renamed to src/main/java/mtas/codec/util/collector/MtasDataBasic.java
src/mtas/codec/util/collector/MtasDataCollector.java renamed to src/main/java/mtas/codec/util/collector/MtasDataCollector.java
src/mtas/codec/util/collector/MtasDataCollectorResult.java renamed to src/main/java/mtas/codec/util/collector/MtasDataCollectorResult.java
src/mtas/codec/util/collector/MtasDataDoubleAdvanced.java renamed to src/main/java/mtas/codec/util/collector/MtasDataDoubleAdvanced.java
src/mtas/codec/util/collector/MtasDataDoubleBasic.java renamed to src/main/java/mtas/codec/util/collector/MtasDataDoubleBasic.java
src/mtas/codec/util/collector/MtasDataDoubleFull.java renamed to src/main/java/mtas/codec/util/collector/MtasDataDoubleFull.java
src/mtas/codec/util/collector/MtasDataDoubleOperations.java renamed to src/main/java/mtas/codec/util/collector/MtasDataDoubleOperations.java
src/mtas/codec/util/collector/MtasDataFull.java renamed to src/main/java/mtas/codec/util/collector/MtasDataFull.java
src/mtas/codec/util/collector/MtasDataItem.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItem.java
src/mtas/codec/util/collector/MtasDataItemAdvanced.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemAdvanced.java
src/mtas/codec/util/collector/MtasDataItemBasic.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemBasic.java
src/mtas/codec/util/collector/MtasDataItemDoubleAdvanced.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemDoubleAdvanced.java
src/mtas/codec/util/collector/MtasDataItemDoubleBasic.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemDoubleBasic.java
src/mtas/codec/util/collector/MtasDataItemDoubleFull.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemDoubleFull.java
src/mtas/codec/util/collector/MtasDataItemFull.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemFull.java
src/mtas/codec/util/collector/MtasDataItemLongAdvanced.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemLongAdvanced.java
src/mtas/codec/util/collector/MtasDataItemLongBasic.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemLongBasic.java
src/mtas/codec/util/collector/MtasDataItemLongFull.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemLongFull.java
src/mtas/codec/util/collector/MtasDataItemNumberComparator.java renamed to src/main/java/mtas/codec/util/collector/MtasDataItemNumberComparator.java
src/mtas/codec/util/collector/MtasDataLongAdvanced.java renamed to src/main/java/mtas/codec/util/collector/MtasDataLongAdvanced.java
src/mtas/codec/util/collector/MtasDataLongBasic.java renamed to src/main/java/mtas/codec/util/collector/MtasDataLongBasic.java
src/mtas/codec/util/collector/MtasDataLongFull.java renamed to src/main/java/mtas/codec/util/collector/MtasDataLongFull.java
src/mtas/codec/util/collector/MtasDataLongOperations.java renamed to src/main/java/mtas/codec/util/collector/MtasDataLongOperations.java
src/mtas/codec/util/collector/MtasDataOperations.java renamed to src/main/java/mtas/codec/util/collector/MtasDataOperations.java
src/mtas/parser/cql/MtasCQLParser.jj renamed to src/main/java/mtas/parser/cql/MtasCQLParser.jj
src/mtas/parser/cql/util/MtasCQLParserBasicSentenceCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserBasicSentenceCondition.java
src/mtas/parser/cql/util/MtasCQLParserBasicSentencePartCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserBasicSentencePartCondition.java
src/mtas/parser/cql/util/MtasCQLParserDefaultPrefixCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserDefaultPrefixCondition.java
src/mtas/parser/cql/util/MtasCQLParserGroupCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserGroupCondition.java
src/mtas/parser/cql/util/MtasCQLParserGroupFullCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserGroupFullCondition.java
src/mtas/parser/cql/util/MtasCQLParserGroupQuery.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserGroupQuery.java
src/mtas/parser/cql/util/MtasCQLParserSentenceCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserSentenceCondition.java
src/mtas/parser/cql/util/MtasCQLParserSentencePartCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserSentencePartCondition.java
src/mtas/parser/cql/util/MtasCQLParserWordCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserWordCondition.java
src/mtas/parser/cql/util/MtasCQLParserWordFullCondition.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserWordFullCondition.java
src/mtas/parser/cql/util/MtasCQLParserWordPositionQuery.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserWordPositionQuery.java
src/mtas/parser/cql/util/MtasCQLParserWordQuery.java renamed to src/main/java/mtas/parser/cql/util/MtasCQLParserWordQuery.java
src/mtas/parser/function/MtasFunctionParser.jj renamed to src/main/java/mtas/parser/function/MtasFunctionParser.jj
src/mtas/parser/function/util/MtasFunctionParserFunction.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserFunction.java
src/mtas/parser/function/util/MtasFunctionParserFunctionBasic.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserFunctionBasic.java
src/mtas/parser/function/util/MtasFunctionParserFunctionDefault.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserFunctionDefault.java
src/mtas/parser/function/util/MtasFunctionParserFunctionResponse.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserFunctionResponse.java
src/mtas/parser/function/util/MtasFunctionParserFunctionResponseDouble.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserFunctionResponseDouble.java
src/mtas/parser/function/util/MtasFunctionParserFunctionResponseLong.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserFunctionResponseLong.java
src/mtas/parser/function/util/MtasFunctionParserItem.java renamed to src/main/java/mtas/parser/function/util/MtasFunctionParserItem.java
src/mtas/queries/MtasScoreProvider.java renamed to src/main/java/mtas/queries/MtasScoreProvider.java
src/mtas/queries/MtasScoreQuery.java renamed to src/main/java/mtas/queries/MtasScoreQuery.java
src/mtas/search/MtasCollector.java renamed to src/main/java/mtas/search/MtasCollector.java