From 981eeea17de183a60e595ba030fd3fb0bf9a928e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 29 Aug 2012 07:28:37 +0000
Subject: [PATCH] SP-239, SWE-6: Add system property
org.mortbay.util.FileResource.checkAliases=false to launch configurations.
bug: delete symbolic links but do not follow symbolic links on deletion
SVN: 26472
---
openbis-common/build/build-common.xml | 4 +++-
openbis/build/build.xml | 5 ++++-
openbis/resource/eclipse/openBIS GWT Shell - debug.launch | 4 ++--
openbis/resource/eclipse/openBIS GWT Shell.launch | 2 +-
.../resource/eclipse/Screening openBIS GWT Shell.launch | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/openbis-common/build/build-common.xml b/openbis-common/build/build-common.xml
index f78859dd892..b64467d106f 100644
--- a/openbis-common/build/build-common.xml
+++ b/openbis-common/build/build-common.xml
@@ -14,7 +14,9 @@
<target name="prepare-gwt"
description="Cleans and prepares the GWT specific directories, forcing a GWT rebuilding.">
<delete failonerror="true" dir="../${ant.project.name}/.gwt-cache" />
- <delete failonerror="true" dir="${targets.www}" />
+ <delete failonerror="true" includeEmptyDirs="true" removeNotFollowedSymlinks="true" quiet="true">
+ <fileset dir="${targets.www}" followsymlinks="false"/>
+ </delete>
<mkdir dir="${targets.www}" />
<mkdir dir="${targets.www.web-inf}" />
<copy todir="${targets.www.web-inf}" overwrite="true" failonerror="true">
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index d0902149f12..5bae2451b1b 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -856,7 +856,9 @@
<{property,param} name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" /> //
-->
<target name="compile-module-test" description="Compile the module test mode">
- <delete dir="${targets.www}/${module-test.path}" />
+ <delete includeEmptyDirs="true" removeNotFollowedSymlinks="true" quiet="true">
+ <fileset dir="${targets.www}/${module-test.path}" followsymlinks="false"/>
+ </delete>
<echo>GWT-sources: ${gwt.sources}</echo>
<java classpath="${ecp}:${ecp.gwt}:${gwt.sources}"
classname="com.google.gwt.dev.Compiler" fork="true">
@@ -887,6 +889,7 @@
<java failonerror="true" fork="true" classpath="${ecp}:${ecp.gwt}:${gwt.sources}" classname="com.google.gwt.dev.DevMode">
<jvmarg value="-Xmx1024M" />
<jvmarg value="-ea" />
+ <sysproperty key="org.mortbay.util.FileResource.checkAliases" value="false"/>
<sysproperty key="log4j.configuration" file="etc/log.xml" />
<sysproperty key="javax.net.ssl.trustStore" file="dist/server/openBIS.keystore" />
diff --git a/openbis/resource/eclipse/openBIS GWT Shell - debug.launch b/openbis/resource/eclipse/openBIS GWT Shell - debug.launch
index 5126fb56279..b2562608f77 100644
--- a/openbis/resource/eclipse/openBIS GWT Shell - debug.launch
+++ b/openbis/resource/eclipse/openBIS GWT Shell - debug.launch
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/openbis"/>
@@ -17,5 +17,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl ch.systemsx.cisd.openbis.OpenBIS/index.html?debug=true ch.systemsx.cisd.openbis.OpenBIS -war targets/www -logLevel WARN"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbis"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dpython.path=../libraries/jython/jython-lib -Dlog4j.configuration=etc/log.xml -Djavax.net.ssl.trustStore=dist/server/openBIS.keystore -Xmx512M -ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dpython.path=../libraries/jython/jython-lib -Dlog4j.configuration=etc/log.xml -Djavax.net.ssl.trustStore=dist/server/openBIS.keystore -Dorg.mortbay.util.FileResource.checkAliases=false -Xmx512M -ea"/>
</launchConfiguration>
diff --git a/openbis/resource/eclipse/openBIS GWT Shell.launch b/openbis/resource/eclipse/openBIS GWT Shell.launch
index 8dacc109533..31a8d3b9452 100644
--- a/openbis/resource/eclipse/openBIS GWT Shell.launch
+++ b/openbis/resource/eclipse/openBIS GWT Shell.launch
@@ -17,5 +17,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl ch.systemsx.cisd.openbis.OpenBIS/index.html ch.systemsx.cisd.openbis.OpenBIS -war targets/www -logLevel WARN"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbis"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dpython.path=../libraries/jython/jython-lib -Dlog4j.configuration=etc/log.xml -Djavax.net.ssl.trustStore=dist/server/openBIS.keystore -Xmx2048M -XX:MaxPermSize=512m -ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dpython.path=../libraries/jython/jython-lib -Dlog4j.configuration=etc/log.xml -Djavax.net.ssl.trustStore=dist/server/openBIS.keystore -Dorg.mortbay.util.FileResource.checkAliases=false -Xmx2048M -XX:MaxPermSize=512m -ea"/>
</launchConfiguration>
diff --git a/screening/resource/eclipse/Screening openBIS GWT Shell.launch b/screening/resource/eclipse/Screening openBIS GWT Shell.launch
index b27491437eb..60f565f00e6 100644
--- a/screening/resource/eclipse/Screening openBIS GWT Shell.launch
+++ b/screening/resource/eclipse/Screening openBIS GWT Shell.launch
@@ -18,5 +18,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl ch.systemsx.cisd.openbis.plugin.screening.OpenBIS/index.html ch.systemsx.cisd.openbis.plugin.screening.OpenBIS -war targets/www -logLevel WARN"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="screening"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dpython.path=../libraries/jython/jython-lib -Dlog4j.configuration=../openbis/etc/log.xml -Djavax.net.ssl.trustStore=../openbis/dist/server/openBIS.keystore -Xmx1536M -XX:MaxPermSize=512m -ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dpython.path=../libraries/jython/jython-lib -Dlog4j.configuration=../openbis/etc/log.xml -Djavax.net.ssl.trustStore=../openbis/dist/server/openBIS.keystore -Dorg.mortbay.util.FileResource.checkAliases=false -Xmx1536M -XX:MaxPermSize=512m -ea"/>
</launchConfiguration>
--
GitLab