Skip to content

Commit b53376d

Browse files
tballisontballison
committed
move tika-pipes out of core
1 parent c52830c commit b53376d

217 files changed

Lines changed: 779 additions & 661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tika-app/src/test/java/org/apache/tika/cli/TikaCLIAsyncTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ public class TikaCLIAsyncTest {
5353
public static void setUpClass() throws Exception {
5454
ASYNC_CONFIG = Files.createTempFile(ASYNC_OUTPUT_DIR, "async-config-", ".xml");
5555
String xml = "<properties>" + "<async>" + "<numClients>3</numClients>" + "<tikaConfig>" + ASYNC_CONFIG.toAbsolutePath() + "</tikaConfig>" + "</async>" + "<fetchers>" +
56-
"<fetcher class=\"org.apache.tika.pipes.fetcher.fs.FileSystemFetcher\">" + "<name>fsf</name>" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() + "</basePath>" +
57-
"</fetcher>" + "</fetchers>" + "<emitters>" + "<emitter class=\"org.apache.tika.pipes.emitter.fs.FileSystemEmitter\">" + "<name>fse</name>" + "<basePath>" +
56+
"<fetcher class=\"org.apache.tika.pipes.core.fetcher.fs.FileSystemFetcher\">" + "<name>fsf</name>" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() +
57+
"</basePath>" +
58+
"</fetcher>" + "</fetchers>" + "<emitters>" + "<emitter class=\"org.apache.tika.pipes.core.emitter.fs.FileSystemEmitter\">" + "<name>fse</name>" + "<basePath>" +
5859
ASYNC_OUTPUT_DIR.toAbsolutePath() + "</basePath>" + "<prettyPrint>true</prettyPrint>" + "</emitter>" + "</emitters>" +
59-
"<pipesIterator class=\"org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator\">" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() + "</basePath>" +
60+
"<pipesIterator class=\"org.apache.tika.pipes.core.pipesiterator.fs.FileSystemPipesIterator\">" + "<basePath>" + TEST_DATA_FILE.getAbsolutePath() + "</basePath>" +
6061
"<fetcherName>fsf</fetcherName>" + "<emitterName>fse</emitterName>" + "</pipesIterator>" + "</properties>";
6162
Files.write(ASYNC_CONFIG, xml.getBytes(UTF_8));
6263
}

‎tika-eval/tika-eval-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependencies>
3333
<dependency>
3434
<groupId>org.apache.tika</groupId>
35-
<artifactId>tika-core</artifactId>
35+
<artifactId>tika-pipes-core</artifactId>
3636
<version>${project.version}</version>
3737
</dependency>
3838
<dependency>

‎tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.apache.tika.eval.core.util.ContentTags;
4444
import org.apache.tika.metadata.Metadata;
4545
import org.apache.tika.metadata.TikaCoreProperties;
46-
import org.apache.tika.pipes.fetcher.FetchKey;
46+
import org.apache.tika.pipes.core.fetcher.FetchKey;
4747

4848
public class ExtractComparer extends ProfilerBase {
4949

‎tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
import org.apache.tika.eval.app.io.ExtractReader;
5656
import org.apache.tika.eval.app.io.ExtractReaderException;
5757
import org.apache.tika.eval.app.io.IDBWriter;
58-
import org.apache.tika.pipes.FetchEmitTuple;
59-
import org.apache.tika.pipes.pipesiterator.CallablePipesIterator;
60-
import org.apache.tika.pipes.pipesiterator.PipesIterator;
61-
import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
58+
import org.apache.tika.pipes.core.FetchEmitTuple;
59+
import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
60+
import org.apache.tika.pipes.core.pipesiterator.PipesIterator;
61+
import org.apache.tika.pipes.core.pipesiterator.fs.FileSystemPipesIterator;
6262

6363
public class ExtractComparerRunner {
6464

‎tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
import org.apache.tika.eval.app.io.ExtractReader;
5656
import org.apache.tika.eval.app.io.ExtractReaderException;
5757
import org.apache.tika.eval.app.io.IDBWriter;
58-
import org.apache.tika.pipes.FetchEmitTuple;
59-
import org.apache.tika.pipes.pipesiterator.CallablePipesIterator;
60-
import org.apache.tika.pipes.pipesiterator.PipesIterator;
61-
import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
58+
import org.apache.tika.pipes.core.FetchEmitTuple;
59+
import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
60+
import org.apache.tika.pipes.core.pipesiterator.PipesIterator;
61+
import org.apache.tika.pipes.core.pipesiterator.fs.FileSystemPipesIterator;
6262

6363
public class ExtractProfileRunner {
6464

‎tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfiler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.apache.tika.eval.core.util.ContentTags;
3535
import org.apache.tika.metadata.Metadata;
3636
import org.apache.tika.metadata.TikaCoreProperties;
37-
import org.apache.tika.pipes.fetcher.FetchKey;
37+
import org.apache.tika.pipes.core.fetcher.FetchKey;
3838

3939
public class ExtractProfiler extends ProfilerBase {
4040

‎tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ProfilerBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import org.apache.tika.metadata.PagedText;
7272
import org.apache.tika.metadata.Property;
7373
import org.apache.tika.metadata.TikaCoreProperties;
74-
import org.apache.tika.pipes.fetcher.FetchKey;
74+
import org.apache.tika.pipes.core.fetcher.FetchKey;
7575
import org.apache.tika.sax.ToXMLContentHandler;
7676
import org.apache.tika.utils.StringUtils;
7777

‎tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/StatusReporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
2727

28-
import org.apache.tika.pipes.pipesiterator.CallablePipesIterator;
28+
import org.apache.tika.pipes.core.pipesiterator.CallablePipesIterator;
2929
import org.apache.tika.utils.DurationFormatUtils;
3030

3131
public class StatusReporter implements Callable<Long> {

‎tika-fuzzing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependencies>
3636
<dependency>
3737
<groupId>${project.groupId}</groupId>
38-
<artifactId>tika-core</artifactId>
38+
<artifactId>tika-pipes-core</artifactId>
3939
<version>${project.version}</version>
4040
<scope>provided</scope>
4141
</dependency>

‎tika-fuzzing/src/main/java/org/apache/tika/fuzzing/cli/FuzzingCLI.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
import org.apache.tika.fuzzing.general.GeneralTransformer;
4747
import org.apache.tika.fuzzing.general.SpanSwapper;
4848
import org.apache.tika.fuzzing.general.Truncator;
49-
import org.apache.tika.pipes.FetchEmitTuple;
50-
import org.apache.tika.pipes.PipesConfig;
51-
import org.apache.tika.pipes.PipesParser;
52-
import org.apache.tika.pipes.PipesResult;
53-
import org.apache.tika.pipes.emitter.EmitKey;
54-
import org.apache.tika.pipes.fetcher.FetchKey;
55-
import org.apache.tika.pipes.fetcher.FetcherManager;
56-
import org.apache.tika.pipes.pipesiterator.PipesIterator;
49+
import org.apache.tika.pipes.core.FetchEmitTuple;
50+
import org.apache.tika.pipes.core.PipesConfig;
51+
import org.apache.tika.pipes.core.PipesParser;
52+
import org.apache.tika.pipes.core.PipesResult;
53+
import org.apache.tika.pipes.core.emitter.EmitKey;
54+
import org.apache.tika.pipes.core.fetcher.FetchKey;
55+
import org.apache.tika.pipes.core.fetcher.FetcherManager;
56+
import org.apache.tika.pipes.core.pipesiterator.PipesIterator;
5757

5858
public class FuzzingCLI {
5959

0 commit comments

Comments
 (0)