You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2015/12/02 00:43:18 UTC
incubator-geode git commit: GEODE-301 Generate
pulseversion.properties file from gradle build. Other cleanups for tests and
old build files
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-12 2710a4229 -> 28eb8535d
GEODE-301 Generate pulseversion.properties file from gradle build. Other cleanups for tests and old build files
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/28eb8535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/28eb8535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/28eb8535
Branch: refs/heads/feature/GEODE-12
Commit: 28eb8535ddb510f5e4afca6eccc7269ba3f83031
Parents: 2710a42
Author: Nitin Lamba <ni...@ampool.io>
Authored: Tue Nov 17 19:16:01 2015 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Dec 1 15:38:34 2015 -0800
----------------------------------------------------------------------
pulse/.classpath | 120 ----
pulse/.project | 36 --
pulse/build.bat | 50 --
pulse/build.gradle | 63 +-
pulse/build.sh | 157 -----
pulse/build.xml | 604 -------------------
pulse/buildfiles/dependencies.xml | 6 -
pulse/buildfiles/osplatform.xml | 69 ---
pulse/buildfiles/utilities.xml | 33 -
.../src/main/resources/pulseversion.properties | 14 -
.../gemfire/tools/pulse/testbed/TestBed.java | 10 +-
.../gemfire/tools/pulse/tests/PulseTests.java | 2 +-
.../pulse/tests/junit/BaseServiceTest.java | 10 +-
13 files changed, 75 insertions(+), 1099 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/.classpath
----------------------------------------------------------------------
diff --git a/pulse/.classpath b/pulse/.classpath
deleted file mode 100644
index 0052fa2..0000000
--- a/pulse/.classpath
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.springsource.sts.ide.tomcat.runtimeTarget/VMware vFabric tc Server Developer Edition (Runtime) v2.7">
- <attributes>
- <attribute name="owner.project.facets" value="jst.web"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="ext-libs/spring-security-config-3.1.4.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-security-core-3.1.4.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-security-web-3.1.4.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/com.springsource.org.apache.commons.beanutils-1.8.0.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/com.springsource.org.apache.commons.collections-3.2.0.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/com.springsource.org.apache.commons.digester-1.8.1.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/com.springsource.org.apache.commons.logging-1.1.1.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/commons-lang-2.6.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="src/main/resources">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/classes"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/servlet-api-2.5-20081211.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="ext-libs/selenium-server-standalone-2.41.0.jar"/>
- <classpathentry kind="var" path="GCM_DIR/where/java/apache-tomcat/7.0.30/ecj-3.7.2.jar"/>
- <classpathentry kind="var" path="GCM_DIR/where/java/apache-tomcat/7.0.30/tomcat-embed-core.jar"/>
- <classpathentry kind="var" path="GCM_DIR/where/java/apache-tomcat/7.0.30/tomcat-embed-jasper.jar"/>
- <classpathentry kind="var" path="GCM_DIR/where/java/apache-tomcat/7.0.30/tomcat-embed-logging-juli.jar"/>
- <classpathentry kind="lib" path="ext-libs/spring-aop-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-beans-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-context-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-core-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-expression-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-web-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-webmvc-3.2.9.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-ldap-core-1.3.1.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-security-ldap-3.1.4.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext-libs/spring-tx-3.0.5.RELEASE.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="PULSE_OUTPUT/classes"/>
-</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/.project
----------------------------------------------------------------------
diff --git a/pulse/.project b/pulse/.project
deleted file mode 100644
index 7c21b55..0000000
--- a/pulse/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Pulse</name>
- <comment>Pivotal GemFire Monitoring Application</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/build.bat
----------------------------------------------------------------------
diff --git a/pulse/build.bat b/pulse/build.bat
deleted file mode 100755
index 366166e..0000000
--- a/pulse/build.bat
+++ /dev/null
@@ -1,50 +0,0 @@
-@echo off
-set scriptdir=%~dp0
-set BASEDIR=%scriptdir:\buildfiles\=%
-if exist "%BASEDIR%\build.xml" @goto baseok
-echo Could not determine BASEDIR location
-verify other 2>nul
-goto done
-:baseok
-
-set GEMFIRE=
-
-if not defined GCMDIR (
- set GCMDIR=J:\
-)
-if not exist %GCMDIR% (
- echo "ERROR: unable to locate GCMDIR %GCMDIR% maybe you forgot to map the J: network drive to //samba/gcm"
- verify other 2>nul
- goto done
-)
-
-set LDAP_SERVER_FQDN=ldap.gemstone.com
-if exist \\inf1\shared\users (
- set LDAP_SERVER_FQDN=ldap.pune.gemstone.com
-)
-
-set JAVA_HOME=%GCMDIR%\where\jdk\1.6.0_26\x86.Windows_NT
-if defined ALT_JAVA_HOME (
- set JAVA_HOME=%ALT_JAVA_HOME%
-)
-set ANT_HOME=%GCMDIR%\where\java\ant\apache-ant-1.8.2
-if defined ALT_ANT_HOME (
- set ANT_HOME=%ALT_ANT_HOME%
-)
-set ANT_ARGS=%ANT_ARGS% -lib %GCMDIR%\where\java\jcraft\jsch\jsch-0.1.44\jsch-0.1.44.jar
-set PATHOLD=%PATH%
-set PATH=%JAVA_HOME%\bin;%PATH%
-
-echo JAVA_HOME = %JAVA_HOME%
-echo ANT_HOME = %ANT_HOME%
-echo CLASSPATH = %CLASSPATH%
-echo %DATE% %TIME%
-
-echo running %ANT_HOME%\bin\ant.bat
-call %ANT_HOME%\bin\ant.bat %*
-if not defined ERRORLEVEL set ERRORLEVEL=0
-
-:done
-echo %ERRORLEVEL% > .xbuildfailure
-set ERRORLEVEL=
-if defined PATHOLD set PATH=%PATHOLD%
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/build.gradle
----------------------------------------------------------------------
diff --git a/pulse/build.gradle b/pulse/build.gradle
index 509ada1..b0f5855 100755
--- a/pulse/build.gradle
+++ b/pulse/build.gradle
@@ -1,4 +1,18 @@
+buildscript {
+ repositories {
+ maven {
+ url "https://plugins.gradle.org/m2/"
+ }
+ }
+ dependencies {
+ classpath "org.ajoberstar:gradle-git:1.3.2"
+ }
+}
+
apply plugin: 'war'
+apply plugin: 'org.ajoberstar.grgit'
+
+def resDir="$projectDir/src/main/resources"
sourceSets {
main {
@@ -33,7 +47,6 @@ dependencies {
provided 'org.mortbay.jetty:servlet-api:2.5-20081211'
provided 'com.google.guava:guava:15.0'
- testCompile 'junit:junit:4.12'
testCompile 'org.apache.tomcat.embed:tomcat-embed-core:7.0.30'
testCompile 'org.apache.tomcat.embed:tomcat-embed-jasper:7.0.30'
testCompile 'org.apache.tomcat.embed:tomcat-embed-logging-juli:7.0.30'
@@ -50,8 +63,55 @@ dependencies {
}
+// Creates the version properties file and writes it to the resources dir
+task createPulsePropFile {
+ description 'Creates a new Pule properties file with build/ version information'
+ def propertiesFile = file(resDir + "/pulseversion.properties");
+ outputs.file propertiesFile
+ inputs.dir resDir
+
+ doLast {
+ try {
+ def grgit = org.ajoberstar.grgit.Grgit.open()
+ ext.branch = grgit.branch.getCurrent().name
+ ext.commitId = grgit.head().id
+ ext.sourceDate = grgit.head().getDate().format('yyyy-MM-dd HH:mm:ss Z')
+ grgit.close()
+ } catch (Exception e) {
+ logger.warn('***** Unable to find Git workspace. Using default version information *****')
+ ext.branch = 'UNKNOWN'
+ }
+ // Build machine & java information - for screen output only
+ ext.osArch = System.getProperty('os.arch')
+ ext.osName = System.getProperty('os.name')
+ ext.osVersion = System.getProperty('os.version')
+ ext.jdkVersion = System.getProperty('java.version')
+ println ':pulse: Build Platform: ' + ext.osName + ' ' + ext.osVersion + ' ' + ext.osArch
+ println ':pulse: ...Using Java: ' + ext.jdkVersion
+
+ ext.buildDate = new Date().format('yyyy-MM-dd HH:mm:ss Z')
+ ext.buildNumber = new Date().format('MMddyy')
+
+ def props = [
+ "pulse.version" : version,
+ "Build-Id" : ext.buildNumber,
+ "Build-Date" : ext.buildDate,
+ "Source-Date" : ext.sourceDate,
+ "Source-Revision" : ext.commitId,
+ "Source-Repository" : ext.branch
+ ] as Properties
+
+ new FileOutputStream(propertiesFile).withStream { fos ->
+ props.store(fos, '')
+ }
+ }
+}
+
jar {
from sourceSets.main.output
+ doFirst {
+ project.createPulsePropFile
+ }
}
artifacts {
@@ -61,6 +121,7 @@ artifacts {
def pulseWarFile = "pulse.war"
war {
+ dependsOn createPulsePropFile
// TODO include the jar but exclude the classes from the war file?
// classpath jar
// rootSpec.exclude("**/*.class")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/build.sh
----------------------------------------------------------------------
diff --git a/pulse/build.sh b/pulse/build.sh
deleted file mode 100755
index 0a9f8d2..0000000
--- a/pulse/build.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-# Set BASEDIR to be the toplevel checkout directory.
-# We do this so that BASEDIR can be used elsewhere if needed
-#set -xv
-exec 0<&-
-BASEDIR=`/usr/bin/dirname $0`
-OLDPWD=$PWD
-cd $BASEDIR
-export BASEDIR=`/usr/bin/dirname $PWD`
-cd $OLDPWD
-
-unset CLASSPATH
-export CLASSPATH
-
-unset GEMFIRE
-export GEMFIRE
-
-PING="ping -c 1"
-if [ `uname` = "SunOS" ]; then
- export GCMDIR=${GCMDIR:-"/gcm"}
- export JAVA_HOME=${ALT_JAVA_HOME:-$GCMDIR/where/jdk/1.6.0_26/sparc.Solaris}
- # for JVM debugging
- # export JAVA_HOME=/export/avocet2/users/otisa/j2se142debug
- logfile=buildSol.log
- if [ -d "/export/std11_gfe/bin" ]; then
- # Studio 11 version CC: Sun C++ 5.8 Patch 121017-05 2006/08/30
- export SunCompilerDir=/export/std11_gfe/bin
- else
- echo "Sun Studio 11 compiler not found";
- fi
-
- # Studio 11 version CC: Sun C++ 5.8 Patch 121017-05 2006/08/30
- SunCompilerVer=`$SunCompilerDir/CC -V 2>&1 `
- echo "Using Studio 11 at $SunCompilerDir "
- echo " version: $SunCompilerVer "
-
-elif [ `uname` = "Darwin" ]; then
- export GCMDIR=${GCMDIR:-"/export/gcm"}
- export JAVA_HOME=${ALT_JAVA_HOME:-/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home}
- if [ ! -d $JAVA_HOME ]; then
- echo "Upgrade to Leopard Please, or set ALT_JAVA_HOME to the soylatte VM"
-cat << __HERE__
- Upgrade to Leopard Please, or set ALT_JAVA_HOME to the soylatte VM
- #example setup
- export ALT_JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home
- #Also add these to buildmac.properties
- javac.secondary=${gcm.dir}/where/jdk/1.6.0_3/i386.darwin
- default.testVM=${gcm.dir}/where/jdk/1.6.0_3/i386.darwin
- default.testVM64=${gcm.dir}/where/jdk/1.6.0_3/i386.darwin
-__HERE__
- exit 1
- fi
- export GccCCompiler=/usr/bin/gcc
- export GccCplusplusCompiler=/usr/bin/g++
- GccCompilerVer=`$GccCCompiler --version | head -1 2>&1 `
- export GccMajorVer="3"
- echo "Using gcc version: $GccCompilerVer"
- logfile=buildMac.log
- export PATH=`dirname $GccCplusplusCompiler`:$PATH
-
-elif [ `uname` = "Linux" ]; then
- export GCMDIR=${GCMDIR:-"/gcm"}
- export JAVA_HOME=${ALT_JAVA_HOME:-$GCMDIR/where/jdk/1.6.0_26/x86.linux}
- #export JAVA_HOME=/export/avocet2/users/otisa/j2se142debugLinux
-
- export GccCCompiler=/usr/bin/gcc
- export GccCplusplusCompiler=/usr/bin/g++
- GccCompilerVer=`$GccCCompiler --version | head -1 2>&1 `
- export GccMajorVer="3"
-
- echo "Using gcc version: $GccCompilerVer"
- logfile=buildLinux.log
- export PATH=`dirname $GccCplusplusCompiler`:$PATH
- # set vars for mono if available
- if which xbuild >/dev/null 2>/dev/null; then
- export XBUILD="`which xbuild`"
- export MONO="`which mono`"
- fi
-elif [ `uname` = "AIX" ]; then
- export GCMDIR=${GCMDIR:-"/gcm"}
- export JAVA_HOME=${ALT_JAVA_HOME:-$GCMDIR/where/jdk/1.6.0-ibm/RISC6000.AIX}
- #export GccCCompiler=/bin/gcc
- #export GccCplusplusCompiler=/bin/g++
- #GccCompilerVer=`$GccCCompiler --version | head -1 2>&1 `
- #export GccMajorVer="4"
- #echo "Using gcc version: $GccCompilerVer"
- logfile=buildAIX.log
- #export PATH=`dirname $GccCplusplusCompiler`:$PATH
- NO_BUILD_LOG=1
-else
- echo "Defaulting to Windows build"
- # unset TERMCAP since it causes issues when used
- # with windows environment variables
- unset TERMCAP
- # suppress DOS path warnings
- if [ -z "${CYGWIN}" ]; then
- export CYGWIN="nodosfilewarning"
- else
- export CYGWIN="${CYGWIN} nodosfilewarning"
- fi
-
- PING="ping -n 1"
- rm -f .xbuildfailure
- cmd.exe /c .\\build.bat "$@"
- if [ -r .xbuildfailure ]; then
- read stat <.xbuildfailure
- rm -f .xbuildfailure
- exit $stat
- fi
-
-fi
-
-# setup the LDAP server for Pune/Beaverton networks;
-
-if [ -z "${LDAP_SERVER_FQDN}" ]; then
- if expr `$PING ldap.pune.gemstone.com | sed -n 's/^.* time[^ ]\([0-9\.]*\).*$/\1/p'` '<' 50 >/dev/null 2>/dev/null; then
- LDAP_SERVER_FQDN="ldap.pune.gemstone.com"
- else
- LDAP_SERVER_FQDN="ldap.gemstone.com"
- fi
-fi
-export LDAP_SERVER_FQDN
-echo "Using LDAP server: $LDAP_SERVER_FQDN"
-
-export ANT_HOME=${ALT_ANT_HOME:-$GCMDIR/where/java/ant/apache-ant-1.8.2}
-export ANT_ARGS="$ANT_ARGS -lib $GCMDIR/where/java/jcraft/jsch/jsch-0.1.44/jsch-0.1.44.jar"
-export ANT_OPTS="-Xmx384m -Dhttp.proxyHost=proxy.eng.vmware.com -Dhttp.proxyPort=3128"
-export PATH=$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
-
-function logant {
-# if [[ `uname` == "SunOS" || `uname` == "Linux" || `uname` == "AIX" ]]; then
- rm -f .xbuildfailure
- ( $ANT_HOME/bin/ant --noconfig "$@" || echo "$?" > .xbuildfailure ) 2>&1 | tee $logfile
- if [ -r .xbuildfailure ]; then
- read stat <.xbuildfailure
- rm -f .xbuildfailure
- exit $stat
- fi
-# else
- # cygwin tee causes hang on windows
-# $ANT_HOME/bin/ant --noconfig -DuseSSH=false "$@"
-# fi
-}
-
-echo "JAVA_HOME = $JAVA_HOME"
-echo "ANT_HOME = $ANT_HOME"
-echo "CLASSPATH = $CLASSPATH"
-date
-
-# ant likes to be in the directory that build.xml is in
-if [[ "x$NO_BUILD_LOG" = "x" ]]; then
- logant "$@"
-else
- echo "running $ANT_HOME/bin/ant "
- $ANT_HOME/bin/ant --noconfig "$@"
-fi
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/build.xml
----------------------------------------------------------------------
diff --git a/pulse/build.xml b/pulse/build.xml
deleted file mode 100644
index f7307a1..0000000
--- a/pulse/build.xml
+++ /dev/null
@@ -1,604 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="pulse" default="usage" basedir=".">
-
- <target depends="usage" name="help"/>
-
- <target name="usage">
- <description>Prints information about what can be built</description>
-
- <echo>
-Commonly used targets:
- build-product Builds product into product dist
- pack-RNotes Creates ReleaseNotes from RNDeltaNotes.txt
- compile-tests Builds tests
- run-tests Run tests
- precheckin Does an update-svn, clean, build-all, run-tests
- usage (or help) Prints this help information
-
-Available targets:
- build-all Cleans, Compiles source and tests, and creates pulse warfile
- clean Cleans all byproducts of building
-
-Command Line Defines:
- -DSOMESWITCH=dir NOT IMPLEMENTED
- </echo>
- </target>
-
- <!-- Property reference to environment variables -->
- <property environment="myenv"/>
-
- <taskdef resource="com/gemstone/tools/ant/taskdefs/buildtasks.properties"
- classpath="${basedir}/buildfiles/taskdefsV10.jar"/>
- <!-- determine machine and os, and if this is a 32 bit only or 64 bit only pla
-tform -->
- <import file="buildfiles/osplatform.xml"/>
-
- <property name="gcm.dir" value="${myenv.GCMDIR}"/>
-
- <!-- import any properties defined in a properties file -->
- <available file="${basedir}/build${gf.os}.properties" property="build.os.exists"/>
- <conditional if="build.os.exists">
- <echo message="Loading properties from ${basedir}/build${gf.os}.properties:" level="info"/>
- <property file="${basedir}/build${gf.os}.properties"/>
- <concat>
- <filelist dir="${basedir}" files="build${gf.os}.properties"/>
- </concat>
- </conditional>
-
- <available file="${basedir}/build.properties" property="build.props.exists"/>
- <conditional if="build.props.exists">
- <echo message="Loading properties from ${basedir}/build.properties:" level="info"/>
- <property file="${basedir}/build.properties"/>
- <concat>
- <filelist dir="${basedir}" files="build.properties"/>
- </concat>
- </conditional>
-
- <!-- include external xml files here -->
- <import file="buildfiles/dependencies.xml"/>
- <import file="buildfiles/utilities.xml"/>
-
- <property name="build.dir" value="${basedir}/build-artifacts"/>
- <property name="osbuild.dir" value="${build.dir}/${gf.os}"/>
- <property name="app.name" value="pulse"/>
- <property name="app.path" value="/${app.name}"/>
- <property name="pulse.version" value="8.1.0"/>
- <property name="target.dir" value="${osbuild.dir}/target"/>
- <property name="dist.dir" value="${osbuild.dir}/dist"/>
- <property name="src.dir" value="${basedir}/src/main/java"/>
- <property name="classes.dir" value="${target.dir}/WEB-INF/classes"/>
- <property name="tests.dir" value="${basedir}/src/test/java"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
- <property name="tests.classes.dir" value="${target.dir}/tests/classes"/>
- <property name="tests.results.dir" value="${target.dir}/tests/results"/>
- <property name="web.dir" value="${basedir}/src/main/webapp"/>
- <property name="application.lib.home" value="${web.dir}/WEB-INF/lib"/>
- <property name="application.extlib.home" value="${basedir}/ext-libs"/>
- <property name="properties.dir" value="${target.dir}/properties"/>
-
- <property name="compile.debug" value="true"/>
- <property name="compile.deprecation" value="false"/>
- <property name="compile.optimize" value="true"/>
- <property name="compile-gemfire.deprecation" value="off"/>
-
- <path id="src.compile.classpath">
- <!-- Application Libraries -->
- <fileset dir="${application.extlib.home}">
- <include name="*.jar"/>
- <exclude name="selenium*.jar"/>
- <exclude name="junit*.jar"/>
- </fileset>
- </path>
-
- <path id="test.compile.classpath">
- <pathelement location="${gcm.dir}/where/java/apache-tomcat/7.0.30/tomcat-embed-core.jar"/>
- <pathelement location="${gcm.dir}/where/java/apache-tomcat/7.0.30/tomcat-embed-jasper.jar"/>
- <pathelement location="${gcm.dir}/where/java/apache-tomcat/7.0.30/tomcat-embed-logging-juli.jar"/>
- <pathelement location="${application.extlib.home}/commons-codec-1.6.jar"/>
- <pathelement location="${application.extlib.home}/commons-logging-1.1.3.jar"/>
- <pathelement location="${application.extlib.home}/fluent-hc-4.3.3.jar"/>
- <pathelement location="${application.extlib.home}/httpclient-4.3.3.jar"/>
- <pathelement location="${application.extlib.home}/httpclient-cache-4.3.3.jar"/>
- <pathelement location="${application.extlib.home}/httpcore-4.3.2.jar"/>
- <pathelement location="${application.extlib.home}/httpmime-4.3.3.jar"/>
- <pathelement location="${application.extlib.home}/junit-4.10.jar"/>
- <pathelement location="${application.extlib.home}/selenium-server-standalone-2.41.0.jar"/>
- </path>
-
- <!-- TARGETS -->
-
- <target name="build-run-tests" depends="build-all, run-tests"/>
-
- <target name="precheckin" depends="update-svn, clean, build-all, run-tests"/>
-
- <target name="build-all" depends="clean, build-product, compile-tests" description="Clean build and dist directories, then compile"/>
-
- <target name="build-product-RNotes" depends="build-product, pack-RNotes" description="Compile and create dist with Release Notes"/>
-
- <target name="build-product" depends="dist" description="Compile and create dist"/>
-
- <target name="all" depends="build-all" description="Compile and create dist"/>
-
- <target name="props">
-
- <!-- these two lines get hostname without requiring cygwin on windows -->
- <exec executable="hostname"
- failifexecutionfails="false"
- outputproperty="myenv.COMPUTERNAME"/>
- <property name="host.name" value="${myenv.COMPUTERNAME}"/>
-
- <echo message="osbuild.dir is ${osbuild.dir}" level="info"/>
- <echo message="Running on ${host.name}" level="info"/>
-
- <property name="compile-gemfire.deprecation" value="off"/>
-
- <!-- Do not allow build artifacts to be place on the filer -->
- <fail message="Build artifacts cannot reside on the filer (${osbuild.dir}). Please use a build properties file">
- <condition>
- <contains string="${osbuild.dir}" substring="shared_build"
- casesensitive="false"/>
- </condition>
- </fail>
-
- <mkdir dir="${osbuild.dir}"/>
- <property name="src.dir" value="${basedir}/src"/>
-
- <property name="last.update.file" value="lastUpdate.txt"/>
- <property name="date.pattern" value="MM/dd/yyyy HH:mm:ss z"/>
-
- <tstamp>
- <format pattern="yyyy-MM-dd-hh-mm-ss-SSS" property="sys.build.time"/>
- <format pattern="${date.pattern}" property="build.time"/>
- </tstamp>
-
- <antcall target="make-last-update"/>
- <!-- If svn was manually run then update lastUpdate.txt and build.number -->
- <uptodate property="makelastupdate.Required"
- srcfile="${build.dir}/${last.update.file}"
- targetfile="${basedir}/.svn/entries"/>
-
- <conditional if="makelastupdate.Required">
- <antcall target="make-last-update"/>
- <property name="skipLastUpdate" value="true"/>
- </conditional>
-
- </target>
-
- <target name="clean" depends="props" description="Delete old build and dist directories">
- <delete dir="${osbuild.dir}"/>
- </target>
-
- <target name="prepare" depends="props">
- <!-- Create staging directories as needed -->
- <mkdir dir="${target.dir}"/>
- <mkdir dir="${target.dir}/WEB-INF"/>
- <mkdir dir="${classes.dir}"/>
-
- <!-- Copy static content, jsps and web.xml of this web application -->
- <copy todir="${target.dir}">
- <fileset dir="${web.dir}"/>
- </copy>
-
- <!-- Copy external dependencies as required -->
- <mkdir dir="${target.dir}/WEB-INF/lib"/>
-
- </target>
-
- <target name="compile" depends="prepare" description="Compile Java sources">
- <!-- Compile Java classes as necessary -->
- <echo level="info" message="Compiling Pulse source..."/>
- <javac srcdir="${src.dir}"
- destdir="${classes.dir}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}" includeantruntime="false">
- <classpath refid="src.compile.classpath"/>
- </javac>
-
- <!-- Copy application resources -->
- <copy todir="${classes.dir}">
- <fileset dir="${src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
-
- <target name="dist" depends="compile" description="Create binary distribution">
- <!-- Copy Open Source File -->
- <copy file="release/3rdparty_licenses/open_source_licenses-Pivotal_GemFire_Pulse_8.1.0.txt" tofile="${target.dir}/oslicenses.txt"/>
-
- <!-- Copy dependent libs -->
- <copy file="ext-libs/spring-security-core-3.1.4.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-security-web-3.1.4.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-security-config-3.1.4.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
-
- <copy file="ext-libs/spring-core-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-web-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-beans-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-context-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-expression-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-aop-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-webmvc-3.2.9.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
-
- <copy file="ext-libs/com.springsource.org.apache.commons.beanutils-1.8.0.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/com.springsource.org.apache.commons.collections-3.2.0.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/com.springsource.org.apache.commons.digester-1.8.1.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/com.springsource.org.apache.commons.logging-1.1.1.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/commons-lang-2.6.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-ldap-core-1.3.1.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-security-ldap-3.1.4.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
- <copy file="ext-libs/spring-tx-3.0.5.RELEASE.jar" todir="${target.dir}/WEB-INF/lib"/>
-
-
- <copy file="src/main/resources/pulse-users.properties" todir="${target.dir}/WEB-INF/classes"/>
-
- <!-- Copy All Locale files -->
- <copy todir="${classes.dir}">
- <fileset dir="src/main/resources">
- <include name="**/LogMessages*.properties"/>
- <!--<include name="**/pulse.properties"/>-->
- </fileset>
- </copy>
-
- <!-- Product and internationalization files -->
- <copy todir="${properties.dir}">
- <fileset dir="src/main/resources">
- <include name="**/default.properties"/>
- <include name="**/gemfire.properties"/>
- <include name="**/sqlfire.properties"/>
- </fileset>
- </copy>
-
- <!-- Create pulse.properties file for including in WAR -->
- <property file="${build.dir}/${last.update.file}"/>
- <property file="${build.dir}/build.number"/>
- <propertyfile comment="Pulse Properties File" file="${classes.dir}/pulseversion.properties">
- <entry key="pulse.version" value="${pulse.version}"/>
- <entry key="Build-Id" value="${user.name} ${build.number}"/>
- <entry key="Build-Date" value="${build.time}"/>
- <entry key="Source-Date" value="${source.date}"/>
- <entry key="Source-Revision" value="${source.revision}"/>
- <entry key="Source-Repository" value="${source.branch}"/>
- </propertyfile>
-
- <!-- Create application JAR/WAR file -->
- <jar jarfile="${dist.dir}/${app.name}-${pulse.version}.war"
- basedir="${target.dir}"/>
-
- </target>
-
- <target name="update-git" depends="props">
- <description>Updates the sources to latest revision.</description>
-
- <property name="git.logfile" value="update-git.log"/>
- <property name="git.hist.logfile" value=".git-history.log"/>
- <property name="git.branch" value=".git/.git-branch.log"/>
- <delete file="${git.logfile}" quiet="true"/>
-
- <!-- Need finally block for git pull because it may actually
- perform a lot of updates before failing, and we want to capture
- those in .git-history.log -->
- <trycatch>
- <try>
- <exec executable="git" resultproperty="gitpullExitStatus" output="${git.logfile}">
- <arg value="pull"/>
- </exec>
- </try>
- <finally>
- <exec executable="git" append="true" output="${git.logfile}">
- <arg value="status"/>
- </exec>
- </finally>
- </trycatch>
-
- <condition property="gitpullFailed">
- <equals arg1="${gitpullExitStatus}" arg2="1"/>
- </condition>
- <if>
- <isset property="gitpullFailed"/>
- <then>
- <exec executable="cat" >
- <arg value="${git.logfile}"/>
- </exec>
- <fail if="gitpullFailed" message="git pull failed. See ${git.logfile} for details."/>
- </then>
- </if>
-
- <antcall inheritAll="true" target="make-last-update"/>
-
- <concat append="true" fixlastline="true" destfile="${git.hist.logfile}" >
-==============================
-</concat> <!-- Leave the two lines above as is so they concat properly -->
-
- <concat append="true" fixlastline="true" destfile="${git.hist.logfile}">
- <filelist dir="${basedir}" files="build-artifacts/build.number"/>
- <filelist dir="${basedir}" files="${git.logfile}"/>
- </concat>
- </target>
-
- <target name="rcs-init">
- <available file=".git" type="dir" property="git.present"/>
- <available file=".svn" type="dir" property="svn.present"/>
- </target>
-
- <target name="make-last-update" depends="rcs-init" unless="skipLastUpdate">
- <description>Creates a file that contains the time at which the
- GemFire checkout was last updated</description>
-
- <mkdir dir="${build.dir}"/>
-
- <!-- Make Last Update File with SVN workspace -->
- <if>
- <isset property="svn.present"/>
- <then>
- <delete file="${build.dir}/${last.update.file}" quiet="true"/>
- <echo level="info" message="Querying SVN Workspace Information" />
- <svnSetting client="cli" dateformatter="MM/dd/yyyy HH:mm:ss z" id="svn.settings"/>
- <!-- Get svn info of the SVN workspace -->
- <svn refid="svn.settings">
- <info target="."/>
- </svn>
- <propertyregex property="source.branch"
- input="${svn.info.url}"
- regexp="^https\:\/\/svn\.gemstone\.com\/repos\/"
- replace=""
- casesensitive="false" />
- </then>
- <elseif>
- <isset property="git.present"/>
- <then>
- <property name="git.status" value="${basedir}/.git/.git-status.log"/>
- <echo level="info" message="Querying GIT Workspace Information..." />
-
- <exec executable="git" failonerror="false" output="${git.status}">
- <arg value="log"/>
- <arg value="--grep=git-svn-id"/>
- <arg value="-1"/>
- </exec>
-
- <exec executable="git" failonerror="false" outputproperty="GIT.source.branch">
- <arg value="rev-parse"/>
- <arg value="--abbrev-ref"/>
- <arg value="HEAD"/>
- </exec>
- <exec executable="git" failonerror="false" outputproperty="GIT.source.revision">
- <arg value="rev-parse"/>
- <arg value="HEAD"/>
- </exec>
- <exec executable="git" failonerror="false" outputproperty="GIT.source.date">
- <arg value="show"/>
- <arg value="-s"/>
- <arg value="--format=%cD"/>
- <arg value="${GIT.source.revision}"/>
- </exec>
- </then>
- </elseif>
- <else>
- <echo level="info" message="No revision control information found"/>
- </else>
- </if>
-
- <!-- Load lastUpdate.txt properties with prefix to avoid setting -->
- <property file="${build.dir}/${last.update.file}" prefix="PROP" prefixValues="true"/>
-
- <if>
- <equals arg1="${GIT.source.revision}" arg2="${PROP.source.revision}" />
- <then>
- <echo message="Source revision hasn't changed. Skipping property file update..." />
- </then>
- <else>
- <!-- Create LastUpdate Property File -->
- <echo message="Updating build-artifacts property files..." level="info"/>
-
- <property name="git.status" value="${basedir}/.git/.git-status.log"/>
- <delete file="${git.status}" quiet="true"/>
- <delete file="${build.dir}/${last.update.file}" quiet="true"/>
-
- <propertyfile comment="Information about a checkout" file="${build.dir}/${last.update.file}">
- <entry key="source.branch" value="${GIT.source.branch}"/>
- <entry key="source.date" value="${GIT.source.date}"/>
- <entry key="source.revision" value="${GIT.source.revision}"/>
- </propertyfile>
-
- <!-- This use to be the revision but is now a date string -->
- <tstamp>
- <format property="build.number" pattern="MMddyy"/>
- </tstamp>
-
- <delete file="${build.dir}/build.number" quiet="true"/>
- <propertyfile comment="Build Number File" file="${build.dir}/build.number">
- <entry key="build.number" value="${build.number}"/>
- </propertyfile>
- </else>
- </if>
-
- <!-- Load lastUpdate.txt to set properties and print banner -->
- <property file="${build.dir}/${last.update.file}"/>
- <property file="${build.dir}/build.number"/>
- <echo message="" level="info"/>
- <echo message="=========================================" level="info"/>
- <echo message="Version: ${pulse.version} ${user.name} ${build.number}" level="info"/>
- <echo message="Source-branch: ${source.branch}" level="info"/>
- <echo message="Source-Date: ${source.date}" level="info"/>
- <echo message="Source-Revision: ${source.revision}" level="info"/>
- <echo message="=========================================" level="info"/>
-
- </target>
-
- <target name="update-svn" depends="props">
- <description>Updates the current checkout revision.</description>
-
- <property name="svn.logfile" value="update-svn.log"/>
- <property name="svn.hist.logfile" value=".svn-history.log"/>
- <delete file="${svn.logfile}" quiet="true"/>
-
- <!-- Need finally block for svn update because it may actually
- perform a lot of updates before failing, and we want to capture
- those in .svn-history.log -->
- <trycatch>
- <try>
- <exec executable="svn" failonerror="true" output="${svn.logfile}">
- <arg value="update"/>
- <arg value="--accept"/>
- <arg value="postpone"/>
- </exec>
- </try>
- <finally>
- <exec executable="svn" append="true" output="${svn.logfile}">
- <arg value="status"/>
- </exec>
- </finally>
- </trycatch>
- <antcall target="make-last-update"/>
-
- <concat append="true" fixlastline="true" destfile="${svn.hist.logfile}" >
-==============================
-</concat> <!-- Leave the two lines above as is so they concat properly -->
-
- <concat append="true" fixlastline="true" destfile="${svn.hist.logfile}">
- <filelist dir="${basedir}" files="build-artifacts/build.number"/>
- <filelist dir="${basedir}" files="${svn.logfile}"/>
- </concat>
-
- <echo message="Checking for update conflicts in ${svn.logfile}" level="info"/>
-
- <exec executable="grep" resultproperty="grepExitStatus">
- <arg value="^C "/>
- <arg value="${svn.logfile}"/>
- </exec>
- <condition property="grepFailed">
- <equals arg1="${grepExitStatus}" arg2="0"/>
- </condition>
-
- <fail if="grepFailed" message="SVN update conflicts detected."/>
- </target>
-
- <target name="pack-RNotes" depends="props">
- <delete file="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt" quiet="true"/>
- <property file="${build.dir}/build.number"/>
- <property file="${build.dir}/lastUpdate.txt"/>
-
- <copy file="${basedir}/release/docfiles/ReleaseNotes.txt"
- tofile="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt"/>
-
- <concat append="true" fixlastline="true" destfile="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt" >
---------------------------------
- Changes in ${pulse.version} ${user.name} ${build.number}
- Source-Revision=${source.revision}
- Build-Date=${build.time}
---------------------------------
-</concat>
-
- <concat append="true" fixlastline="true" destfile="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt">
- <filelist dir="${basedir}" files="RNDeltaChanges.txt"/>
- </concat>
-
- <!-- Place updates of files with intention they can be checked in -->
- <replace file="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt">
- <replacetoken><![CDATA[#]]></replacetoken>
- <replacevalue><![CDATA[]]></replacevalue>
- </replace>
-
- <replace file="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt">
- <replacetoken><![CDATA[
- Please keep text to 78 char width - no wider than this
-]]></replacetoken>
- <replacevalue><![CDATA[]]></replacevalue>
- </replace>
-
- <copy file="${dist.dir}/Pulse_${pulse.version}_ReleaseNotes.txt"
- tofile="${basedir}/release/docfiles/ReleaseNotes.txt.UPDATE"/>
-
- <copy file="${basedir}/RNDeltaChanges.txt"
- tofile="${basedir}/RNDeltaChanges.txt.UPDATE"/>
- </target>
-
- <target name="compile-tests" depends="compile">
-
- <mkdir dir="${tests.classes.dir}"/>
- <echo level="info" message="Compiling Pulse tests..."/>
- <javac srcdir="${tests.dir}"
- destdir="${tests.classes.dir}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- includeantruntime="false"
- fork="yes"
- verbose="no">
- <classpath>
- <path refid="test.compile.classpath"/>
- <pathelement location="${target.dir}/WEB-INF/classes"/>
- </classpath>
- </javac>
-
- </target>
-
- <!-- Automate deployment of Pulse to standalone tomcat server -->
- <target name="run-tests" depends="compile-tests">
- <!-- Set default properties for pulse.url-->
- <property name="pulsewarfile" value="${dist.dir}/${app.name}-${pulse.version}.war"/>
-
- <mkdir dir="${tests.results.dir}"/>
- <echo level="info" message="Running Tests..."/>
-
- <!-- Currently there are only GUI (web browser) tests which require access to Pulse running -->
- <junit printsummary="yes"
- failureProperty="tests.failed"
- haltOnFailure="false">
- <assertions>
- <enable/>
- </assertions>
- <sysproperty key="pulse.propfile" value="${tests.resources.dir}/test.properties"/>
- <sysproperty key="pulse.war" value="${pulsewarfile}"/>
- <sysproperty key="pulse-host" value="${pulse-host}"/>
- <sysproperty key="pulse-port" value="${pulse-port}"/>
- <sysproperty key="pulse-context" value="${pulse-context}"/>
- <sysproperty key="pulse-product" value="${pulse-product}"/>
-
- <!-- TODO : Add here a sysproperty to send in a parameter whether we are running run-tests for 'GemFire' OR 'GemFireXD' -->
- <classpath>
- <pathelement location="${tests.classes.dir}"/>
- <pathelement location="${tests.resources.dir}"/>
- <pathelement location="${classes.dir}"/>
- <pathelement location="${gcm.dir}/where/java/apache-tomcat/7.0.30/tomcat-embed-core.jar" />
- <pathelement location="${gcm.dir}/where/java/apache-tomcat/7.0.30/tomcat-embed-jasper.jar" />
- <pathelement location="${gcm.dir}/where/java/apache-tomcat/7.0.30/tomcat-embed-logging-juli.jar" />
- <fileset dir="${application.extlib.home}">
- <include name="com.springsource.org.apache.commons.beanutils-1.8.0.jar"/>
- <include name="com.springsource.org.apache.commons.collections-3.2.0.jar"/>
- <include name="com.springsource.org.apache.commons.digester-1.8.1.jar"/>
- <include name="com.springsource.org.apache.commons.logging-1.1.1.jar"/>
- <include name="junit-4.10.jar"/>
- <include name="servlet-api-2.5-20081211.jar"/>
- <include name="spring-aop-3.2.9.RELEASE.jar"/>
- <include name="spring-beans-3.2.9.RELEASE.jar"/>
- <include name="spring-core-3.2.9.RELEASE.jar"/>
- <include name="spring-security-config-3.1.4.RELEASE.jar"/>
- <include name="spring-expression-3.2.9.RELEASE.jar"/>
- <include name="spring-context-3.2.9.RELEASE.jar"/>
- <include name="spring-security-core-3.1.4.RELEASE.jar"/>
- <include name="spring-security-web-3.1.4.RELEASE.jar"/>
- <include name="spring-web-3.2.9.RELEASE.jar"/>
- <include name="spring-webmvc-3.2.9.RELEASE.jar"/>
- <include name="selenium-server-standalone-2.41.0.jar"/>
- </fileset>
- </classpath>
-
- <formatter type="plain"/>
-
- <batchtest fork="yes" todir="${tests.results.dir}">
- <fileset dir="${tests.dir}">
- <include name="**/*Tests.java"/>
- <include name="**/*Test.java"/>
- <exclude name="**/AllTests.java"/>
- <exclude name="**/Base*.java"/>
- </fileset>
- </batchtest>
- </junit>
-
- <conditional if="tests.failed">
- <echo message="FAILED: Test failures in ${tests.results.dir}" level="error"/>
- <echo append="true" file="${tests.results.dir}/TestFailures" message="FAILED: Test failures in ${tests.results.dir}" level="error"/>
- <fail message="FAILED: One or more tests failed"/>
- </conditional>
-
- </target>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/buildfiles/dependencies.xml
----------------------------------------------------------------------
diff --git a/pulse/buildfiles/dependencies.xml b/pulse/buildfiles/dependencies.xml
deleted file mode 100644
index 19c9224..0000000
--- a/pulse/buildfiles/dependencies.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="dependencies">
- <dependency property="svnant.dir" artifact="where/java/svnant/svnant-1.4.dev"/>
- <dependency property="ant-contrib.jar" artifact="where/java/ant/ant-contrib/ant-contrib-1.0b3/ant-contrib-1.0b3.jar"/>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/buildfiles/osplatform.xml
----------------------------------------------------------------------
diff --git a/pulse/buildfiles/osplatform.xml b/pulse/buildfiles/osplatform.xml
deleted file mode 100644
index cc63ddf..0000000
--- a/pulse/buildfiles/osplatform.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="osplatform">
- <!-- determine machine and os, and if this is a 32 bit only or 64 bit only platform -->
- <condition property="gf.os" value="sol">
- <os name="SunOs"/>
- </condition>
- <condition property="gf.os" value="linux">
- <os name="Linux"/>
- </condition>
- <conditional unless="only64">
- <condition property="only32" value="true">
- <os name="Linux"/>
- </condition>
- </conditional>
- <condition property="gf.os" value="mac">
- <os family="mac"/>
- </condition>
- <condition property="only32" value="true">
- <os family="mac"/>
- </condition>
- <condition property="gf.os" value="win">
- <os family="windows"/>
- </condition>
- <conditional unless="only64">
- <condition property="only32" value="true">
- <os family="windows"/>
- </condition>
- </conditional>
- <condition property="gf.os" value="aix">
- <os name="AIX"/>
- </condition>
- <conditional unless="only64">
- <condition property="only32" value="true">
- <os name="AIX"/>
- </condition>
- </conditional>
-
- <condition property="isSolaris">
- <os name="SunOs"/>
- </condition>
- <condition property="isMac">
- <os family="mac"/>
- </condition>
- <condition property="isAIX">
- <os name="AIX"/>
- </condition>
- <condition property="isLinux">
- <os name="Linux"/>
- </condition>
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
-
- <conditional if="only32">
- <property name="singleModel" value="true"/>
- <property name="do32bit" value="true"/>
- </conditional>
-
- <conditional if="only64">
- <property name="singleModel" value="true"/>
- <property name="do64bit" value="true"/>
- </conditional>
-
- <conditional unless="singleModel">
- <property name="do32bit" value="true"/>
- <property name="do64bit" value="true"/>
- </conditional>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/buildfiles/utilities.xml
----------------------------------------------------------------------
diff --git a/pulse/buildfiles/utilities.xml b/pulse/buildfiles/utilities.xml
deleted file mode 100644
index d01ab42..0000000
--- a/pulse/buildfiles/utilities.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="utilities">
- <description>
- The Utilities Ant XML build script file defines reusable and useful utility functions/tasks for use inside other
- GemFire build targets.
- </description>
-
- <path id="path.svnant">
- <pathelement location="${svnant.dir}/lib/svnant.jar"/>
- <pathelement location="${svnant.dir}/lib/svnClientAdapter.jar"/>
- <pathelement location="${svnant.dir}/lib/svnkit-javahl16-1.7.5-v1.jar"/>
- <pathelement location="${svnant.dir}/lib/svnkit-1.7.5-v1.jar"/>
- <pathelement location="${svnant.dir}/lib/sqljet-1.1.4.jar"/>
- <pathelement location="${svnant.dir}/lib/svnkit-cli-1.7.5-v1.jar"/>
- <pathelement location="${svnant.dir}/lib/jna-3.4.0.jar"/>
- <pathelement location="${svnant.dir}/lib/antlr-runtime-3.4.jar"/>
- <pathelement location="${svnant.dir}/lib/sequence-library-1.0.2.jar"/>
- </path>
-
- <typedef resource="org/tigris/subversion/svnant/svnantlib.xml"
- classpathref="path.svnant" />
-
- <condition property="antcontrib.taskfile" value="net/sf/antcontrib/antlib.xml">
- <antversion atleast="1.8"/>
- </condition>
-
- <!-- If antcontrib.taskfile is not set -->
- <property name="antcontrib.taskfile" value="net/sf/antcontrib/antcontrib.properties"/>
-
- <taskdef resource="${antcontrib.taskfile}" classpath="${ant-contrib.jar}"/>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/src/main/resources/pulseversion.properties
----------------------------------------------------------------------
diff --git a/pulse/src/main/resources/pulseversion.properties b/pulse/src/main/resources/pulseversion.properties
deleted file mode 100644
index d9c777b..0000000
--- a/pulse/src/main/resources/pulseversion.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#Pulse Properties File
-#Wed, 03 Oct 2012 16:58:00 -0700
-
-pulse.version=7.0.Beta
-#pulse.buildId=build 38339
-#pulse.buildDate=10/03/2012 16\:57\:56 PDT
-#pulse.sourceDate=10/03/2012 16\:47 \:40 PDT
-#pulse.sourceRevision=38339
-#pulse.sourceRepository=gemfire/trunk
-Build-Id=build 38339
-Build-Date=10/03/2012 16\:57\:56 PDT
-Source-Date=10/03/2012 16\:47 \:40 PDT
-Source-Revision=38339
-Source-Repository=gemfire/trunk
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/TestBed.java
----------------------------------------------------------------------
diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/TestBed.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/TestBed.java
index b68e0da..03bfa75 100644
--- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/TestBed.java
+++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/TestBed.java
@@ -7,6 +7,8 @@
*/
package com.vmware.gemfire.tools.pulse.testbed;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -26,12 +28,12 @@ public class TestBed {
public TestBed(String fileName,boolean flag) throws FileNotFoundException, IOException{
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream inputStream = classLoader.getResourceAsStream("testbed.properties");
- System.out.println("Inputstream : " + inputStream);
+// ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+// InputStream inputStream = classLoader.getResourceAsStream("testbed.properties");
+// System.out.println("Inputstream : " + inputStream);
Properties properties = new Properties();
try {
- properties.load(inputStream);
+ properties.load(new FileInputStream(new File(fileName)));
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java
----------------------------------------------------------------------
diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java
index 3401394..5999fdc 100644
--- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java
+++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTests.java
@@ -1021,7 +1021,7 @@ public class PulseTests {
@AfterClass
public static void tearDownAfterClass() throws Exception {
//Thread.sleep(200000000);
- // driver.close();
+ driver.close();
/*try {
if (tomcat != null) {
tomcat.stop();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/28eb8535/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/junit/BaseServiceTest.java
----------------------------------------------------------------------
diff --git a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/junit/BaseServiceTest.java b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/junit/BaseServiceTest.java
index e98cdda..627abec 100644
--- a/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/junit/BaseServiceTest.java
+++ b/pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/junit/BaseServiceTest.java
@@ -48,6 +48,7 @@ public abstract class BaseServiceTest {
protected static Properties propsForJUnit = new Properties();
protected static String strHost = null;
+ protected static String strPort = null;
static{
@@ -59,13 +60,14 @@ public abstract class BaseServiceTest {
System.out.println("BaseServiceTest :: Error loading properties from pulse.properties in classpath");
}
strHost = propsForJUnit.getProperty("pulse.host");
+ strPort = propsForJUnit.getProperty("pulse.port");
System.out.println("BaseServiceTest :: Loaded properties from classpath. Checking properties for hostname. Hostname found = " + strHost);
}
- protected static final String LOGIN_URL = "http://" + strHost + ":8081/pulse-7.5/j_spring_security_check";
- protected static final String LOGOUT_URL = "http://" + strHost + ":8081/pulse-7.5/pulse/clusterLogout";
- protected static final String IS_AUTHENTICATED_USER_URL = "http://" + strHost + ":8081/pulse-7.5/pulse/authenticateUser";
- protected static final String PULSE_UPDATE_URL = "http://" + strHost + ":8081/pulse-7.5/pulse/pulseUpdate";
+ protected static final String LOGIN_URL = "http://" + strHost + ":" + strPort + "/pulse/j_spring_security_check";
+ protected static final String LOGOUT_URL = "http://" + strHost + ":" + strPort + "/pulse/clusterLogout";
+ protected static final String IS_AUTHENTICATED_USER_URL = "http://" + strHost + ":" + strPort + "/pulse/authenticateUser";
+ protected static final String PULSE_UPDATE_URL = "http://" + strHost + ":" + strPort + "/pulse/pulseUpdate";
protected static final String PULSE_UPDATE_PARAM = "pulseData";
protected static final String PULSE_UPDATE_1_VALUE = "{'ClusterSelectedRegion':{'regionFullPath':'/GlobalVilage_2/GlobalVilage_9'}}";
protected static final String PULSE_UPDATE_2_VALUE = "{'ClusterSelectedRegion':{'regionFullPath':'/Rubbish'}}";