From 4cd19c33a00887534ae27be6b81972bdbf87aad5 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Mon, 22 Jul 2013 14:52:10 +0000
Subject: [PATCH] Refactored the filename and aggregation stuff to more
appropriate packages
git-svn-id: https://develop.sub.uni-goettingen.de/repos/textgrid/trunk/services/aggregator@14306 7c539038-3410-0410-b1ec-0f2a7bf1c452
---
pom.xml | 2 +-
.../textgrid/services/aggregator/epub/EPUB.java | 2 +-
.../aggregator/tree/AggregationTreeFactory.java | 4 +++-
.../info/textgrid/services/aggregator/zip/ZIP.java | 2 +-
.../services/aggregator/zip/ZipResult.java | 14 +++++++-------
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2c9bc6d..a2f04a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<properties>
<commons-io-version>2.4</commons-io-version>
- <link-rewriter-version>0.2.0-SNAPSHOT</link-rewriter-version>
+ <link-rewriter-version>0.2.1-SNAPSHOT</link-rewriter-version>
<saxon-version>9.4.0.7</saxon-version>
<cxf-version>2.7.4</cxf-version>
<confclient-version>1.0-SNAPSHOT</confclient-version>
diff --git a/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java b/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
index ea42ef7..5aac6e4 100644
--- a/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
+++ b/src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
@@ -12,7 +12,7 @@
import info.textgrid.services.aggregator.RESTUtils;
import info.textgrid.services.aggregator.TextGridRepProvider;
import info.textgrid.services.aggregator.teicorpus.TEICorpusSerializer;
-import info.textgrid.services.aggregator.tree.DefaultFilenamePolicy;
+import info.textgrid.utils.export.filenames.DefaultFilenamePolicy;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java b/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java
index b85e56d..c3233f8 100644
--- a/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java
+++ b/src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java
@@ -7,6 +7,8 @@
import info.textgrid.namespaces.middleware.tgcrud.services.tgcrudservice.ObjectNotFoundFault;
import info.textgrid.services.aggregator.AggregationTreeWalker;
import info.textgrid.services.aggregator.ITextGridRep;
+import info.textgrid.utils.export.aggregations.Aggregation;
+import info.textgrid.utils.export.aggregations.AggregationEntry;
import java.util.Deque;
import java.util.logging.Level;
@@ -19,7 +21,7 @@ public class AggregationTreeFactory extends AggregationTreeWalker {
private final Deque<Aggregation> stack = Lists.newLinkedList();
private Aggregation root;
- private static Logger logger = Logger.getLogger("info.textgrid.services.aggregator.tree");
+ private static Logger logger = Logger.getLogger("info.textgrid.utils.export.aggregations");
protected AggregationTreeFactory(final ObjectType root, final ITextGridRep repository, final String sid) {
super();
diff --git a/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java b/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java
index 82fa02a..b371ca6 100644
--- a/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java
+++ b/src/main/java/info/textgrid/services/aggregator/zip/ZIP.java
@@ -9,7 +9,7 @@
import info.textgrid.namespaces.middleware.tgcrud.services.tgcrudservice.TGCrudService;
import info.textgrid.services.aggregator.ITextGridRep;
import info.textgrid.services.aggregator.RESTUtils;
-import info.textgrid.services.aggregator.tree.DefaultFilenamePolicy;
+import info.textgrid.utils.export.filenames.DefaultFilenamePolicy;
import java.net.URI;
import java.text.MessageFormat;
diff --git a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
index ff5e993..a96103a 100644
--- a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
+++ b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
@@ -4,14 +4,14 @@
import info.textgrid._import.RewriteMethod;
import info.textgrid.namespaces.metadata.core._2010.ObjectType;
import info.textgrid.services.aggregator.ITextGridRep;
-import info.textgrid.services.aggregator.tree.Aggregation;
-import info.textgrid.services.aggregator.tree.AggregationEntry;
import info.textgrid.services.aggregator.tree.AggregationTreeFactory;
-import info.textgrid.services.aggregator.tree.DefaultFilenamePolicy;
-import info.textgrid.services.aggregator.tree.DefaultMetaFilenamePolicy;
-import info.textgrid.services.aggregator.tree.IAggregation;
-import info.textgrid.services.aggregator.tree.IAggregationEntry;
-import info.textgrid.services.aggregator.tree.IFilenamePolicy;
+import info.textgrid.utils.export.aggregations.Aggregation;
+import info.textgrid.utils.export.aggregations.AggregationEntry;
+import info.textgrid.utils.export.aggregations.IAggregation;
+import info.textgrid.utils.export.aggregations.IAggregationEntry;
+import info.textgrid.utils.export.filenames.DefaultFilenamePolicy;
+import info.textgrid.utils.export.filenames.DefaultMetaFilenamePolicy;
+import info.textgrid.utils.export.filenames.IFilenamePolicy;
import info.textgrid.utils.linkrewriter.ConfigurableXMLRewriter;
import info.textgrid.utils.linkrewriter.ImportMapping;
--
GitLab