You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/02 18:12:28 UTC
[49/60] incubator-trafodion git commit: additional files
additional files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e17dce61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e17dce61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e17dce61
Branch: refs/heads/master
Commit: e17dce614702af782db997db5bbca47c99b50aa6
Parents: 842caed
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Apr 22 16:55:38 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Apr 22 16:55:38 2016 +0000
----------------------------------------------------------------------
core/conn/jdbcT4/Makefile | 2 +-
core/conn/jdbcT4/pom.xml | 1 -
.../java/org/trafodion/jdbc/t4/BaseTest.java | 60 ++++++++++++++++++++
.../org/trafodion/jdbc/t4/T4DriverTest.java | 47 +++++++++++++++
.../test/org/trafodion/jdbc/t4/BaseTest.java | 60 --------------------
.../org/trafodion/jdbc/t4/T4DriverTest.java | 47 ---------------
6 files changed, 108 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17dce61/core/conn/jdbcT4/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 6006abb..189a053 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -27,7 +27,7 @@ all: build_all
build_all:
echo "$(MAVEN) package -DskipTests"
- set -o pipefail && $(MAVEN) package -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ set -o pipefail && $(MAVEN) package | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib
mkdir -p ../clients
mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17dce61/core/conn/jdbcT4/pom.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/pom.xml b/core/conn/jdbcT4/pom.xml
index e46ffd5..8e19b9f 100644
--- a/core/conn/jdbcT4/pom.xml
+++ b/core/conn/jdbcT4/pom.xml
@@ -29,7 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.trafodion.jdbc.t4</groupId>
<artifactId>jdbcT4</artifactId>
- <packaging>jar</packaging>
<version>${env.TRAFODION_VER}</version>
<name>Trafodion JDBC Type4 Driver</name>
<url>http://wiki.trafodion.org</url>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17dce61/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java
new file mode 100644
index 0000000..71a9486
--- /dev/null
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/BaseTest.java
@@ -0,0 +1,60 @@
+/*
+* @@@ START COPYRIGHT @@@
+*
+* 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.
+*
+* @@@ END COPYRIGHT @@@ */
+package org.trafodion.jdbc.t4;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+public class BaseTest {
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17dce61/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
new file mode 100644
index 0000000..5619784
--- /dev/null
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/T4DriverTest.java
@@ -0,0 +1,47 @@
+/*
+* @@@ START COPYRIGHT @@@
+*
+* 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.
+*
+* @@@ END COPYRIGHT @@@ */
+package org.trafodion.jdbc.t4;
+
+import java.sql.SQLException;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class T4DriverTest extends BaseTest {
+ private static T4Driver driver;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ driver = (T4Driver) Class.forName("org.trafodion.jdbc.t4.T4Driver").newInstance();
+ }
+
+
+ @Test
+ public void acceptsURL() throws SQLException {
+ String url = "jdbc:t4jdbc://localhost:23400/:";
+ Assert.assertTrue(driver.acceptsURL(url));
+ url = "jdbc:abc://localhost:23400/:";
+ Assert.assertFalse(driver.acceptsURL(url));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17dce61/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java b/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
deleted file mode 100644
index 71a9486..0000000
--- a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/BaseTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* @@@ START COPYRIGHT @@@
-*
-* 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.
-*
-* @@@ END COPYRIGHT @@@ */
-package org.trafodion.jdbc.t4;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-public class BaseTest {
-
- /**
- * @throws java.lang.Exception
- */
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17dce61/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java b/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
deleted file mode 100644
index a464910..0000000
--- a/core/conn/jdbc_type4/test/org/trafodion/jdbc/t4/T4DriverTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* @@@ START COPYRIGHT @@@
-*
-* 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.
-*
-* @@@ END COPYRIGHT @@@ */
-package org.trafodion.jdbc.t4;
-
-import java.sql.SQLException;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class T4DriverTest extends BaseTest {
- private static T4Driver driver;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- driver = (T4Driver) Class.forName("org.trafodion.jdbc.t4.T4Driver").newInstance();
- }
-
-
- @Test
- public void acceptsURL() throws SQLException {
- String url = "jdbc:t4jdbc://192.168.1.103:37800/:";
- Assert.assertTrue(driver.acceptsURL(url));
- url = "jdbc:abc://192.168.1.103:37800/:";
- Assert.assertFalse(driver.acceptsURL(url));
- }
-
-}