LMS-2754 openbis.build.xml slightly refactored. Targets...

LMS-2754 openbis.build.xml slightly refactored. Targets compile-and-run-openbis-from-eclipse and run-openbis-from-eclipse added to openbis_standard_technologies.build.xml.

SVN: 24280

openbis/build/build.xml

@@ -837,9 +837,10 @@
   -->
   <target name="compile-module-test" description="Compile the module test mode">
     <delete dir="${targets.www}/${module-test.path}" />
+  	<echo>GWT-sources: ${gwt.sources}</echo>
     <java classpath="${ecp}:${ecp.gwt}:${gwt.sources}"
       classname="com.google.gwt.dev.Compiler" fork="true">
-      <jvmarg value="-Xmx512M" />
+      <jvmarg value="-Xmx1024M" />
       <arg value="-war" />
       <arg value="${targets.www}" />
       <arg value="${module-test.module}Safari" />
@@ -863,16 +864,8 @@
      <{property,param} name="module-test.module" value="ch.systemsx.cisd.openbis.OpenBIS" /> 
   -->
   <target name="run-module-test" description="Run the module test mode">
-    <java failonerror="true" fork="true" classname="com.google.gwt.dev.DevMode">
-      <classpath>
-        <pathelement location="${sources}" />
-        <pathelement location="../openbis/${sources}" />
-        <pathelement path="${ecp}" />
-        <pathelement path="${ecp.gwt}" />
-        <pathelement location="${gwt.lib}/gwt-dev.jar" />
-        <pathelement location="${gwt.lib}/gwt-user.jar" />
-      </classpath>
-      <jvmarg value="-Xmx512M" />
+    <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="log4j.configuration" file="etc/log.xml" />
       <sysproperty key="javax.net.ssl.trustStore" file="dist/server/openBIS.keystore" />

openbis_standard_technologies/build/build.xml

 <project name="openbis_standard_technologies" default="dist" basedir="..">
-  <import file="../../screening/build/build.xml" />
-  <import file="../../rtd_phosphonetx/build/build.xml" />
+	<import file="../../openbis/build/build.xml" />
+  <!--import file="../../screening/build/build.xml" />
+  <import file="../../rtd_phosphonetx/build/build.xml" /-->
   <project-classpath name="ecp" classes="${classes}" />
 	<project-classpath name="ecp.gwt" classes="${targets}/www/WEB-INF/classes" />
+  <property name="gwt.extended.sources" value="${gwt.sources}:../rtd_phosphonetx/${sources}:../screening/${sources}" />
 
 	<target name="dist" depends="compile">
 	</target>
+
+
+	<target name="compile-and-run-openbis-from-eclipse"
+	        description="Compile and run openbis from Eclipse">
+		<antcall target="compile-module-test">
+			<param name="gwt.sources" value="${gwt.extended.sources}" />
+			<param name="module-test.path" value="openbis-test" />
+			<param name="module-test.module"
+			       value="ch.systemsx.cisd.openbis.OpenBIS" />
+		</antcall>
+		<antcall target="run-openbis-from-eclipse" />
+	</target>
+
+	<target name="run-openbis-from-eclipse"
+	        description="run openbis from Eclipse">
+		<antcall target="run-module-test">
+			<param name="gwt.sources" value="${gwt.extended.sources}" />
+			<param name="module-test.path" value="openbis-test" />
+			<param name="module-test.module"
+			       value="ch.systemsx.cisd.openbis.OpenBIS" />
+		</antcall>
+	</target>
+
 </project>
\ No newline at end of file

openbis_standard_technologies/etc/log.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+  <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+     <layout class="org.apache.log4j.PatternLayout">
+       <param name="ConversionPattern" value="%d %-5p [%t] %c - %m%n"/>
+     </layout>
+  </appender>
+
+  <appender name="NULL" class="org.apache.log4j.varia.NullAppender" />
+
+  <root>
+     <priority value ="info" />
+     <appender-ref ref="STDOUT" />
+  </root>
+
+</log4j:configuration>