Changeset 3952


Ignore:
Timestamp:
Nov 13, 2007, 8:49:55 AM (14 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #821: Split up core.aar

Location:
trunk
Files:
1 added
11 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r3951 r3952  
    8282    description="Location of local configuration files" />
    8383 
     84  <!-- classpaths to library files -->
     85  <path id="lib.dist.classpath">
     86    <fileset dir="${lib}/dist">
     87      <include name="**/*.jar"/>
     88    </fileset>
     89  </path>
     90
     91  <path id="lib.webservices.classpath">
     92    <fileset dir="${lib}/webservices">
     93      <include name="**/*.jar"/>
     94    </fileset>
     95  </path>
     96 
     97  <path id="lib.svn.classpath">
     98    <fileset dir="${lib}/svn">
     99      <include name="**/*.jar"/>
     100    </fileset>
     101  </path>
     102 
     103  <path id="lib.hibernatedoclet.classpath">
     104    <fileset dir="${lib}/hibernatedoclet">
     105      <include name="**/*.jar"/>
     106    </fileset>
     107  </path>
     108 
     109  <path id="lib.servlet.classpath">
     110    <fileset dir="${lib}/servlet">
     111      <include name="**/*.jar"/>
     112    </fileset>
     113  </path>
     114 
    84115  <!-- pattern for configuration files use by copy.config -->
    85116  <patternset id="config.files">
     
    96127    >
    97128    <classpath>
    98       <fileset dir="${lib}/hibernatedoclet">
    99         <include name="**/*.jar"/>
    100       </fileset>
     129      <path refid="lib.hibernatedoclet.classpath" />
    101130    </classpath>
    102131  </taskdef>
     
    108137    >
    109138    <classpath>
    110       <fileset dir="${lib}/svn">
    111         <include name="**/*.jar"/>
    112       </fileset>
     139      <path refid="lib.svn.classpath" />
    113140    </classpath>
    114141  </taskdef>
     
    120147    >
    121148    <classpath>
    122       <fileset dir="${lib}/webservices">
    123         <include name="**/*.jar"/>
    124       </fileset>
    125       <fileset dir="${lib}/dist">
    126         <include name="**/*.jar"/>
    127       </fileset>
     149      <path refid="lib.dist.classpath" />
     150      <path refid="lib.webservices.classpath" />
    128151      <pathelement location="config/local" />
    129152      <pathelement location="config/dist" />
     
    154177  <target
    155178    name="dist"
    156     depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.aar,webservices.wsdl,
     179    depends="clean,dist.init,core.jar,coreplugins.jar,web.jar,webservices.jar,webservices.wsdl,
    157180      installprg.jar,jobagent.jar,migrate.jar,copy.config,copy.jar,doc,doc.dist"
    158181    description="Create everything needed for distribution"
     
    241264 
    242265  <target
    243       name="webservices"
    244       depends="web,webservices.aar,webservices.wsdl"
    245       description="Build webservices for local use"
     266    name="webservices"
     267    depends="core,web,webservices.jar,webservices.wsdl"
     268    description="Build webservices for local use"
    246269  />
    247270 
    248271  <target
    249272    name="installprg"
    250     depends="web,installprg.jar"
     273    depends="core,web,installprg.jar"
    251274    description="Build installation programs for local use"
    252275  />
     
    254277  <target
    255278    name="jobagent"
    256     depends="web,jobagent.jar"
     279    depends="core,web,jobagent.jar"
    257280    description="Build job agent for local use"
    258281  />
     
    260283  <target
    261284    name="migrate"
    262     depends="web,migrate.jar"
     285    depends="core,web,migrate.jar"
    263286    description="Build migration tool for local use"
    264287  />
     
    427450      description="Location of compiled core files" />
    428451    <path id="core.classpath">
    429       <fileset dir="${lib}/dist">
    430         <include name="**/*.jar"/>
    431       </fileset>
     452      <path refid="lib.dist.classpath" />
    432453      <pathelement location="${info.build}" />
    433454    </path>
     
    704725      description="Location of compiled files" />
    705726    <path id="test.classpath" description="Class path for compiling">
    706       <path refid="webservices.classpath"/>
    707       <pathelement location="${info.build}" />
     727      <path refid="core.classpath"/>
     728      <path refid="lib.webservices.classpath" />
    708729      <pathelement location="${core.build}" />
    709730      <pathelement location="${coreplugins.build}" />
    710731      <pathelement location="${jobagent.build}" />
    711       <pathelement location="${webservices.build}" />
     732      <pathelement location="${webservices.build}/server" />
     733      <pathelement location="${webservices.build}/client" />
    712734    </path>
    713735  </target>
     
    771793      <pathelement location="${core.build}"/>
    772794      <pathelement location="${coreplugins.build}" />
    773       <fileset dir="${lib}/servlet">
    774         <include name="**/*.jar"/>
    775       </fileset>
     795      <path refid="lib.servlet.classpath" />
    776796    </path>
    777797  </target>
     
    877897    <property name="webservices.wsdlpath" location="misc/wsdl"
    878898      description="Location of created wsdl-files" />
    879     <path id="webservices.classpath" description="Class path for compiling webservices">
     899    <path id="webservices.server.classpath"
     900      description="Class path for compiling server part of webservices"
     901      >
     902      <path refid="lib.webservices.classpath" />
    880903      <path refid="core.classpath"/>
    881904      <pathelement location="${core.build}"/>
    882905      <pathelement location="${coreplugins.build}"/>
    883       <fileset dir="${lib}/webservices">
    884         <include name="**/*.jar"/>
    885       </fileset>
     906    </path>
     907    <path id="webservices.client.classpath"
     908      description="Class path for compiling client part of webservices"
     909      >
     910      <path refid="lib.webservices.classpath" />
     911      <pathelement location="${info.build}"/>
    886912    </path>
    887913  </target>
     
    891917    depends="webservices.init"
    892918    >
    893     <property name="nowsdl" value="1"/>
    894     <property name="wsdl.message"
    895       value="WSDL file generation temporarily disabled during refactoring" />
    896919    <uptodate
    897920      property="nowsdl"
     
    915938  <target
    916939    name="webservices.compile"
     940    depends="webservices.server.compile,webservices.client.compile"
     941    description="Compile the core web services"
     942    >
     943  </target>
     944 
     945  <target
     946    name="webservices.server.compile"
     947    description="Compile the server part of webservices"
    917948    depends="webservices.init,core.compile"
    918     description="Compile the core web services"
    919     >
    920     <mkdir dir="${webservices.build}" />
     949    >
     950    <mkdir dir="${webservices.build}/server" />
    921951    <javac
    922       destdir="${webservices.build}"
    923       classpathref="webservices.classpath"
     952      destdir="${webservices.build}/server"
     953      classpathref="webservices.server.classpath"
    924954      encoding="ISO-8859-1"
    925955      debug="true"
    926956      deprecation="true"
    927957      >
    928       <!--
    929       Removed during refactoring since this will currently not compile
    930958      <src path="${webservices.src}/server" />
    931       -->
    932       <src path="${webservices.src}/client/java" />
    933959      <compilerarg value="${javac.arg}" />
    934960    </javac>
    935    
    936     <copy todir="${webservices.build}"
     961    <copy todir="${webservices.build}/server"
    937962      description="Resource files needed by the webservices; excludes documentation and source files"
    938963      includeEmptyDirs="false"
     
    945970      </fileset>
    946971    </copy>
     972  </target>
     973
     974  <target
     975    name="webservices.client.compile"
     976    description="Compile the client part of webservices"
     977    depends="webservices.init,info.compile"
     978    >
     979    <mkdir dir="${webservices.build}/client" />
     980    <javac
     981      destdir="${webservices.build}/client"
     982      classpathref="webservices.client.classpath"
     983      encoding="ISO-8859-1"
     984      debug="true"
     985      deprecation="true"
     986      >
     987      <src path="${webservices.src}/client/java" />
     988      <compilerarg value="${javac.arg}" />
     989    </javac>
    947990  </target>
    948991 
     
    9661009        <sequential>
    9671010          <java2WSDL
    968         classpath="${webservices.build};${core.build}"
     1011        classpath="${webservices.build}/server;${info.build};${core.build}"
    9691012        className="net.sf.basedb.ws.server.@{serviceClassName}"
    9701013        outputLocation="${webservices.wsdlpath}"     
     
    9771020 
    9781021  <target
    979     name="webservices.aar"
     1022    name="webservices.jar"
    9801023    depends="webservices.compile"
    981     description="Create the core webservices aar file: core.aar"
     1024    description="Create the core webservices aar file and client jar"
    9821025    >
    9831026    <mkdir dir="${config}/../services" />
    9841027    <jar
    985       basedir="${webservices.build}"
     1028      basedir="${webservices.build}/server"
    9861029      jarfile="${config}/../services/core.aar"
    9871030    />
     1031    <jar
     1032      jarfile="${jar}/BASE2WSClient.jar"
     1033      >
     1034      <fileset dir="${webservices.build}/client" />
     1035      <fileset dir="${info.build}" />
     1036    </jar>
    9881037  </target>
    9891038 
     
    11301179    <path id="javadoc.classpath" description="Class path for generating javadoc">
    11311180      <path refid="core.classpath" />
    1132       <fileset dir="${lib}/servlet">
    1133         <include name="**/*.jar"/>
    1134       </fileset>
    1135       <fileset dir="${lib}/webservices">
    1136         <include name="**/*.jar"/>
    1137       </fileset>
     1181      <path refid="lib.servlet.classpath" />
     1182      <path refid="lib.webservices.classpath" />
    11381183    </path>
    11391184    <property name="docbook.html.out" location="${doc}/html" />
     
    11551200    <javadoc
    11561201      packagenames="net.sf.basedb.*"
    1157       sourcepath="${core.src}:${coreplugins.src}:${web.src}:${migrate.src}:${jobagent.src}:${webservices.src}/server:${webservices.src}/client/java"
     1202      sourcepath="${info.src}:${core.src}:${coreplugins.src}:${web.src}:${migrate.src}:${jobagent.src}:${webservices.src}/server:${webservices.src}/client/java"
    11581203      destdir="${doc}/api"
    11591204      author="true"
  • trunk/src/info/net/sf/basedb/info/QueryOptions.java

    r3951 r3952  
    2323*/
    2424
    25 package net.sf.basedb.ws.client;
     25package net.sf.basedb.info;
    2626
    2727/**
  • trunk/src/test/TestWebservices.java

    r3951 r3952  
    3737import net.sf.basedb.info.ExperimentInfo;
    3838import net.sf.basedb.info.ProjectInfo;
     39import net.sf.basedb.info.QueryOptions;
    3940import net.sf.basedb.info.RawBioAssayInfo;
    4041import net.sf.basedb.ws.client.ArrayDesignClient;
     
    4243import net.sf.basedb.ws.client.ExperimentClient;
    4344import net.sf.basedb.ws.client.ProjectClient;
    44 import net.sf.basedb.ws.client.QueryOptions;
    4545import net.sf.basedb.ws.client.RawBioAssayClient;
    4646import net.sf.basedb.ws.client.SessionClient;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/ArrayDesignClient.java

    r3951 r3952  
    2525
    2626import net.sf.basedb.info.DataFileTypeInfo;
     27import net.sf.basedb.info.QueryOptions;
    2728
    2829import java.io.File;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/ExperimentClient.java

    r3951 r3952  
    2626import net.sf.basedb.info.BioAssaySetInfo;
    2727import net.sf.basedb.info.ExperimentInfo;
     28import net.sf.basedb.info.QueryOptions;
    2829import net.sf.basedb.info.RawBioAssayInfo;
    2930
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/ProjectClient.java

    r3951 r3952  
    2525
    2626import net.sf.basedb.info.ProjectInfo;
     27import net.sf.basedb.info.QueryOptions;
    2728
    2829import org.apache.axis2.AxisFault;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/RawBioAssayClient.java

    r3951 r3952  
    2626import net.sf.basedb.info.ArrayDesignInfo;
    2727import net.sf.basedb.info.DataFileTypeInfo;
     28import net.sf.basedb.info.QueryOptions;
    2829
    2930import java.io.File;
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ArrayDesignService.java

    r3951 r3952  
    3333import net.sf.basedb.core.SessionControl;
    3434import net.sf.basedb.info.DataFileTypeInfo;
    35 import net.sf.basedb.ws.client.QueryOptions;
     35import net.sf.basedb.info.QueryOptions;
    3636
    3737import java.util.LinkedList;
     
    138138        for (FileSetMember fsm : query.list(dc))
    139139        {
    140           types.add(new DataFileTypeInfo(fsm.getDataFileType()));
     140          types.add(new DataFileTypeInfo()); //fsm.getDataFileType()));
    141141        }
    142142      }
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ExperimentService.java

    r3951 r3952  
    3232import net.sf.basedb.info.BioAssaySetInfo;
    3333import net.sf.basedb.info.ExperimentInfo;
     34import net.sf.basedb.info.QueryOptions;
    3435import net.sf.basedb.info.RawBioAssayInfo;
    35 import net.sf.basedb.ws.client.QueryOptions;
    3636
    3737import java.util.LinkedList;
     
    7272      for (Experiment experiment : query.list(dc))
    7373      {
    74         experiments.add(new ExperimentInfo(experiment));
     74        experiments.add(new ExperimentInfo()); //experiment));
    7575      }
    7676    }
     
    105105      for (BioAssaySet bas : query.list(dc))
    106106      {
    107         BioAssaySetInfo info = new BioAssaySetInfo(bas);
     107        BioAssaySetInfo info = new BioAssaySetInfo(); //bas);
    108108        bioAssaySetsInfo.add(info);
    109109      }
     
    139139      for (RawBioAssay rba : query.list(dc))
    140140      {       
    141         rawBioAssays.add(new RawBioAssayInfo(rba));
     141        rawBioAssays.add(new RawBioAssayInfo()); //rba));
    142142      }
    143143     
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ProjectService.java

    r3951 r3952  
    2929import net.sf.basedb.core.SessionControl;
    3030import net.sf.basedb.info.ProjectInfo;
    31 import net.sf.basedb.ws.client.QueryOptions;
     31import net.sf.basedb.info.QueryOptions;
    3232
    3333import java.util.LinkedList;
     
    9292      for (Project project : query.list(dc))
    9393      {
    94         projects.add(new ProjectInfo(project));
     94        projects.add(new ProjectInfo());//project));
    9595      }
    9696    }
  • trunk/src/webservices/server/net/sf/basedb/ws/server/RawBioAssayService.java

    r3951 r3952  
    3535import net.sf.basedb.info.ArrayDesignInfo;
    3636import net.sf.basedb.info.DataFileTypeInfo;
    37 import net.sf.basedb.ws.client.QueryOptions;
     37import net.sf.basedb.info.QueryOptions;
    3838
    3939import java.util.LinkedList;
     
    7777      if (dc != null) dc.close();
    7878    }
    79     return new ArrayDesignInfo(arrayDesign);
     79    return new ArrayDesignInfo(); //arrayDesign);
    8080  }
    8181 
     
    160160        for (FileSetMember fsm : query.list(dc))
    161161        {
    162           types.add(new DataFileTypeInfo(fsm.getDataFileType()));
     162          types.add(new DataFileTypeInfo());//fsm.getDataFileType()));
    163163        }
    164164      }
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ServicesUtil.java

    r3951 r3952  
    2828import net.sf.basedb.core.ItemQuery;
    2929import net.sf.basedb.core.query.Hql;
    30 import net.sf.basedb.ws.client.QueryOptions;
     30import net.sf.basedb.info.QueryOptions;
    3131
    3232import java.util.ArrayList;
Note: See TracChangeset for help on using the changeset viewer.