You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2024/07/10 14:17:37 UTC
(tika) branch tika-grpc-mv-take3 created (now 8a06ffa5d)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch tika-grpc-mv-take3
in repository https://gitbox.apache.org/repos/asf/tika.git
at 8a06ffa5d merge TIKA-4181 and mv tika-grpc to higher level module
This branch includes the following new commits:
new 2c69e2956 Merge remote-tracking branch 'origin/TIKA-4181-grpc'
new 8a06ffa5d merge TIKA-4181 and mv tika-grpc to higher level module
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(tika) 02/02: merge TIKA-4181 and mv tika-grpc to higher level module
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch tika-grpc-mv-take3
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 8a06ffa5d50509fc21d655011bddb7fa08739aac
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 10 10:17:20 2024 -0400
merge TIKA-4181 and mv tika-grpc to higher level module
---
pom.xml | 1 +
.../tika-server-grpc => tika-grpc}/README.md | 0
.../tika-server-grpc => tika-grpc}/pom.xml | 37 +++++++++++++++++++--
.../tika/pipes/grpc/ExpiringFetcherStore.java | 0
.../org/apache/tika/pipes/grpc/TikaGrpcServer.java | 0
.../apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 0
.../grpc/exception/FetcherNotFoundException.java | 0
.../src/main/proto/tika.proto | 0
.../src/main/resources/log4j2.xml | 0
.../tika/pipes/grpc/ExpiringFetcherStoreTest.java | 0
...PipesBiDirectionalStreamingIntegrationTest.java | 0
.../apache/tika/pipes/grpc/TikaGrpcServerTest.java | 0
.../src/test/resources/certs/README.md | 0
.../src/test/resources/certs/ca.key | 0
.../src/test/resources/certs/ca.pem | 0
.../src/test/resources/certs/client.key | 0
.../src/test/resources/certs/client.pem | 0
.../src/test/resources/certs/server1.key | 0
.../src/test/resources/certs/server1.pem | 0
.../src/test/resources/log4j2.xml | 0
.../src/test/resources/test-files/014760.docx | Bin
.../src/test/resources/test-files/017091.docx | Bin
.../src/test/resources/test-files/017097.docx | Bin
.../src/test/resources/test-files/018367.docx | Bin
.../src/test/resources/tika-pipes-test-config.xml | 0
tika-server/pom.xml | 1 -
26 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index dd5706296..42b28477f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
<module>tika-batch</module>
<module>tika-langdetect</module>
<module>tika-pipes</module>
+ <module>tika-grpc</module>
<module>tika-app</module>
<module>tika-server</module>
<module>tika-integration-tests</module>
diff --git a/tika-server/tika-server-grpc/README.md b/tika-grpc/README.md
similarity index 100%
rename from tika-server/tika-server-grpc/README.md
rename to tika-grpc/README.md
diff --git a/tika-server/tika-server-grpc/pom.xml b/tika-grpc/pom.xml
similarity index 90%
rename from tika-server/tika-server-grpc/pom.xml
rename to tika-grpc/pom.xml
index 4967eb95d..1749ba167 100644
--- a/tika-server/tika-server-grpc/pom.xml
+++ b/tika-grpc/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>tika-server-grpc</artifactId>
+ <artifactId>tika-grpc</artifactId>
<packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. -->
@@ -28,9 +28,10 @@
<url>https://tika.apache.org/</url>
<parent>
- <artifactId>tika-server</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../tika-parent/pom.xml</relativePath>
</parent>
<properties>
@@ -413,6 +414,38 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${puppycrawl.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>checkstyle.xml</configLocation>
+ <inputEncoding>UTF-8</inputEncoding>
+ <consoleOutput>true</consoleOutput>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <testSourceDirectories>${project.basedir}/src/test/java</testSourceDirectories>
+ <violationSeverity>error</violationSeverity>
+ <failOnViolation>true</failOnViolation>
+ <excludeGeneratedSources>true</excludeGeneratedSources>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java
rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/ExpiringFetcherStore.java
diff --git a/tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java
rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServer.java
diff --git a/tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java
diff --git a/tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java b/tika-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java
rename to tika-grpc/src/main/java/org/apache/tika/pipes/grpc/exception/FetcherNotFoundException.java
diff --git a/tika-server/tika-server-grpc/src/main/proto/tika.proto b/tika-grpc/src/main/proto/tika.proto
similarity index 100%
rename from tika-server/tika-server-grpc/src/main/proto/tika.proto
rename to tika-grpc/src/main/proto/tika.proto
diff --git a/tika-server/tika-server-grpc/src/main/resources/log4j2.xml b/tika-grpc/src/main/resources/log4j2.xml
similarity index 100%
rename from tika-server/tika-server-grpc/src/main/resources/log4j2.xml
rename to tika-grpc/src/main/resources/log4j2.xml
diff --git a/tika-server/tika-server-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java b/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java
rename to tika-grpc/src/test/java/org/apache/tika/pipes/grpc/ExpiringFetcherStoreTest.java
diff --git a/tika-server/tika-server-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java b/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java
rename to tika-grpc/src/test/java/org/apache/tika/pipes/grpc/PipesBiDirectionalStreamingIntegrationTest.java
diff --git a/tika-server/tika-server-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java b/tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java
rename to tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/README.md b/tika-grpc/src/test/resources/certs/README.md
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/README.md
rename to tika-grpc/src/test/resources/certs/README.md
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/ca.key b/tika-grpc/src/test/resources/certs/ca.key
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/ca.key
rename to tika-grpc/src/test/resources/certs/ca.key
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/ca.pem b/tika-grpc/src/test/resources/certs/ca.pem
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/ca.pem
rename to tika-grpc/src/test/resources/certs/ca.pem
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/client.key b/tika-grpc/src/test/resources/certs/client.key
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/client.key
rename to tika-grpc/src/test/resources/certs/client.key
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/client.pem b/tika-grpc/src/test/resources/certs/client.pem
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/client.pem
rename to tika-grpc/src/test/resources/certs/client.pem
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/server1.key b/tika-grpc/src/test/resources/certs/server1.key
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/server1.key
rename to tika-grpc/src/test/resources/certs/server1.key
diff --git a/tika-server/tika-server-grpc/src/test/resources/certs/server1.pem b/tika-grpc/src/test/resources/certs/server1.pem
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/certs/server1.pem
rename to tika-grpc/src/test/resources/certs/server1.pem
diff --git a/tika-server/tika-server-grpc/src/test/resources/log4j2.xml b/tika-grpc/src/test/resources/log4j2.xml
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/log4j2.xml
rename to tika-grpc/src/test/resources/log4j2.xml
diff --git a/tika-server/tika-server-grpc/src/test/resources/test-files/014760.docx b/tika-grpc/src/test/resources/test-files/014760.docx
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/test-files/014760.docx
rename to tika-grpc/src/test/resources/test-files/014760.docx
diff --git a/tika-server/tika-server-grpc/src/test/resources/test-files/017091.docx b/tika-grpc/src/test/resources/test-files/017091.docx
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/test-files/017091.docx
rename to tika-grpc/src/test/resources/test-files/017091.docx
diff --git a/tika-server/tika-server-grpc/src/test/resources/test-files/017097.docx b/tika-grpc/src/test/resources/test-files/017097.docx
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/test-files/017097.docx
rename to tika-grpc/src/test/resources/test-files/017097.docx
diff --git a/tika-server/tika-server-grpc/src/test/resources/test-files/018367.docx b/tika-grpc/src/test/resources/test-files/018367.docx
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/test-files/018367.docx
rename to tika-grpc/src/test/resources/test-files/018367.docx
diff --git a/tika-server/tika-server-grpc/src/test/resources/tika-pipes-test-config.xml b/tika-grpc/src/test/resources/tika-pipes-test-config.xml
similarity index 100%
rename from tika-server/tika-server-grpc/src/test/resources/tika-pipes-test-config.xml
rename to tika-grpc/src/test/resources/tika-pipes-test-config.xml
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 2ccd4b0a8..d33dc5c8e 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -21,7 +21,6 @@
<module>tika-server-standard</module>
<module>tika-server-client</module>
<module>tika-server-eval</module>
- <module>tika-server-grpc</module>
</modules>
<parent>
(tika) 01/02: Merge remote-tracking branch 'origin/TIKA-4181-grpc'
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch tika-grpc-mv-take3
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 2c69e2956ee4eaa0e95992dd84620100a88e8de3
Merge: e5a0265ff 80d4a2600
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 10 10:11:33 2024 -0400
Merge remote-tracking branch 'origin/TIKA-4181-grpc'
# Conflicts:
# tika-pipes/tika-grpc/example-dockerfile/Dockerfile
# tika-pipes/tika-grpc/example-dockerfile/docker-build.sh
tika-pipes/pom.xml | 1 -
tika-pipes/tika-grpc/example-dockerfile/Dockerfile | 43 --------------
.../tika-grpc/example-dockerfile/docker-build.sh | 45 --------------
tika-server/pom.xml | 1 +
.../tika-server-grpc}/README.md | 0
.../tika-server-grpc}/pom.xml | 66 ++++++++++++++++++++-
.../tika/pipes/grpc/ExpiringFetcherStore.java | 0
.../org/apache/tika/pipes/grpc/TikaGrpcServer.java | 21 +++++--
.../apache/tika/pipes/grpc/TikaGrpcServerImpl.java | 7 ++-
.../grpc/exception/FetcherNotFoundException.java | 0
.../tika-server-grpc}/src/main/proto/tika.proto | 0
.../src/main/resources/log4j2.xml | 0
.../tika/pipes/grpc/ExpiringFetcherStoreTest.java | 0
...PipesBiDirectionalStreamingIntegrationTest.java | 0
.../apache/tika/pipes/grpc/TikaGrpcServerTest.java | 0
.../src/test/resources/certs/README.md | 0
.../src/test/resources/certs/ca.key | 0
.../src/test/resources/certs/ca.pem | 0
.../src/test/resources/certs/client.key | 0
.../src/test/resources/certs/client.pem | 0
.../src/test/resources/certs/server1.key | 0
.../src/test/resources/certs/server1.pem | 0
.../src/test/resources/log4j2.xml | 0
.../src/test/resources/test-files/014760.docx | Bin
.../src/test/resources/test-files/017091.docx | Bin
.../src/test/resources/test-files/017097.docx | Bin
.../src/test/resources/test-files/018367.docx | Bin
.../src/test/resources/tika-pipes-test-config.xml | 0
28 files changed, 86 insertions(+), 98 deletions(-)