You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/03/25 22:22:55 UTC
[32/55] [abbrv] airavata git commit: changing db script names
changing db script names
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cf8dc28e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cf8dc28e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cf8dc28e
Branch: refs/heads/master
Commit: cf8dc28e7b551b37f4794a9452a1cc95f21d5c1b
Parents: 04f6f59
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 11:30:47 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 11:30:47 2016 -0400
----------------------------------------------------------------------
.../api/server/handler/utils/DataCatInit.java | 2 +-
.../src/main/resources/datacatalog-derby.sql | 78 --------------------
.../src/main/resources/datacatalog-mysql.sql | 77 -------------------
.../src/main/resources/replicacatalog-derby.sql | 78 ++++++++++++++++++++
.../src/main/resources/replicacatalog-mysql.sql | 77 +++++++++++++++++++
.../replica/catalog/ReplicaCatalogTest.java | 2 +-
.../replica/catalog/util/Initialize.java | 2 +-
7 files changed, 158 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
index f99228a..b63d9c4 100644
--- a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
+++ b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/utils/DataCatInit.java
@@ -40,7 +40,7 @@ import java.util.StringTokenizer;
public class DataCatInit {
private static final Logger logger = LoggerFactory.getLogger(DataCatInit.class);
public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
- public String scriptName = "datacatalog-derby.sql";
+ public String scriptName = "replicacatalog-derby.sql";
private NetworkServerControl server;
private static final String delimiter = ";";
private String jdbcUrl = null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/modules/registry/registry-core/src/main/resources/datacatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/datacatalog-derby.sql b/modules/registry/registry-core/src/main/resources/datacatalog-derby.sql
deleted file mode 100644
index 78dc165..0000000
--- a/modules/registry/registry-core/src/main/resources/datacatalog-derby.sql
+++ /dev/null
@@ -1,78 +0,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.
- *
- */
-
-CREATE TABLE DATA_PRODUCT
-(
- PRODUCT_URI VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- PRODUCT_NAME VARCHAR (255),
- PRODUCT_DESCRIPTION VARCHAR (1024),
- PARENT_PRODUCT_URI VARCHAR (255),
- LOGICAL_PATH VARCHAR (255),
- OWNER_NAME VARCHAR (255),
- PRODUCT_SIZE INTEGER ,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- LAST_MODIFIED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (PRODUCT_URI)
-);
-
-CREATE TABLE DATA_REPLICA_LOCATION
-(
- REPLICA_ID VARCHAR (255),
- PRODUCT_URI VARCHAR (255) NOT NULL,
- REPLICA_NAME VARCHAR (255),
- REPLICA_DESCRIPTION VARCHAR (1024),
- STORAGE_RESOURCE_ID VARCHAR (255),
- FILE_PATH VARCHAR (4096),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- LAST_MODIFIED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- VALID_UNTIL_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (REPLICA_ID),
- FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_PRODUCT_METADATA
-(
- PRODUCT_URI VARCHAR(255),
- METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(2048),
- PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
- FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_REPLICA_METADATA
-(
- REPLICA_ID VARCHAR(255),
- METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(2048),
- PRIMARY KEY(REPLICA_ID, METADATA_KEY),
- FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('data_catalog_version', '0.16');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
deleted file mode 100644
index d612194..0000000
--- a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
+++ /dev/null
@@ -1,77 +0,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.
- *
- */
-
-CREATE TABLE DATA_PRODUCT
-(
- PRODUCT_URI VARCHAR (255),
- GATEWAY_ID VARCHAR (255),
- PRODUCT_NAME VARCHAR (255),
- LOGICAL_PATH VARCHAR (255),
- PRODUCT_DESCRIPTION VARCHAR (255),
- OWNER_NAME VARCHAR (255),
- PARENT_PRODUCT_URI VARCHAR (255),
- PRODUCT_SIZE INT,
- CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
- LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- PRIMARY KEY (PRODUCT_URI)
-);
-
-CREATE TABLE DATA_REPLICA_LOCATION
-(
- REPLICA_ID VARCHAR (255),
- PRODUCT_URI VARCHAR (255) NOT NULL,
- REPLICA_NAME VARCHAR (255),
- REPLICA_DESCRIPTION VARCHAR (255),
- STORAGE_RESOURCE_ID VARCHAR (255),
- FILE_PATH VARCHAR (255),
- CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
- LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- VALID_UNTIL_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (REPLICA_ID),
- FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_PRODUCT_METADATA
-(
- PRODUCT_URI VARCHAR(255),
- METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(255),
- PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
- FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_REPLICA_METADATA
-(
- REPLICA_ID VARCHAR(255),
- METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(255),
- PRIMARY KEY(REPLICA_ID, METADATA_KEY),
- FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('data_catalog_version', '0.16');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/modules/registry/registry-core/src/main/resources/replicacatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/replicacatalog-derby.sql b/modules/registry/registry-core/src/main/resources/replicacatalog-derby.sql
new file mode 100644
index 0000000..78dc165
--- /dev/null
+++ b/modules/registry/registry-core/src/main/resources/replicacatalog-derby.sql
@@ -0,0 +1,78 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+CREATE TABLE DATA_PRODUCT
+(
+ PRODUCT_URI VARCHAR (255),
+ GATEWAY_ID VARCHAR (255),
+ PRODUCT_NAME VARCHAR (255),
+ PRODUCT_DESCRIPTION VARCHAR (1024),
+ PARENT_PRODUCT_URI VARCHAR (255),
+ LOGICAL_PATH VARCHAR (255),
+ OWNER_NAME VARCHAR (255),
+ PRODUCT_SIZE INTEGER ,
+ CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ LAST_MODIFIED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (PRODUCT_URI)
+);
+
+CREATE TABLE DATA_REPLICA_LOCATION
+(
+ REPLICA_ID VARCHAR (255),
+ PRODUCT_URI VARCHAR (255) NOT NULL,
+ REPLICA_NAME VARCHAR (255),
+ REPLICA_DESCRIPTION VARCHAR (1024),
+ STORAGE_RESOURCE_ID VARCHAR (255),
+ FILE_PATH VARCHAR (4096),
+ CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ LAST_MODIFIED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ VALID_UNTIL_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (REPLICA_ID),
+ FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
+);
+
+CREATE TABLE DATA_PRODUCT_METADATA
+(
+ PRODUCT_URI VARCHAR(255),
+ METADATA_KEY VARCHAR(255),
+ METADATA_VALUE VARCHAR(2048),
+ PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
+ FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
+);
+
+CREATE TABLE DATA_REPLICA_METADATA
+(
+ REPLICA_ID VARCHAR(255),
+ METADATA_KEY VARCHAR(255),
+ METADATA_VALUE VARCHAR(2048),
+ PRIMARY KEY(REPLICA_ID, METADATA_KEY),
+ FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
+);
+
+
+CREATE TABLE CONFIGURATION
+(
+ CONFIG_KEY VARCHAR(255),
+ CONFIG_VAL VARCHAR(255),
+ PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
+);
+
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('data_catalog_version', '0.16');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql
new file mode 100644
index 0000000..d612194
--- /dev/null
+++ b/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql
@@ -0,0 +1,77 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+CREATE TABLE DATA_PRODUCT
+(
+ PRODUCT_URI VARCHAR (255),
+ GATEWAY_ID VARCHAR (255),
+ PRODUCT_NAME VARCHAR (255),
+ LOGICAL_PATH VARCHAR (255),
+ PRODUCT_DESCRIPTION VARCHAR (255),
+ OWNER_NAME VARCHAR (255),
+ PARENT_PRODUCT_URI VARCHAR (255),
+ PRODUCT_SIZE INT,
+ CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
+ LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (PRODUCT_URI)
+);
+
+CREATE TABLE DATA_REPLICA_LOCATION
+(
+ REPLICA_ID VARCHAR (255),
+ PRODUCT_URI VARCHAR (255) NOT NULL,
+ REPLICA_NAME VARCHAR (255),
+ REPLICA_DESCRIPTION VARCHAR (255),
+ STORAGE_RESOURCE_ID VARCHAR (255),
+ FILE_PATH VARCHAR (255),
+ CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
+ LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ VALID_UNTIL_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (REPLICA_ID),
+ FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
+);
+
+CREATE TABLE DATA_PRODUCT_METADATA
+(
+ PRODUCT_URI VARCHAR(255),
+ METADATA_KEY VARCHAR(255),
+ METADATA_VALUE VARCHAR(255),
+ PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
+ FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
+);
+
+CREATE TABLE DATA_REPLICA_METADATA
+(
+ REPLICA_ID VARCHAR(255),
+ METADATA_KEY VARCHAR(255),
+ METADATA_VALUE VARCHAR(255),
+ PRIMARY KEY(REPLICA_ID, METADATA_KEY),
+ FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE CONFIGURATION
+(
+ CONFIG_KEY VARCHAR(255),
+ CONFIG_VAL VARCHAR(255),
+ PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
+);
+
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('data_catalog_version', '0.16');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java
index f787ee4..ff30d43 100644
--- a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java
@@ -45,7 +45,7 @@ public class ReplicaCatalogTest {
public static void setUp() {
try {
System.out.println("********** SET UP ************");
- initialize = new Initialize("datacatalog-derby.sql");
+ initialize = new Initialize("replicacatalog-derby.sql");
initialize.initializeDB();
datacatalog = RegistryFactory.getReplicaCatalog();
dataProductModel = new DataProductModel();
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf8dc28e/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java
index 989a775..c05003b 100644
--- a/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/util/Initialize.java
@@ -40,7 +40,7 @@ import java.util.StringTokenizer;
public class Initialize {
private static final Logger logger = LoggerFactory.getLogger(Initialize.class);
public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
- public String scriptName = "datacatalog-derby.sql";
+ public String scriptName = "replicacatalog-derby.sql";
private NetworkServerControl server;
private static final String delimiter = ";";
private String jdbcUrl = null;