From c3cae87c4a650fd5eb94570e63b827fbc3eba44c Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Wed, 17 Sep 2008 09:35:17 +0000 Subject: [PATCH] LMS-478 Add openbis and drop lims_webclient. Build lims instead of lims_webclient. SVN: 8345 --- openbis_all/.classpath | 32 ++++++++++++++++---------------- openbis_all/build/build.xml | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/openbis_all/.classpath b/openbis_all/.classpath index 257bb01cc9e..0412bdda6ea 100644 --- a/openbis_all/.classpath +++ b/openbis_all/.classpath @@ -1,16 +1,16 @@ -<?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> +<?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="/args4j"/> + <classpathentry combineaccessrules="false" kind="src" path="/openbis"/> + <classpathentry kind="output" path="targets/classes"/> +</classpath> diff --git a/openbis_all/build/build.xml b/openbis_all/build/build.xml index df6c95bb174..3da2bbe3bac 100644 --- a/openbis_all/build/build.xml +++ b/openbis_all/build/build.xml @@ -8,11 +8,11 @@ <arg value="-lib"/> <arg value="../build_resources/lib/ecj.jar"/> <arg value="-f"/> - <arg value="../lims_webclient/build/build.xml"/> + <arg value="../lims/build/build.xml"/> <arg value="dist"/> </exec> <copy todir="${result.dir}"> - <fileset dir="../lims_webclient/${dist}"/> + <fileset dir="../lims/${dist}"/> </copy> <exec executable="ant" failonerror="true"> <arg value="-lib"/> @@ -42,7 +42,7 @@ <arg value="-lib"/> <arg value="../build_resources/lib/ecj.jar"/> <arg value="-f"/> - <arg value="../lims_webclient/build/build.xml"/> + <arg value="../lims/build/build.xml"/> <arg value="clean"/> </exec> <exec executable="ant" failonerror="true"> -- GitLab