Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename package #4

Merged
merged 1 commit into from
Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Amazon S3 Client Action

[![cm-available](https://cdap-users.herokuapp.com/assets/cm-available.svg)](https://docs.cask.co/cdap/current/en/integrations/cask-market.html)
[![cm-available](https://cdap-users.herokuapp.com/assets/cm-available.svg)](https://docs.cdap.io/cdap/current/en/integrations/cask-market.html)
![cdap-action](https://cdap-users.herokuapp.com/assets/cdap-action.svg)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Join CDAP community](https://cdap-users.herokuapp.com/badge.svg?t=wrangler)](https://cdap-users.herokuapp.com?t=1)
Expand Down Expand Up @@ -44,7 +44,7 @@ The CDAP UI displays each plugin property as a simple textbox. To customize how
are displayed in the UI, you can place a configuration file in the ``widgets`` directory.
The file must be named following a convention of ``[plugin-name]-[plugin-type].json``.

See [Plugin Widget Configuration](http://docs.cdap.io/cdap/current/en/hydrator-manual/developing-plugins/packaging-plugins.html#plugin-widget-json)
See [Plugin Widget Configuration](https://docs.cdap.io/cdap/current/en/developer-manual/pipelines/developing-plugins/presentation-plugins.html)
for details on the configuration file.

The UI will also display a reference doc for your plugin if you place a file in the ``docs`` directory
Expand Down
40 changes: 20 additions & 20 deletions pom.xml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright © 2017 Cask Data, Inc.
~ Copyright © 2017-2019 Cask Data, Inc.
~
~ Licensed 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
Expand All @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>

<name>Amazon S3 Client Action Plugin</name>
<groupId>co.cask.hydrator</groupId>
<groupId>io.cdap.plugin</groupId>
<artifactId>amazon-s3client-action</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>
<packaging>jar</packaging>

<licenses>
Expand All @@ -36,15 +36,15 @@

<developers>
<developer>
<name>Cask Data</name>
<email>cask[email protected]</email>
<organization>Cask Data, Inc.</organization>
<organizationUrl>http://www.cask.co</organizationUrl>
<name>CDAP</name>
<email>cdap[email protected]</email>
<organization>CDAP</organization>
<organizationUrl>http://cdap.io</organizationUrl>
</developer>
</developers>

<issueManagement>
<url>https://issues.cask.co/browse/HYDRATOR</url>
<url>https://issues.cask.co/browse/CDAP</url>
</issueManagement>

<distributionManagement>
Expand All @@ -57,14 +57,14 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<site>
<id>cask</id>
<url>http://cask.co</url>
<id>cdap</id>
<url>http://cdap.io</url>
</site>
</distributionManagement>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cdap.version>4.3.2</cdap.version>
<cdap.version>6.0.0-SNAPSHOT</cdap.version>
<hadoop.version>2.3.0</hadoop.version>
<!-- this is here because project.basedir evaluates to null in the script build step -->
<main.basedir>${project.basedir}</main.basedir>
Expand All @@ -83,23 +83,23 @@

<dependencies>
<dependency>
<groupId>co.cask.cdap</groupId>
<groupId>io.cdap.cdap</groupId>
<artifactId>cdap-etl-api</artifactId>
<version>${cdap.version}</version>
</dependency>
<dependency>
<groupId>co.cask.cdap</groupId>
<groupId>io.cdap.cdap</groupId>
<artifactId>cdap-etl-api-spark</artifactId>
<version>${cdap.version}</version>
</dependency>
<dependency>
<groupId>co.cask.cdap</groupId>
<groupId>io.cdap.cdap</groupId>
<artifactId>cdap-data-pipeline</artifactId>
<version>${cdap.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>co.cask.cdap</groupId>
<groupId>io.cdap.cdap</groupId>
<artifactId>hydrator-test</artifactId>
<version>${cdap.version}</version>
<scope>test</scope>
Expand Down Expand Up @@ -171,7 +171,7 @@
<Embed-Transitive>true</Embed-Transitive>
<Embed-Directory>lib</Embed-Directory>
<!--Only @Plugin classes in the export packages will be included as plugin-->
<_exportcontents>co.cask.hydrator.*</_exportcontents>
<_exportcontents>io.cdap.plugin.*</_exportcontents>
</instructions>
</configuration>
<executions>
Expand All @@ -184,13 +184,13 @@
</executions>
</plugin>
<plugin>
<groupId>co.cask</groupId>
<groupId>io.cdap</groupId>
<artifactId>cdap-maven-plugin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.0</version>
<configuration>
<cdapArtifacts>
<parent>system:cdap-data-pipeline[4.0.0,5.0.0-SNAPSHOT)</parent>
<parent>system:cdap-data-streams[4.0.0,5.0.0-SNAPSHOT)</parent>
<parent>system:cdap-data-pipeline[6.0.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
<parent>system:cdap-data-streams[6.0.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
</cdapArtifacts>
</configuration>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package co.cask.hydrator.plugin;
package io.cdap.plugin;


import co.cask.cdap.api.annotation.Description;
import co.cask.cdap.api.annotation.Macro;
import co.cask.cdap.api.annotation.Name;
import co.cask.cdap.api.annotation.Plugin;
import co.cask.cdap.api.plugin.PluginConfig;
import co.cask.cdap.etl.api.PipelineConfigurer;
import co.cask.cdap.etl.api.action.Action;
import co.cask.cdap.etl.api.action.ActionContext;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.Bucket;
import io.cdap.cdap.api.annotation.Description;
import io.cdap.cdap.api.annotation.Macro;
import io.cdap.cdap.api.annotation.Name;
import io.cdap.cdap.api.annotation.Plugin;
import io.cdap.cdap.api.plugin.PluginConfig;
import io.cdap.cdap.etl.api.PipelineConfigurer;
import io.cdap.cdap.etl.api.action.Action;
import io.cdap.cdap.etl.api.action.ActionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
15 changes: 3 additions & 12 deletions ...ator/plugin/AmazonS3ClientActionTest.java → ...cdap/plugin/AmazonS3ClientActionTest.java
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,13 @@
* the License.
*/

package co.cask.hydrator.plugin;
package io.cdap.plugin;

import co.cask.cdap.etl.mock.action.MockActionContext;
import co.cask.cdap.etl.mock.common.MockPipelineConfigurer;
import com.amazonaws.regions.Regions;
import org.junit.ClassRule;
import io.cdap.cdap.etl.mock.action.MockActionContext;
import io.cdap.cdap.etl.mock.common.MockPipelineConfigurer;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import java.io.File;
import java.io.FileFilter;
import java.net.URL;
import java.util.regex.Pattern;

import static org.junit.Assert.assertEquals;

/**
* Unit tests for {@link AmazonS3ClientAction}
Expand Down