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:29 UTC
[50/60] incubator-trafodion git commit: updated files
updated 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/9d450e99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9d450e99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9d450e99
Branch: refs/heads/master
Commit: 9d450e992f4d8610f1caff99181fd232849b368a
Parents: e17dce6
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Apr 22 17:25:07 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Apr 22 17:25:07 2016 +0000
----------------------------------------------------------------------
.../java/org/trafodion/jdbc/t4/RunAllTests.java | 31 ++++
core/conn/jdbc_type4/.gitignore | 3 -
core/conn/jdbc_type4/build.xml | 142 -------------------
core/conn/jdbc_type4/getBuildInfo | 24 ----
core/conn/jdbc_type4/test/RunAllTests.java | 31 ----
5 files changed, 31 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9d450e99/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java
new file mode 100644
index 0000000..0de5f33
--- /dev/null
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java
@@ -0,0 +1,31 @@
+/*
+* @@@ 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 @@@ */
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.trafodion.jdbc.t4.T4DriverTest;
+
+@RunWith(Suite.class)
+@SuiteClasses({T4DriverTest.class})
+public class RunAllTests {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9d450e99/core/conn/jdbc_type4/.gitignore
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/.gitignore b/core/conn/jdbc_type4/.gitignore
deleted file mode 100644
index 9a66973..0000000
--- a/core/conn/jdbc_type4/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-buildId
-temp/
-/target/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9d450e99/core/conn/jdbc_type4/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/build.xml b/core/conn/jdbc_type4/build.xml
deleted file mode 100755
index 9222a18..0000000
--- a/core/conn/jdbc_type4/build.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- @@@ 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 @@@ -->
-
-<project name="jdbct4" default="deploy">
- <tstamp>
- <format property="now.timestamp" pattern="yyyy_MM_dd" locale="en" />
- </tstamp>
-
- <!-- input -->
- <exec executable="git" outputproperty="bldId">
- <arg value="rev-parse" />
- <arg value="--short" />
- <arg value="HEAD" />
- </exec>
- <property name="vproc.str" value="Traf_JDBC_Type4_Build_${bldId}" />
- <property name="my_sqroot" value="../../sqf"/>
- <property id="basedir" name="basedir" value="."/>
- <property name="src.root" value="${basedir}" />
- <property name="target.dir" value="${basedir}/../../sqf/export/lib" />
- <property name="src.src" value="${src.root}/src" />
- <property name="src.test" value="${src.root}/test" />
- <property name="src.install" value="${src.root}/install" />
- <property name="src.samples" value="${src.root}/samples"/>
- <property name="src.lib" value="${src.root}/lib"/>
- <property name="src.lic" value="${src.root}/../../../licenses"/>
- <property name="src.notice" value="${src.root}/../../.."/>
- <property name="client.dir" value="${src.root}/../clients"/>
- <property name="temp.dir" value="${src.root}/temp"/>
- <property name="deploy.dir" value="${temp.dir}/deploy" />
- <property name="installclasses.dir" value="${temp.dir}/install-classes"/>
- <property name="tempinstall.dir" value="${temp.dir}/install"/>
- <property name="installer.zipfile" value="JDBCT4.zip" />
- <property name="temp.test" value="${temp.dir}/test" />
- <property name="vproc.java" value="org/trafodion/jdbc/t4/Vproc.java" />
- <property name="vproc.class" value="org.trafodion.jdbc.t4.Vproc" />
-
- <!-- output -->
- <property name="temp.src" value="${temp.dir}/src" />
- <property name="temp.classes" value="${temp.dir}/classes" />
- <property name="temp.lib" value="${temp.dir}/lib" />
-
- <!-- output files -->
- <property name="jdbcT4.jar" value="${temp.lib}/jdbcT4.jar" />
-
- <!-- CLEAN -->
- <target name="clean">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${temp.dir}"/>
- </delete>
- <delete file="${target.dir}/jdbcT4.jar"/>
- <delete file="${src.lib}/jdbcT4.jar"/>
- </target>
-
- <!-- INIT -->
- <target name="init">
- <mkdir dir="${temp.dir}" />
- <mkdir dir="${temp.classes}" />
- <mkdir dir="${temp.lib}" />
- <mkdir dir="${deploy.dir}"/>
- <mkdir dir="${client.dir}"/>
- </target>
-
- <!-- COMPILE -->
- <target name="compile" depends="init">
- <copy todir="${temp.src}">
- <fileset dir="${src.src}">
- <include name="**/*.java" />
- </fileset>
- </copy>
- <copy todir="${temp.classes}">
- <fileset dir="${src.src}">
- <include name="**/*.properties" />
- </fileset>
- <fileset dir="${src.notice}">
- <include name="NOTICE" />
- </fileset>
- </copy>
- <copy file="${src.lic}/Apache" tofile="${temp.classes}/LICENSE" />
-
- <replace file="${temp.src}/${vproc.java}" token="@@@@" value="${vproc.str}" />
- <javac destdir="${temp.classes}" srcdir="${temp.src}" debug="on" includes="**/*.java" classpath="${java.home}/lib/tools.jar;${temp.classes}" includeAntRuntime="false" />
- </target>
-
- <!-- LIB -->
- <target name="lib" depends="compile">
- <property file="${my_sqroot}/export/include/SCMBuildMan.mf"/>
- <jar destfile="${jdbcT4.jar}" basedir="${temp.classes}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="**/*.class" />
- <include name="**/*.properties" />
-
- <manifest>
- <attribute name="Main-Class" value="${vproc.class}" />
- <attribute name="Vproc" value="${vproc.str}" />
- <attribute name="Implementation-Version-1" value="Version 1.0.0"/>
- <attribute name="Implementation-Version-2" value="${Implementation-Version-2}"/>
- <attribute name="Implementation-Version-3" value="${Implementation-Version-3}"/>
- <attribute name="Implementation-Version-4" value="${Implementation-Version-4}"/>
- <attribute name="Implementation-Version-5" value="${Implementation-Version-5}"/>
- <attribute name="Implementation-Version-6" value="${Implementation-Version-6}"/>
- </manifest>
- </jar>
- <copy file="${jdbcT4.jar}" todir="${target.dir}"/>
- <copy file="${jdbcT4.jar}" todir="${src.lib}"/>
- </target>
-
- <!-- DEPLOY -->
- <target name="deploy" depends="lib">
- <copy todir="${deploy.dir}/lib">
- <fileset dir="${temp.dir}/lib" />
- </copy>
-
- <copy todir="${deploy.dir}/samples">
- <fileset dir="${src.samples}">
- </fileset>
- </copy>
-
- <zip destfile="${client.dir}/${installer.zipfile}" basedir="${deploy.dir}"/>
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9d450e99/core/conn/jdbc_type4/getBuildInfo
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/getBuildInfo b/core/conn/jdbc_type4/getBuildInfo
deleted file mode 100755
index 410a160..0000000
--- a/core/conn/jdbc_type4/getBuildInfo
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# @@@ 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 @@@
-
-buildId=`../../sqf/build-scripts/build.id`
-echo "bldId=$buildId" > buildId
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9d450e99/core/conn/jdbc_type4/test/RunAllTests.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type4/test/RunAllTests.java b/core/conn/jdbc_type4/test/RunAllTests.java
deleted file mode 100644
index 0de5f33..0000000
--- a/core/conn/jdbc_type4/test/RunAllTests.java
+++ /dev/null
@@ -1,31 +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 @@@ */
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.trafodion.jdbc.t4.T4DriverTest;
-
-@RunWith(Suite.class)
-@SuiteClasses({T4DriverTest.class})
-public class RunAllTests {
-
-}