From c52d92e934a1deca1dae92308ad9bea02e8c7101 Mon Sep 17 00:00:00 2001 From: tpylak <tpylak> Date: Tue, 18 Jan 2011 12:37:00 +0000 Subject: [PATCH] LMS-1966 allow jython scripts to use standard library in DSS SVN: 19471 --- datastore_server/build/build.xml | 1 + .../resource/eclipse/Data Store Server.launch | 26 +++++++++---------- .../eclipse/DSU Data Store Server.launch | 2 +- .../screening Data Store Server.launch | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml index c097deaf1f0..c37921af108 100644 --- a/datastore_server/build/build.xml +++ b/datastore_server/build/build.xml @@ -124,6 +124,7 @@ <copy file="${lib}/csv/csv.jar" todir="${dist.datastore_server.lib}" /> <copy file="${lib}/jfreechart/jcommon-1.0.16.jar" todir="${dist.datastore_server.lib}" /> <copy file="${lib}/jfreechart/jfreechart-1.0.13.jar" todir="${dist.datastore_server.lib}" /> + <copy file="${lib}/jython/jython-lib" todir="${dist.datastore_server.lib}" /> </target> <!-- parameters: diff --git a/datastore_server/resource/eclipse/Data Store Server.launch b/datastore_server/resource/eclipse/Data Store Server.launch index ff93a24f1f4..d916e97782d 100644 --- a/datastore_server/resource/eclipse/Data Store Server.launch +++ b/datastore_server/resource/eclipse/Data Store Server.launch @@ -1,13 +1,13 @@ -<?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="/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="datastore_server"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/> -</launchConfiguration> +<?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="datastore_server"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Dpython.path=../libraries/jython/jython-lib"/> +</launchConfiguration> diff --git a/deep_sequencing_unit/resource/eclipse/DSU Data Store Server.launch b/deep_sequencing_unit/resource/eclipse/DSU Data Store Server.launch index ffb7bfaac00..cc082aadd58 100644 --- a/deep_sequencing_unit/resource/eclipse/DSU Data Store Server.launch +++ b/deep_sequencing_unit/resource/eclipse/DSU Data Store Server.launch @@ -10,5 +10,5 @@ <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="deep_sequencing_unit"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea -Dpython.path=../libraries/jython/jython-lib"/> </launchConfiguration> diff --git a/screening/resource/eclipse/screening Data Store Server.launch b/screening/resource/eclipse/screening Data Store Server.launch index d93cc670e0f..678c0d89efb 100644 --- a/screening/resource/eclipse/screening Data Store Server.launch +++ b/screening/resource/eclipse/screening Data Store Server.launch @@ -9,5 +9,5 @@ <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="screening"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -ea -Dpython.path=../libraries/jython/jython-lib"/> </launchConfiguration> -- GitLab