This is an automated email from the ASF dual-hosted git repository.
agingade pushed a commit to branch feature/GEODE-4947
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0a2e444d52ab45d7b0f7df2fbb5dcba282bff834
Author: Nick Reich <nre...@pivotal.io>
AuthorDate: Thu Mar 29 13:40:35 2018 -0700
GEODE-4947: Change resource paths
---
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 2 +-
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 2 +-
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 2 +-
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 2 +-
.../PostgresJdbcAsyncWriterIntegrationTest.java | 2 +-
.../jdbc/PostgresJdbcDistributedTest.java | 2 +-
.../jdbc/PostgresJdbcLoaderIntegrationTest.java | 2 +-
.../jdbc/PostgresJdbcWriterIntegrationTest.java | 2 +-
.../MySqlTableMetaDataManagerIntegrationTest.java | 2 +-
...ostgresTableMetaDataManagerIntegrationTest.java | 2 +-
.../geode/connectors/jdbc/internal/mysql.yml | 28 ++++++++++++++++++++++
.../geode/connectors/jdbc/internal/postgres.yml | 27 +++++++++++++++++++++
.../org/apache/geode/connectors/jdbc/mysql.yml | 28 ++++++++++++++++++++++
.../org/apache/geode/connectors/jdbc/postgres.yml | 27 +++++++++++++++++++++
14 files changed, 120 insertions(+), 10 deletions(-)
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
index 8e758d9..37a057d 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
public class MySqlJdbcAsyncWriterIntegrationTest extends
JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
-
MySqlJdbcAsyncWriterIntegrationTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcAsyncWriterIntegrationTest.class.getResource("mysql.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
MySqlConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
index a21ea07..347b03d 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
@@ -35,7 +35,7 @@ import
org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
public class MySqlJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcDistributedTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcDistributedTest.class.getResource("mysql.yml");
@ClassRule
public static transient SqlDatabaseConnectionRule dbRule =
createConnectionRule();
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
index 14bd3f2..0d75045 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
public class MySqlJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcLoaderIntegrationTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcLoaderIntegrationTest.class.getResource("mysql.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
MySqlConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
index 12ceec9..7d64ad0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
public class MySqlJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
- MySqlJdbcWriterIntegrationTest.class.getResource("docker/mysql.yml");
+ MySqlJdbcWriterIntegrationTest.class.getResource("mysql.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
MySqlConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
index fbaa93d..4dbacea 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import
org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresJdbcAsyncWriterIntegrationTest extends
JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
-
PostgresJdbcAsyncWriterIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcAsyncWriterIntegrationTest.class.getResource("postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
PostgresConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
index 5009cd7..25f33c9 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
@@ -35,7 +35,7 @@ import
org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
public class PostgresJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
- PostgresJdbcDistributedTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcDistributedTest.class.getResource("postgres.yml");
@ClassRule
public static transient SqlDatabaseConnectionRule dbRule =
createConnectionRule();
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
index d9acdea..3b9755f 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
@@ -30,7 +30,7 @@ import
org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresJdbcLoaderIntegrationTest extends
JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
-
PostgresJdbcLoaderIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcLoaderIntegrationTest.class.getResource("postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
PostgresConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
index e3f273e..98d45c0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
@@ -29,7 +29,7 @@ import
org.apache.geode.test.junit.rules.PostgresConnectionRule;
public class PostgresJdbcWriterIntegrationTest extends
JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
-
PostgresJdbcWriterIntegrationTest.class.getResource("docker/postgres.yml");
+ PostgresJdbcWriterIntegrationTest.class.getResource("postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
PostgresConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
index 4749b55..44d3365 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.rules.MySqlConnectionRule;
public class MySqlTableMetaDataManagerIntegrationTest extends
TableMetaDataManagerIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
-
MySqlTableMetaDataManagerIntegrationTest.class.getResource("../docker/mysql.yml");
+ MySqlTableMetaDataManagerIntegrationTest.class.getResource("mysql.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
MySqlConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
index 4a7a1a7..c5304ae 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
@@ -30,7 +30,7 @@ public class PostgresTableMetaDataManagerIntegrationTest
extends TableMetaDataManagerIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
-
PostgresTableMetaDataManagerIntegrationTest.class.getResource("../docker/postgres.yml");
+
PostgresTableMetaDataManagerIntegrationTest.class.getResource("postgres.yml");
@ClassRule
public static DatabaseConnectionRule dbRule = new
PostgresConnectionRule.Builder()
diff --git
a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/internal/mysql.yml
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/internal/mysql.yml
new file mode 100644
index 0000000..97e1c32
--- /dev/null
+++
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/internal/mysql.yml
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+version: '3.1'
+
+services:
+
+ db:
+ image: mysql:5.7
+ restart: always
+ ports:
+ - 3306
+ environment:
+ MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+ #MYSQL_ROOT_PASSWORD: "secret"
\ No newline at end of file
diff --git
a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/internal/postgres.yml
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/internal/postgres.yml
new file mode 100644
index 0000000..2380b9e
--- /dev/null
+++
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/internal/postgres.yml
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+version: '3.1'
+
+services:
+
+ db:
+ image: postgres
+ restart: always
+ ports:
+ - 5432
+ environment:
+ POSTGRES_DB: test
diff --git
a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/mysql.yml
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/mysql.yml
new file mode 100644
index 0000000..97e1c32
--- /dev/null
+++
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/mysql.yml
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+version: '3.1'
+
+services:
+
+ db:
+ image: mysql:5.7
+ restart: always
+ ports:
+ - 3306
+ environment:
+ MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+ #MYSQL_ROOT_PASSWORD: "secret"
\ No newline at end of file
diff --git
a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/postgres.yml
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/postgres.yml
new file mode 100644
index 0000000..2380b9e
--- /dev/null
+++
b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/postgres.yml
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+version: '3.1'
+
+services:
+
+ db:
+ image: postgres
+ restart: always
+ ports:
+ - 5432
+ environment:
+ POSTGRES_DB: test
--
To stop receiving notification emails like this one, please contact
aging...@apache.org.
