This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 60ac97f HOP-3209 Move vfs/s3 plugin to tech/aws
new a24c7d9 Merge pull request #1020 from nadment/HOP-3209
60ac97f is described below
commit 60ac97f6bc41749dba75a5637a13aa3c48991132
Author: Nicolas Adment <[email protected]>
AuthorDate: Wed Aug 25 20:42:09 2021 +0200
HOP-3209 Move vfs/s3 plugin to tech/aws
---
assemblies/plugins/dist/pom.xml | 26 +--
assemblies/plugins/pom.xml | 1 -
assemblies/plugins/{vfs/s3 => tech/aws}/pom.xml | 8 +-
.../{vfs/s3 => tech/aws}/src/assembly/assembly.xml | 6 +-
.../s3 => tech/aws}/src/main/resources/version.xml | 0
assemblies/plugins/tech/pom.xml | 1 +
assemblies/plugins/vfs/pom.xml | 44 ------
plugins/pom.xml | 1 -
plugins/{vfs/s3 => tech/aws}/pom.xml | 7 +-
.../java/org/apache/hop/vfs/s3/S3VfsPlugin.java | 0
.../org/apache/hop/vfs/s3/amazon/s3/S3Util.java | 0
.../org/apache/hop/vfs/s3/s3/vfs/S3FileName.java | 0
.../apache/hop/vfs/s3/s3/vfs/S3FileNameParser.java | 0
.../org/apache/hop/vfs/s3/s3/vfs/S3FileObject.java | 0
.../apache/hop/vfs/s3/s3/vfs/S3FileProvider.java | 0
.../org/apache/hop/vfs/s3/s3/vfs/S3FileSystem.java | 0
.../org/apache/hop/vfs/s3/s3a/vfs/S3AFileName.java | 0
.../hop/vfs/s3/s3a/vfs/S3AFileNameParser.java | 0
.../apache/hop/vfs/s3/s3a/vfs/S3AFileObject.java | 0
.../apache/hop/vfs/s3/s3a/vfs/S3AFileProvider.java | 0
.../apache/hop/vfs/s3/s3a/vfs/S3AFileSystem.java | 0
.../vfs/s3/s3common/S3CommonFileInputStream.java | 0
.../hop/vfs/s3/s3common/S3CommonFileObject.java | 0
.../hop/vfs/s3/s3common/S3CommonFileProvider.java | 0
.../hop/vfs/s3/s3common/S3CommonFileSystem.java | 0
.../s3common/S3CommonFileSystemConfigBuilder.java | 0
.../vfs/s3/s3common/S3CommonPipedOutputStream.java | 0
.../vfs/s3/s3common/S3CommonWindowedSubstream.java | 0
.../apache/hop/vfs/s3/s3common/S3HopProperty.java | 0
.../org/apache/hop/vfs/s3/s3n/vfs/S3NFileName.java | 0
.../hop/vfs/s3/s3n/vfs/S3NFileNameParser.java | 0
.../apache/hop/vfs/s3/s3n/vfs/S3NFileObject.java | 0
.../apache/hop/vfs/s3/s3n/vfs/S3NFileProvider.java | 0
.../apache/hop/vfs/s3/s3n/vfs/S3NFileSystem.java | 0
.../s3/s3/vfs/messages/messages_en_US.properties | 0
.../s3/s3common/messages/messages_en_US.properties | 0
.../apache/hop/vfs/s3/vfs/S3FileNameParserIT.java | 0
.../hop/vfs/s3/vfs/S3FileNameParserTest.java | 0
.../org/apache/hop/vfs/s3/vfs/S3FileNameTest.java | 0
.../apache/hop/vfs/s3/vfs/S3FileObjectTest.java | 0
.../apache/hop/vfs/s3/vfs/S3FileProviderTest.java | 0
.../apache/hop/vfs/s3/vfs/S3FileSystemTest.java | 0
.../hop/vfs/s3/vfs/S3NFileNameParserTest.java | 0
.../org/apache/hop/vfs/s3/vfs/S3NFileNameTest.java | 0
.../apache/hop/vfs/s3/vfs/S3NFileObjectTest.java | 0
.../apache/hop/vfs/s3/vfs/S3NFileProviderTest.java | 0
.../apache/hop/vfs/s3/vfs/S3NFileSystemTest.java | 0
.../src/test/resources/test-settings.properties | 0
plugins/tech/pom.xml | 1 +
plugins/vfs/hdfs/pom.xml | 36 -----
plugins/vfs/pom.xml | 175 ---------------------
51 files changed, 25 insertions(+), 281 deletions(-)
diff --git a/assemblies/plugins/dist/pom.xml b/assemblies/plugins/dist/pom.xml
index d5ea81a..4c38500 100644
--- a/assemblies/plugins/dist/pom.xml
+++ b/assemblies/plugins/dist/pom.xml
@@ -3058,6 +3058,19 @@
<dependency>
<groupId>org.apache.hop</groupId>
+ <artifactId>hop-assemblies-plugins-tech-aws</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>zip</type>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-plugins-tech-azure</artifactId>
<version>1.0-SNAPSHOT</version>
<type>zip</type>
@@ -3214,19 +3227,6 @@
<dependency>
<groupId>org.apache.hop</groupId>
- <artifactId>hop-assemblies-plugins-vfs-s3</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>zip</type>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hop</groupId>
<artifactId>hop-assemblies-plugins-valuetypes-json</artifactId>
<version>1.0-SNAPSHOT</version>
<type>zip</type>
diff --git a/assemblies/plugins/pom.xml b/assemblies/plugins/pom.xml
index 1c71a23..f306ee9 100644
--- a/assemblies/plugins/pom.xml
+++ b/assemblies/plugins/pom.xml
@@ -37,7 +37,6 @@
<module>databases</module>
<module>engines</module>
<module>misc</module>
- <module>vfs</module>
<module>tech</module>
<module>transforms</module>
<module>valuetypes</module>
diff --git a/assemblies/plugins/vfs/s3/pom.xml
b/assemblies/plugins/tech/aws/pom.xml
similarity index 92%
rename from assemblies/plugins/vfs/s3/pom.xml
rename to assemblies/plugins/tech/aws/pom.xml
index 68b71c7..ed04ef5 100644
--- a/assemblies/plugins/vfs/s3/pom.xml
+++ b/assemblies/plugins/tech/aws/pom.xml
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.hop</groupId>
- <artifactId>hop-assemblies-plugins-vfs</artifactId>
+ <artifactId>hop-assemblies-plugins-tech</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>hop-assemblies-plugins-vfs-s3</artifactId>
+ <artifactId>hop-assemblies-plugins-tech-aws</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Hop Assemblies Plugins VFS Amazon S3</name>
+ <name>Hop Assemblies Plugins Technology AWS</name>
<description></description>
@@ -52,7 +52,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-vfs-s3</artifactId>
+ <artifactId>hop-plugins-tech-aws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/assemblies/plugins/vfs/s3/src/assembly/assembly.xml
b/assemblies/plugins/tech/aws/src/assembly/assembly.xml
similarity index 93%
rename from assemblies/plugins/vfs/s3/src/assembly/assembly.xml
rename to assemblies/plugins/tech/aws/src/assembly/assembly.xml
index a867ce0..755f1eb 100644
--- a/assemblies/plugins/vfs/s3/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/aws/src/assembly/assembly.xml
@@ -19,11 +19,11 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd";>
- <id>hop-assemblies-plugins-vfs-s3</id>
+ <id>hop-assemblies-plugins-tech-aws</id>
<formats>
<format>zip</format>
</formats>
- <baseDirectory>vfs/s3</baseDirectory>
+ <baseDirectory>tech/aws</baseDirectory>
<files>
<file>
<source>${project.basedir}/src/main/resources/version.xml</source>
@@ -44,7 +44,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.apache.hop:hop-plugins-vfs-s3:jar</include>
+ <include>org.apache.hop:plugins-tech-aws:jar</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/assemblies/plugins/vfs/s3/src/main/resources/version.xml
b/assemblies/plugins/tech/aws/src/main/resources/version.xml
similarity index 100%
rename from assemblies/plugins/vfs/s3/src/main/resources/version.xml
rename to assemblies/plugins/tech/aws/src/main/resources/version.xml
diff --git a/assemblies/plugins/tech/pom.xml b/assemblies/plugins/tech/pom.xml
index 4926302..8fe79f4 100644
--- a/assemblies/plugins/tech/pom.xml
+++ b/assemblies/plugins/tech/pom.xml
@@ -35,6 +35,7 @@
<modules>
<module>avro</module>
+ <module>aws</module>
<module>azure</module>
<module>cassandra</module>
<module>dropbox</module>
diff --git a/assemblies/plugins/vfs/pom.xml b/assemblies/plugins/vfs/pom.xml
deleted file mode 100644
index 211584a..0000000
--- a/assemblies/plugins/vfs/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>hop-assemblies-plugins</artifactId>
- <groupId>org.apache.hop</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <packaging>pom</packaging>
-
- <artifactId>hop-assemblies-plugins-vfs</artifactId>
-
- <name>Hop Assemblies Plugins VFS</name>
- <description></description>
-
- <modules>
- <module>s3</module>
- <!--
- <module>hdfs</module>
- -->
- </modules>
-
-</project>
\ No newline at end of file
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b33a6da..d80f2f9 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -51,7 +51,6 @@
<module>tech</module>
<module>transforms</module>
<module>valuetypes</module>
- <module>vfs</module>
</modules>
</profile>
diff --git a/plugins/vfs/s3/pom.xml b/plugins/tech/aws/pom.xml
similarity index 96%
rename from plugins/vfs/s3/pom.xml
rename to plugins/tech/aws/pom.xml
index 93e3792..a7cfeec 100644
--- a/plugins/vfs/s3/pom.xml
+++ b/plugins/tech/aws/pom.xml
@@ -23,15 +23,14 @@
<parent>
<groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-vfs</artifactId>
+ <artifactId>hop-plugins-tech</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>hop-plugins-vfs-s3</artifactId>
+ <artifactId>hop-plugins-tech-aws</artifactId>
<packaging>jar</packaging>
- <name>Hop Plugins VFS S3</name>
-
+ <name>Hop Plugins Technology AWS</name>
<properties>
<!-- Third-party dependencies -->
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/S3VfsPlugin.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/S3VfsPlugin.java
similarity index 100%
rename from plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/S3VfsPlugin.java
rename to plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/S3VfsPlugin.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/amazon/s3/S3Util.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/amazon/s3/S3Util.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/amazon/s3/S3Util.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/amazon/s3/S3Util.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileName.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileName.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileName.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileName.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileNameParser.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileNameParser.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileNameParser.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileNameParser.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileObject.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileObject.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileObject.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileObject.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileProvider.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileProvider.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileProvider.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileProvider.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileSystem.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileSystem.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileSystem.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3/vfs/S3FileSystem.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileName.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileName.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileName.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileName.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileNameParser.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileNameParser.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileNameParser.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileNameParser.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileObject.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileObject.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileObject.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileObject.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileProvider.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileProvider.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileProvider.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileProvider.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileSystem.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileSystem.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileSystem.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3a/vfs/S3AFileSystem.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileInputStream.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileInputStream.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileInputStream.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileInputStream.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileObject.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileObject.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileObject.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileObject.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileProvider.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileProvider.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileProvider.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileProvider.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystem.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystem.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystem.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystem.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystemConfigBuilder.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystemConfigBuilder.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystemConfigBuilder.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonFileSystemConfigBuilder.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonPipedOutputStream.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonPipedOutputStream.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonPipedOutputStream.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonPipedOutputStream.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonWindowedSubstream.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonWindowedSubstream.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonWindowedSubstream.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3CommonWindowedSubstream.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3HopProperty.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3HopProperty.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3common/S3HopProperty.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3common/S3HopProperty.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileName.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileName.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileName.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileName.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileNameParser.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileNameParser.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileNameParser.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileNameParser.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileObject.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileObject.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileObject.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileObject.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileProvider.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileProvider.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileProvider.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileProvider.java
diff --git
a/plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileSystem.java
b/plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileSystem.java
similarity index 100%
rename from
plugins/vfs/s3/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileSystem.java
rename to
plugins/tech/aws/src/main/java/org/apache/hop/vfs/s3/s3n/vfs/S3NFileSystem.java
diff --git
a/plugins/vfs/s3/src/main/resources/org/apache/hop/vfs/s3/s3/vfs/messages/messages_en_US.properties
b/plugins/tech/aws/src/main/resources/org/apache/hop/vfs/s3/s3/vfs/messages/messages_en_US.properties
similarity index 100%
rename from
plugins/vfs/s3/src/main/resources/org/apache/hop/vfs/s3/s3/vfs/messages/messages_en_US.properties
rename to
plugins/tech/aws/src/main/resources/org/apache/hop/vfs/s3/s3/vfs/messages/messages_en_US.properties
diff --git
a/plugins/vfs/s3/src/main/resources/org/apache/hop/vfs/s3/s3common/messages/messages_en_US.properties
b/plugins/tech/aws/src/main/resources/org/apache/hop/vfs/s3/s3common/messages/messages_en_US.properties
similarity index 100%
rename from
plugins/vfs/s3/src/main/resources/org/apache/hop/vfs/s3/s3common/messages/messages_en_US.properties
rename to
plugins/tech/aws/src/main/resources/org/apache/hop/vfs/s3/s3common/messages/messages_en_US.properties
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserIT.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserIT.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserIT.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserIT.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameParserTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileNameTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileObjectTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileObjectTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileObjectTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileObjectTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileProviderTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileProviderTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileProviderTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileProviderTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileSystemTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileSystemTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileSystemTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3FileSystemTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameParserTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameParserTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameParserTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameParserTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileNameTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileObjectTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileObjectTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileObjectTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileObjectTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileProviderTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileProviderTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileProviderTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileProviderTest.java
diff --git
a/plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileSystemTest.java
b/plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileSystemTest.java
similarity index 100%
rename from
plugins/vfs/s3/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileSystemTest.java
rename to
plugins/tech/aws/src/test/java/org/apache/hop/vfs/s3/vfs/S3NFileSystemTest.java
diff --git a/plugins/vfs/s3/src/test/resources/test-settings.properties
b/plugins/tech/aws/src/test/resources/test-settings.properties
similarity index 100%
rename from plugins/vfs/s3/src/test/resources/test-settings.properties
rename to plugins/tech/aws/src/test/resources/test-settings.properties
diff --git a/plugins/tech/pom.xml b/plugins/tech/pom.xml
index 86f985b9..69d8852 100644
--- a/plugins/tech/pom.xml
+++ b/plugins/tech/pom.xml
@@ -53,6 +53,7 @@
</property>
</activation>
<modules>
+ <module>aws</module>
<module>azure</module>
<module>avro</module>
<module>cassandra</module>
diff --git a/plugins/vfs/hdfs/pom.xml b/plugins/vfs/hdfs/pom.xml
deleted file mode 100644
index cfe8d0d..0000000
--- a/plugins/vfs/hdfs/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-vfs</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>hop-plugins-vfs-hdfs</artifactId>
- <packaging>jar</packaging>
-
- <name>Hop Plugins VFS HDFS</name>
-
-</project>
\ No newline at end of file
diff --git a/plugins/vfs/pom.xml b/plugins/vfs/pom.xml
deleted file mode 100644
index 28d81e0..0000000
--- a/plugins/vfs/pom.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins-vfs</artifactId>
- <version>1.0-SNAPSHOT</version>
- <modules>
- </modules>
- <packaging>pom</packaging>
-
- <name>Hop Plugins VFS</name>
-
- <parent>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-plugins</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <properties>
- <!-- Test running configuration -->
-
<maven-surefire-plugin.reuseForks>true</maven-surefire-plugin.reuseForks>
-
<maven-failsafe-plugin.reuseForks>false</maven-failsafe-plugin.reuseForks>
- <spring.framework.version>4.3.2.RELEASE</spring.framework.version>
- <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
- </properties>
-
- <profiles>
- <profile>
- <id>lowdeps</id>
- <activation>
- <property>
- <name>!skipDefault</name>
- </property>
- </activation>
- <modules>
- <module>hdfs</module>
- <module>s3</module>
- </modules>
- </profile>
-
- <profile>
- <id>highdeps</id>
- <activation>
- <property>
- <name>!skipDefault</name>
- </property>
- </activation>
- <modules>
- <module>hdfs</module>
- <module>s3</module>
- </modules>
- </profile>
-
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-ui</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-engine</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api.version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <classifier>test</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-engine</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hop</groupId>
- <artifactId>hop-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.svg</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.svg</include>
- </includes>
- </resource>
- </resources>
- </build>
-</project>
