Changeset 1353


Ignore:
Timestamp:
Apr 28, 2011, 8:33:04 AM (10 years ago)
Author:
Nicklas Nordborg
Message:

References #304: Implement HDFS external file support

Changes to build script to make it compatible with the new extension system in BASE 3.

Location:
extensions/net.sf.basedb.hdfs/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.hdfs/trunk/.classpath

    r1330 r1353  
    55  <classpathentry kind="lib" path="lib/hdfs/hadoop-common-0.21.0.jar"/>
    66  <classpathentry kind="lib" path="lib/hdfs/hadoop-hdfs-0.21.0.jar"/>
    7   <classpathentry kind="lib" path="lib/compile/base-core-3.0.0pre.jar"/>
     7  <classpathentry kind="lib" path="lib/compile/base-core-3.0.0.jar"/>
    88  <classpathentry kind="output" path="bin"/>
    99</classpath>
  • extensions/net.sf.basedb.hdfs/trunk/META-INF/extensions.xml

    r1343 r1353  
    88    </description>
    99    <version>1.0-dev</version>
    10     <min-base-version>3.0</min-base-version>
     10    <min-base-version>3.0.0</min-base-version>
    1111    <copyright>BASE development team</copyright>
    1212    <email>basedb-users@lists.sourceforge.net</email>
  • extensions/net.sf.basedb.hdfs/trunk/build.xml

    r1330 r1353  
    1010  <!-- variables used -->
    1111  <property name="name" value="hdfs" />
    12   <property name="version" value="1.0pre" />
     12  <property name="version" value="1.0-dev" />
    1313  <property name="src" location="src" description="Location of source files" />
    1414  <property name="build" location="build" description="Location of compiled files" />
     
    2121  <property name="javac.target" value="1.6" />
    2222  <property name="javac.encoding" value="UTF-8" />
     23  <property name="depend.base-version"
     24    value="3.0.0"
     25    description="The BASE version that this project depends on."
     26  />
    2327  <property name="depend.jars"
    24     value="http://base2.thep.lu.se/base/jars/3.0.0"
    25     description="The location of the BASE core JARs that we depend on"
     28    value="http://base2.thep.lu.se/base/jars/${depend.base-version}"
     29    description="The location of the BASE core JARs that this project depends on."
    2630  />
    2731
     
    9094    depends="build"
    9195    >
    92     <fail unless="base.home" message="base.home is not set to the path of BASE installation." />
    93     <copy todir="${base.home}/www/WEB-INF/extensions">
     96    <fail unless="base.plugins" message="base.plugins is not set to the path of BASE plug-ins directory." />
     97    <copy todir="${base.plugins}">
    9498      <fileset dir="." includes="lib/hdfs/*" />
    9599      <fileset file="${jar.name}" />
    96100    </copy>
    97    
     101    <echo>Copied '${jar.name}' and 'lib/hdfs/*' to '${base.plugins}'.</echo>
    98102  </target>
    99103 
     
    127131  <target
    128132    name="checkjar"
    129     description="Checks that the base-core-3.x.jar exists."
     133    description="Checks that the base-core-${depend.base-version}.jar exists."
    130134    >
    131135    <available classname="net.sf.basedb.core.Application"
    132       classpathref="classpath" property="base2core" />
     136      classpathref="classpath" property="base-core" />
    133137
    134     <fail unless="base2core" message="Can't find base-core-3.x.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
    135     <echo>Found base-core-3.x.jar.</echo>
     138    <fail unless="base-core" message="Can't find base-core-${depend.base-version}.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
     139    <echo>Found base-core-${depend.base-version}.jar.</echo>
    136140  </target>
    137141 
    138142  <target
    139143    name="download-lib"
    140     description="Download base-core-3.x.jar."
     144    description="Download base-core-${depend.base-version}.jar."
    141145    >
    142146    <echo>
     
    147151-------------------------------------------------------
    148152    </echo>
    149     <download-lib file="base-core-3.0.0.jar" />
     153    <download-lib file="base-core-${depend.base-version}.jar" />
    150154  </target>
    151155 
     
    181185      encoding="UTF-8"
    182186    />
    183 
     187    <replaceregexp
     188      file="META-INF/extensions.xml"
     189      match="&lt;min-base-version&gt;.*&lt;/min-base-version&gt;"
     190      replace="&lt;min-base-version&gt;${depend.base-version}&lt;/min-base-version&gt;"
     191      encoding="UTF-8"
     192    />
     193   
    184194    <echo>Don't forget to commit the changes to the subversion repository!</echo>
    185195  </target>
  • extensions/net.sf.basedb.hdfs/trunk/src/net/sf/basedb/hdfs/Hdfs.java

    r1330 r1353  
    3232    The current version of this package.
    3333  */
    34   public static final String VERSION = "1.0pre";
     34  public static final String VERSION = "1.0-dev";
    3535
    3636  /**
Note: See TracChangeset for help on using the changeset viewer.