You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/22 02:08:37 UTC

[3/6] incubator-trafodion git commit: trafci can use history cmd

trafci can use history cmd


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a88b4dce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a88b4dce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a88b4dce

Branch: refs/heads/master
Commit: a88b4dce9a34e287223c7cec7923654a3ef2ce0f
Parents: b111430
Author: mashengchen <ma...@gmail.com>
Authored: Tue Dec 13 08:19:15 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Thu Dec 15 09:05:51 2016 +0000

----------------------------------------------------------------------
 core/conn/trafci/Makefile                       |    4 +
 core/conn/trafci/build.xml                      |   10 +-
 core/conn/trafci/install/Installer.java-tmpl    | 6743 +++++++++---------
 core/conn/trafci/installer_pom.xml              |  214 +-
 core/conn/trafci/pom.xml                        |  239 +-
 .../java/org/trafodion/ci/ConsoleReader.java    |    9 +-
 .../src/main/java/org/trafodion/ci/Session.java |    2 +-
 .../trafci/src/main/resources/install_jar.xml   |  129 +-
 core/conn/trafci/utils/trafci_install.sh        |    2 +-
 9 files changed, 3672 insertions(+), 3680 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a88b4dce/core/conn/trafci/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/trafci/Makefile b/core/conn/trafci/Makefile
index 94d72c5..b608e79 100644
--- a/core/conn/trafci/Makefile
+++ b/core/conn/trafci/Makefile
@@ -35,3 +35,7 @@ Trafci_installer:
 Trafci_deploy:
 	zip -r ../clients/trafci.zip -j target/trafciInstaller.jar utils/README
 	java -jar target/trafciInstaller.jar -silent -jdbcFile ${TRAF_HOME}/export/lib/jdbcT4.jar -installDir ${TRAF_HOME}
+
+clean:
+	mvn -f installer_pom.xml clean
+	mvn -f pom.xml clean

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a88b4dce/core/conn/trafci/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/build.xml b/core/conn/trafci/build.xml
index 50030e2..2d1a3f6 100644
--- a/core/conn/trafci/build.xml
+++ b/core/conn/trafci/build.xml
@@ -48,16 +48,16 @@
     <property name="lib.dir" value="${base.dir}/lib"/>
     <property name="install.dir" value="${base.dir}/install"/>
     <property name="samples.dir" value="${base.dir}/samples"/>
-    <property name="vproc.class" value="org/trafodion/ci/Vproc.java"/>
+    <property name="vproc.class" value="main/java/org/trafodion/ci/Vproc.java"/>
     <property name="ciutils64dll.dll" value="WCIUtils64.dll"/>
     <property name="ciutilsdll.src.dir" value="${base.dir}/dllsrc/WCIUtils"/>
     <property name="ciutilsdll.dest.dir" value="${classes.dir}/org/trafodion/ci"/>
     <property name="Install.class" value="Installer.java"/>
     <property name="filter.class" value="filter.java"/>
-    <property name="Properties.src" value="${tempsrc.dir}/org/trafodion/ci/Properties"/>
-    <property name="Properties.dest" value="${classes.dir}/org/trafodion/ci/Properties"/>
-    <property name="help.src" value="${tempsrc.dir}/org/trafodion/ci/help"/>
-    <property name="help.dest" value="${classes.dir}/org/trafodion/ci/help"/>
+    <property name="Properties.src" value="${tempsrc.dir}/main/java/org/trafodion/ci/Properties"/>
+    <property name="Properties.dest" value="${classes.dir}/main/java/org/trafodion/ci/Properties"/>
+    <property name="help.src" value="${tempsrc.dir}/main/java/org/trafodion/ci/help"/>
+    <property name="help.dest" value="${classes.dir}/main/java/org/trafodion/ci/help"/>
     <property name="bin.dir" value="${temp.dir}/bin" />
     <property name="deploy.dir" value="${temp.dir}/deploy" />
     <property name="executable.jar" value="trafci.jar" />