From c8e67dff4ac7b3a9e25fa74cc554fcae2c41ba6e Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Tue, 2 Sep 2008 10:05:41 +0000 Subject: [PATCH] Initial import. SVN: 8176 --- openbis/.classpath | 16 ------- openbis/{source/java => }/.gitignore | 0 openbis/.project | 17 ------- openbis/build/build.xml | 64 --------------------------- openbis/source/bash/sprint_install.sh | 47 -------------------- openbis/source/bash/tag_and_build.sh | 47 -------------------- 6 files changed, 191 deletions(-) delete mode 100644 openbis/.classpath rename openbis/{source/java => }/.gitignore (100%) delete mode 100644 openbis/.project delete mode 100644 openbis/build/build.xml delete mode 100755 openbis/source/bash/sprint_install.sh delete mode 100755 openbis/source/bash/tag_and_build.sh diff --git a/openbis/.classpath b/openbis/.classpath deleted file mode 100644 index 257bb01cc9e..00000000000 --- a/openbis/.classpath +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="source/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/authentication"/> - <classpathentry combineaccessrules="false" kind="src" path="/bds"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/dataset_download"/> - <classpathentry combineaccessrules="false" kind="src" path="/dbmigration"/> - <classpathentry combineaccessrules="false" kind="src" path="/etlserver"/> - <classpathentry combineaccessrules="false" kind="src" path="/lims"/> - <classpathentry combineaccessrules="false" kind="src" path="/lims_base"/> - <classpathentry combineaccessrules="false" kind="src" path="/lims_webclient"/> - <classpathentry combineaccessrules="false" kind="src" path="/args4j"/> - <classpathentry kind="output" path="targets/classes"/> -</classpath> diff --git a/openbis/source/java/.gitignore b/openbis/.gitignore similarity index 100% rename from openbis/source/java/.gitignore rename to openbis/.gitignore diff --git a/openbis/.project b/openbis/.project deleted file mode 100644 index 34884109fd0..00000000000 --- a/openbis/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>openbis</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/openbis/build/build.xml b/openbis/build/build.xml deleted file mode 100644 index df6c95bb174..00000000000 --- a/openbis/build/build.xml +++ /dev/null @@ -1,64 +0,0 @@ -<project name="openbis" default="dist" basedir=".."> - <import file="../../build_resources/ant/build-common.xml" /> - - <property name="result.dir" value="${targets}/dist" /> - - <target name="dist"> - <exec executable="ant" failonerror="true"> - <arg value="-lib"/> - <arg value="../build_resources/lib/ecj.jar"/> - <arg value="-f"/> - <arg value="../lims_webclient/build/build.xml"/> - <arg value="dist"/> - </exec> - <copy todir="${result.dir}"> - <fileset dir="../lims_webclient/${dist}"/> - </copy> - <exec executable="ant" failonerror="true"> - <arg value="-lib"/> - <arg value="../build_resources/lib/ecj.jar"/> - <arg value="-f"/> - <arg value="../etlserver/build/build.xml"/> - <arg value="dist"/> - </exec> - <copy todir="${result.dir}"> - <fileset dir="../etlserver/${dist}"/> - </copy> - <exec executable="ant" failonerror="true"> - <arg value="-lib"/> - <arg value="../build_resources/lib/ecj.jar"/> - <arg value="-f"/> - <arg value="../dataset_download/build/build.xml"/> - <arg value="dist"/> - </exec> - <copy todir="${result.dir}"> - <fileset dir="../dataset_download/${dist}"/> - </copy> - </target> - - <target name="clean"> - <delete dir="${dist}" /> - <exec executable="ant" failonerror="true"> - <arg value="-lib"/> - <arg value="../build_resources/lib/ecj.jar"/> - <arg value="-f"/> - <arg value="../lims_webclient/build/build.xml"/> - <arg value="clean"/> - </exec> - <exec executable="ant" failonerror="true"> - <arg value="-lib"/> - <arg value="../build_resources/lib/ecj.jar"/> - <arg value="-f"/> - <arg value="../etlserver/build/build.xml"/> - <arg value="clean"/> - </exec> - <exec executable="ant" failonerror="true"> - <arg value="-lib"/> - <arg value="../build_resources/lib/ecj.jar"/> - <arg value="-f"/> - <arg value="../dataset_download/build/build.xml"/> - <arg value="clean"/> - </exec> - </target> - -</project> \ No newline at end of file diff --git a/openbis/source/bash/sprint_install.sh b/openbis/source/bash/sprint_install.sh deleted file mode 100755 index 796da6d1108..00000000000 --- a/openbis/source/bash/sprint_install.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Performs the sprint components installation. -# This script assumes that you already are on the sprint server and must be run from that place -# in the home directory. - -if [ $# -lt 1 ]; then - echo "Usage: $0 <sprint number>" - exit 1 -fi - -VER=$1 -PREV_VER=$(( $VER - 1 )) -DB_SNAPSHOT=db_snapshots/sprint$PREV_VER-lims_productive.sql - -echo Stopping the components... -./sprint/openBIS-server/apache-tomcat/bin/shutdown.sh -./sprint/download-server/download-service.sh stop - -echo Making a database dump... -pg_dump -U postgres -O lims_productive > $DB_SNAPSHOT -tar -cf - $DB_SNAPSHOT | bzip2 >db_snapshots/sprint$PREV_VER-lims_productive.tar.bz2 -rm -f $DB_SNAPSHOT - -echo Installing openBIS server... -mv sprint-$PREV_VER old -rm sprint -mkdir sprint-$VER -ln -s sprint-$VER sprint -cd sprint -unzip ../openBIS-server-S$VER* -cd openBIS-server -./install.sh $PWD ../../service.properties - -echo Installing download server... -cd .. -unzip ../download-server-S$VER* -cd download-server -cp ~/old/sprint-$PREV_VER/download-server/etc/service.properties etc/ -chmod 700 download-service.sh -export JAVA_HOME=/usr -./download-service.sh start - -echo Doing some cleaning... -cd -mv *.zip tmp - -echo Done! \ No newline at end of file diff --git a/openbis/source/bash/tag_and_build.sh b/openbis/source/bash/tag_and_build.sh deleted file mode 100755 index 167b006dd96..00000000000 --- a/openbis/source/bash/tag_and_build.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Tags, builds the software components, uploads them to sprint server -# and places a copy of them on the sprint server ready for installation. -# -# This script assumes that you have a SSH access on 'sprint-openbis.ethz.ch' -# and 'cisd-vesuvio.ethz.ch'. This is typically configured in the SSH config file. - -if [ $# -lt 1 ]; then - echo "Usage: $0 <sprint number> [subversion]" - exit 1 -fi - -TODAY=`date "+%Y-%m-%d"` -VER=$1 -SUBVER=0 -if [ $2 ]; then - SUBVER=$2 -fi -FULL_VER=S$VER.$SUBVER -SPRINT_SERVER=sprint-openbis.ethz.ch -CISD_SERVER=cisd-vesuvio.ethz.ch -SPRINT_INSTALL_SCRIPT=sprint_install.sh - -svn checkout svn+ssh://source.systemsx.ch/repos/cisd/build_resources/trunk build_resources -cd build_resources -echo Tagging openBIS to $FULL_VER... -./tag_sprint.sh openbis $FULL_VER -echo Building openBIS... -./build.sh openbis $FULL_VER - -echo Copying new openBIS components to \'$CISD_SERVER\'... -OPENBIS_PATH=/localhome/cisd/sprint_builds/openBIS -SPRINT_DIR=$OPENBIS_PATH/$TODAY-$FULL_VER -echo "mkdir -p $SPRINT_DIR" | ssh -T $CISD_SERVER -scp *.zip $CISD_SERVER:$SPRINT_DIR - -echo Copying new openBIS components to \'$SPRINT_SERVER\'... -scp openBIS-server-*.zip $SPRINT_SERVER:. -scp download-server-*.zip $SPRINT_SERVER:. - -# If sprint install script is present and executable, run it! -if [ -x $SPRINT_INSTALL_SCRIPT ]; then - echo Installing server remotely... - cat $SPRINT_INSTALL_SCRIPT | ssh -T $SPRINT_SERVER "cat > ~/$SPRINT_INSTALL_SCRIPT ; chmod 755 ~/$SPRINT_INSTALL_SCRIPT ; ~/$SPRINT_INSTALL_SCRIPT $VER ; rm -f ~/$SPRINT_INSTALL_SCRIPT" -fi - -echo Done! \ No newline at end of file -- GitLab