[MOBY-guts] biomoby commit

[Martin Senger]

senger
Sun Sep 18 04:46:25 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv23355

Modified Files:
	build.xml 
Log Message:


moby-live/Java build.xml,1.31,1.32
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- /home/repository/moby/moby-live/Java/build.xml	2005/09/13 06:53:28	1.31
+++ /home/repository/moby/moby-live/Java/build.xml	2005/09/18 08:46:25	1.32
@@ -211,6 +211,9 @@
      <copy todir="${build.classes}/templates">
        <fileset dir="${src.templates}"/>
      </copy>
+     <copy todir="${build.classes}">
+       <fileset dir="${src.main}" includes="**/images/"/>
+     </copy>
    </target>
 
    <target name="compile-normal" depends="init,config">
@@ -1325,48 +1328,28 @@
    <!--
         Work in progress...
         -->
+   <property name="dashboard.config.dir" location="${src.config}/dashboard"/>
+   <property name="dashboard.config.jar" value="dashboard-config.jar"/>
 
    <path id="dashboard.build.classpath">
      <path refid="build.classpath"/>
      <fileset dir="${build.lib}">
-       <include name="dashboard.jar"/>
+       <include name="${dashboard.config.jar}"/>
      </fileset>
    </path>
 
-   <target name="dashboard" depends="compile">
-     <jar destfile="${build.lib}/dashboard.jar">
-       <manifest>
-         <attribute name="Built-By" value="${user.name}"/>
-       </manifest>
-       <metainf dir="${src.config}/plugins/" includes="services/*"/>
-     </jar>
-
+   <target name="dashboard" depends="compile,dashboard-config">
      <java classname="org.biomoby.service.dashboard.Dashboard" taskname="Dashboard"
        classpathref="dashboard.build.classpath" fork="true" failonerror="true">
      </java>
-
    </target>
 
-   <property name="dashboard.title" value="Biomoby Dashboard"/>
-   <property name="dashboard.iconfile" location="images/..."/>
-
    <target name="dashboard-config" depends="init">
-
-     <!--
-     <copy file="${wsdd.template}" tofile="${wsdd.file}" overwrite="true"
-       taskname="Create ${service.name}.wsdd">
-       <filterset>
-         <filter token="DASHBOARD_TITLE"    value="${dashboard.title}"/>
-         <filter token="DASHBOARD_ICONFILE" value="${dashboard.iconfile}"/>
-       </filterset>
-     </copy>
-     -->
-
-     <jar destfile="${build.lib}/dashboard-config.jar">
+     <jar destfile="${build.lib}/${dashboard.config.jar}">
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
        </manifest>
-       <metainf dir="${src.config}/plugins/" includes="services/*" />
+       <fileset dir="${dashboard.config.dir}"/>
      </jar>
    </target>