Changeset 3951


Ignore:
Timestamp:
Nov 12, 2007, 3:15:32 PM (14 years ago)
Author:
Nicklas Nordborg
Message:

References #821 and #823. Moved around info.* stuff to prepare for refactoring and splitting.
Webservices compilation doesn't inlcude (temporary) the server side.

Location:
trunk
Files:
5 added
1 deleted
11 edited
8 copied

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r3937 r3951  
    8282    description="Location of local configuration files" />
    8383 
    84   <!-- main class path for compilation -->
    85   <path id="core.classpath"
    86     description="Main classpath to all 3rd-party JAR files required for compilation">
    87     <fileset dir="${lib}/dist">
    88       <include name="**/*.jar"/>
    89     </fileset>
    90   </path>
    91 
    9284  <!-- pattern for configuration files use by copy.config -->
    9385  <patternset id="config.files">
     
    397389    </copy>
    398390  </target>
     391
     392  <!-- info targets -->
     393  <target
     394    name="info.init"
     395    >
     396    <property name="info.src" location="${src}/info"
     397      description="Location of info.* source files" />
     398    <property name="info.build" location="${build}/info"
     399      description="Location of compiled info.* files" />
     400  </target>
     401 
     402  <target
     403    name="info.compile"
     404    depends="info.init"
     405    description="Compile the info.* classes"
     406    >
     407    <mkdir dir="${info.build}"/>
     408    <javac
     409      srcdir="${info.src}"
     410      destdir="${info.build}"
     411      encoding="ISO-8859-1"
     412      debug="true"
     413      deprecation="true"
     414      >
     415      <compilerarg value="${javac.arg}" />
     416    </javac>
     417  </target>
    399418 
    400419  <!-- core targets -->
    401420  <target
    402421    name="core.init"
    403     depends="dev.init"
     422    depends="dev.init,info.init"
    404423    >
    405424    <property name="core.src" location="${src}/core"
     
    407426    <property name="core.build" location="${build}/core"
    408427      description="Location of compiled core files" />
     428    <path id="core.classpath">
     429      <fileset dir="${lib}/dist">
     430        <include name="**/*.jar"/>
     431      </fileset>
     432      <pathelement location="${info.build}" />
     433    </path>
    409434  </target>
    410435 
    411436  <target
    412437    name="core.compile"
    413     depends="core.init"
     438    depends="core.init,info.compile"
    414439    description="Compile the core"
    415440    >
     
    680705    <path id="test.classpath" description="Class path for compiling">
    681706      <path refid="webservices.classpath"/>
     707      <pathelement location="${info.build}" />
    682708      <pathelement location="${core.build}" />
    683709      <pathelement location="${coreplugins.build}" />
     
    865891    depends="webservices.init"
    866892    >
     893    <property name="nowsdl" value="1"/>
     894    <property name="wsdl.message"
     895      value="WSDL file generation temporarily disabled during refactoring" />
    867896    <uptodate
    868897      property="nowsdl"
     
    897926      deprecation="true"
    898927      >
     928      <!--
     929      Removed during refactoring since this will currently not compile
    899930      <src path="${webservices.src}/server" />
     931      -->
    900932      <src path="${webservices.src}/client/java" />
    901933      <compilerarg value="${javac.arg}" />
     
    912944        <exclude name="**/package.html" />
    913945      </fileset>
    914     </copy>   
     946    </copy>
    915947  </target>
    916948 
  • trunk/src/info/net/sf/basedb/info/ArrayDesignInfo.java

    r3944 r3951  
    2222  Boston, MA  02111-1307, USA.
    2323*/
    24 package net.sf.basedb.ws.info;
     24package net.sf.basedb.info;
    2525
    26 import net.sf.basedb.core.ArrayDesign;
    2726
    2827/**
     
    5352      @param arrayDesign The ArrayDesign the object should relate to.
    5453   */
     54  /*
    5555  public ArrayDesignInfo(ArrayDesign arrayDesign)
    5656  {
     
    5959    this.numFileFeatures = arrayDesign.getNumFileFeatures();
    6060  }
     61  */
    6162
    6263  /**
  • trunk/src/info/net/sf/basedb/info/BioAssaySetInfo.java

    r3944 r3951  
    2222  Boston, MA  02111-1307, USA.
    2323*/
    24 package net.sf.basedb.ws.info;
     24package net.sf.basedb.info;
    2525
    26 import net.sf.basedb.core.BioAssaySet;
    2726
    2827/**
     
    5352      @param bioas The bioassay set to relate to.
    5453   */
     54  /*
    5555  public BioAssaySetInfo(BioAssaySet bioas)
    5656  {
     
    5959    this.numSpots = bioas.getNumSpots();   
    6060  }
     61  */
    6162
    6263  /**
  • trunk/src/info/net/sf/basedb/info/DataFileTypeInfo.java

    r3944 r3951  
    2222  Boston, MA  02111-1307, USA.
    2323*/
    24 package net.sf.basedb.ws.info;
     24package net.sf.basedb.info;
    2525
    26 import net.sf.basedb.core.DataFileType;
    2726
    2827/**
     
    5251      @param dataFileType
    5352   */
     53  /*
    5454  public DataFileTypeInfo(DataFileType dataFileType)
    5555  {
     
    5858    this.extension = dataFileType.getExtension();
    5959  }
     60  */
    6061
    6162  /**
  • trunk/src/info/net/sf/basedb/info/ExperimentInfo.java

    r3944 r3951  
    2323*/
    2424
    25 package net.sf.basedb.ws.info;
    26 
    27 import net.sf.basedb.core.Experiment;
     25package net.sf.basedb.info;
     26
    2827
    2928import java.util.Date;
     
    6564        this info object correspond to.
    6665   */
     66  /*
    6767  public ExperimentInfo(Experiment experiment)
    6868  {
     
    7878    this.pubMedId = experiment.getPubMedId();
    7979  }
     80  */
    8081
    8182  /**
  • trunk/src/info/net/sf/basedb/info/ItemInfo.java

    r3944 r3951  
    2222  Boston, MA  02111-1307, USA.
    2323*/
    24 package net.sf.basedb.ws.info;
     24package net.sf.basedb.info;
    2525
    26 import net.sf.basedb.core.Nameable;
    2726
    2827/**
     
    4847        to hold information about.
    4948   */
     49  /*
    5050  public ItemInfo(Nameable item)
    5151  {
     
    5454    this.description = item.getDescription();
    5555  }
     56  */
    5657 
    5758  /**
  • trunk/src/info/net/sf/basedb/info/ProjectInfo.java

    r3944 r3951  
    2222  Boston, MA  02111-1307, USA.
    2323*/
    24 package net.sf.basedb.ws.info;
     24package net.sf.basedb.info;
    2525
    26 import net.sf.basedb.core.Project;
    2726
    2827/**
     
    4948      @param project The project this info object relates to.
    5049   */
     50  /*
    5151  public ProjectInfo(Project project)
    5252  {
    5353    super(project);
    5454  }
     55  */
    5556}
  • trunk/src/info/net/sf/basedb/info/RawBioAssayInfo.java

    r3944 r3951  
    2222  Boston, MA  02111-1307, USA.
    2323*/
    24 package net.sf.basedb.ws.info;
     24package net.sf.basedb.info;
    2525
    26 import net.sf.basedb.core.RawBioAssay;
    2726
    2827/**
     
    5554      @param rba The RawBioAssay the object correspond to.
    5655  */
     56  /*
    5757  public RawBioAssayInfo(RawBioAssay rba)
    5858  {
     
    6262    this.rawDataTypeId = rba.getRawDataType().getId();
    6363  }
     64  */
    6465
    6566  /**
  • trunk/src/test/TestWebservices.java

    r3939 r3951  
    3232import net.sf.basedb.core.query.Hql;
    3333import net.sf.basedb.core.query.Restrictions;
     34import net.sf.basedb.info.ArrayDesignInfo;
     35import net.sf.basedb.info.BioAssaySetInfo;
     36import net.sf.basedb.info.DataFileTypeInfo;
     37import net.sf.basedb.info.ExperimentInfo;
     38import net.sf.basedb.info.ProjectInfo;
     39import net.sf.basedb.info.RawBioAssayInfo;
    3440import net.sf.basedb.ws.client.ArrayDesignClient;
    3541import net.sf.basedb.ws.client.BioAssaySetClient;
    3642import net.sf.basedb.ws.client.ExperimentClient;
    3743import net.sf.basedb.ws.client.ProjectClient;
     44import net.sf.basedb.ws.client.QueryOptions;
    3845import net.sf.basedb.ws.client.RawBioAssayClient;
    3946import net.sf.basedb.ws.client.SessionClient;
    40 import net.sf.basedb.ws.info.ArrayDesignInfo;
    41 import net.sf.basedb.ws.info.BioAssaySetInfo;
    42 import net.sf.basedb.ws.info.DataFileTypeInfo;
    43 import net.sf.basedb.ws.info.ExperimentInfo;
    44 import net.sf.basedb.ws.info.ProjectInfo;
    45 import net.sf.basedb.ws.info.QueryOptions;
    46 import net.sf.basedb.ws.info.RawBioAssayInfo;
    4747
    4848import java.io.File;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/ArrayDesignClient.java

    r3874 r3951  
    2424package net.sf.basedb.ws.client;
    2525
    26 import net.sf.basedb.ws.info.DataFileTypeInfo;
    27 import net.sf.basedb.ws.info.QueryOptions;
     26import net.sf.basedb.info.DataFileTypeInfo;
    2827
    2928import java.io.File;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/ExperimentClient.java

    r3876 r3951  
    2424package net.sf.basedb.ws.client;
    2525
    26 import net.sf.basedb.ws.info.BioAssaySetInfo;
    27 import net.sf.basedb.ws.info.ExperimentInfo;
    28 import net.sf.basedb.ws.info.QueryOptions;
    29 import net.sf.basedb.ws.info.RawBioAssayInfo;
     26import net.sf.basedb.info.BioAssaySetInfo;
     27import net.sf.basedb.info.ExperimentInfo;
     28import net.sf.basedb.info.RawBioAssayInfo;
    3029
    3130import org.apache.axis2.AxisFault;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/ProjectClient.java

    r3876 r3951  
    2424package net.sf.basedb.ws.client;
    2525
    26 import net.sf.basedb.ws.info.ProjectInfo;
    27 import net.sf.basedb.ws.info.QueryOptions;
     26import net.sf.basedb.info.ProjectInfo;
    2827
    2928import org.apache.axis2.AxisFault;
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/QueryOptions.java

    r3944 r3951  
    2323*/
    2424
    25 package net.sf.basedb.ws.info;
     25package net.sf.basedb.ws.client;
    2626
    2727/**
  • trunk/src/webservices/client/java/net/sf/basedb/ws/client/RawBioAssayClient.java

    r3876 r3951  
    2424package net.sf.basedb.ws.client;
    2525
    26 import net.sf.basedb.ws.info.ArrayDesignInfo;
    27 import net.sf.basedb.ws.info.DataFileTypeInfo;
    28 import net.sf.basedb.ws.info.QueryOptions;
     26import net.sf.basedb.info.ArrayDesignInfo;
     27import net.sf.basedb.info.DataFileTypeInfo;
    2928
    3029import java.io.File;
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ArrayDesignService.java

    r3919 r3951  
    3232import net.sf.basedb.core.ItemQuery;
    3333import net.sf.basedb.core.SessionControl;
    34 import net.sf.basedb.ws.info.DataFileTypeInfo;
    35 import net.sf.basedb.ws.info.QueryOptions;
     34import net.sf.basedb.info.DataFileTypeInfo;
     35import net.sf.basedb.ws.client.QueryOptions;
    3636
    3737import java.util.LinkedList;
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ExperimentService.java

    r3908 r3951  
    3030import net.sf.basedb.core.RawBioAssay;
    3131import net.sf.basedb.core.SessionControl;
    32 import net.sf.basedb.ws.info.BioAssaySetInfo;
    33 import net.sf.basedb.ws.info.ExperimentInfo;
    34 import net.sf.basedb.ws.info.QueryOptions;
    35 import net.sf.basedb.ws.info.RawBioAssayInfo;
     32import net.sf.basedb.info.BioAssaySetInfo;
     33import net.sf.basedb.info.ExperimentInfo;
     34import net.sf.basedb.info.RawBioAssayInfo;
     35import net.sf.basedb.ws.client.QueryOptions;
    3636
    3737import java.util.LinkedList;
     
    124124      @param experimentId The id of the experiment to get the rawbioassays from.
    125125      @param qOpt QueryOptions to put on the query when getting the rawbioassays.
    126       @return Array with {@link net.sf.basedb.ws.info.RawBioAssayInfo}s
     126      @return Array with {@link net.sf.basedb.info.RawBioAssayInfo}s
    127127   */
    128128  public RawBioAssayInfo[] getRawBioAssays(String ID, int experimentId, QueryOptions qOpt)
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ProjectService.java

    r3908 r3951  
    2828import net.sf.basedb.core.Project;
    2929import net.sf.basedb.core.SessionControl;
    30 import net.sf.basedb.ws.info.ProjectInfo;
    31 import net.sf.basedb.ws.info.QueryOptions;
     30import net.sf.basedb.info.ProjectInfo;
     31import net.sf.basedb.ws.client.QueryOptions;
    3232
    3333import java.util.LinkedList;
  • trunk/src/webservices/server/net/sf/basedb/ws/server/RawBioAssayService.java

    r3919 r3951  
    3333import net.sf.basedb.core.RawBioAssay;
    3434import net.sf.basedb.core.SessionControl;
    35 import net.sf.basedb.ws.info.ArrayDesignInfo;
    36 import net.sf.basedb.ws.info.DataFileTypeInfo;
    37 import net.sf.basedb.ws.info.QueryOptions;
     35import net.sf.basedb.info.ArrayDesignInfo;
     36import net.sf.basedb.info.DataFileTypeInfo;
     37import net.sf.basedb.ws.client.QueryOptions;
    3838
    3939import java.util.LinkedList;
  • trunk/src/webservices/server/net/sf/basedb/ws/server/ServicesUtil.java

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