[LMS-1323] introduced inheritance from CISD-basic in openbis and changed build accordingly

SVN: 16497

openbis/.classpath

@@ -55,5 +55,6 @@
 	<classpathentry kind="lib" path="/libraries/cisd-args4j/cisd-args4j.jar" sourcepath="/libraries/cisd-args4j/cisd-args4j-src.zip"/>
 	<classpathentry kind="lib" path="/libraries/commons-dbcp/commons-dbcp.jar" sourcepath="/libraries/commons-dbcp/src.zip"/>
 	<classpathentry kind="lib" path="/libraries/jline/jline.jar" sourcepath="/libraries/jline/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/cisd-common-basic/cisd-common-basic.jar"/>
 	<classpathentry kind="output" path="targets/www/WEB-INF/classes"/>
 </classpath>

openbis/build/build.xml

@@ -6,6 +6,8 @@
 
   <property name="mainfolder" value="openbis" />
 
+  <property name="cisd-common-basic.lib" value="${lib}/cisd-common-basic/cisd-common-basic.jar" />
+	
   <property name="gwt.lib" value="${lib}/gwt2.0" />
   <property name="gwt.user.lib" value="${gwt.lib}/gwt-user.jar" />
 
@@ -249,7 +251,7 @@
   -->
   <target name="compile-gwt-module">
     <delete dir="${webapp.dist}" />
-    <java classpath="${ecp}:${gwt.lib}/gwt-dev.jar:${gwt.user.lib}:../openbis/${sources}:${sources}" classname="com.google.gwt.dev.Compiler"
+    <java classpath="${ecp}:${gwt.lib}/gwt-dev.jar:${gwt.user.lib}:${cisd-common-basic.lib}:../openbis/${sources}:${sources}" classname="com.google.gwt.dev.Compiler"
       fork="true">
       <jvmarg value="-Xmx1024M" />
       <arg value="-war" />
@@ -404,6 +406,9 @@
       <fileset dir="${lib}/jython">
         <include name="jython.jar" />
       </fileset>
+      <fileset dir="${lib}/cisd-common-basic">
+        <include name="cisd-common-basic.jar" />
+      </fileset>
     </copy>
   </target>
   <!--
@@ -411,9 +416,9 @@
   -->
   <target name="prepare-web-client" depends="compile"
     description="Updates 'ClientPluginProvider.java' and 'OpenBIS.gwt-without-entry-point.xml' with requested plugins.">
-    <java classname="ch.systemsx.cisd.openbis.generic.shared.util.WebClientFilesUpdater" classpath="${ecp}:../openbis/source/java"
+    <java classname="ch.systemsx.cisd.openbis.generic.shared.util.WebClientFilesUpdater" classpath="${ecp}:../openbis/${sources}"
       fork="true" failonerror="true">
-      <arg value="../openbis/source/java" />
+      <arg value="../openbis/${sources}" />
     </java>
   </target>
 

openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml

 <module>
+
+  <!-- 
+    // Inherit the basic CISD stuff (shared client-server).
+  -->
+  <inherits name='ch.systemsx.cisd.common.shared.CISD-basic' />
+  
   <!--
     // Inherit the core Web Toolkit stuff.
   -->