Changeset 1353 for extensions/net.sf.basedb.hdfs

Timestamp:

Apr 28, 2011, 8:33:04 AM (12 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:

• .classpath (modified) (1 diff)
• META-INF/extensions.xml (modified) (1 diff)
• build.xml (modified) (6 diffs)
• src/net/sf/basedb/hdfs/Hdfs.java (modified) (1 diff)

extensions/net.sf.basedb.hdfs/trunk/.classpath

@@ -5 +5 @@
   <classpathentry kind="lib" path="lib/hdfs/hadoop-common-0.21.0.jar"/>
   <classpathentry kind="lib" path="lib/hdfs/hadoop-hdfs-0.21.0.jar"/>
-  <classpathentry kind="lib" path="lib/compile/base-core-3.0.0pre.jar"/>
+  <classpathentry kind="lib" path="lib/compile/base-core-3.0.0.jar"/>
   <classpathentry kind="output" path="bin"/>
 </classpath>

extensions/net.sf.basedb.hdfs/trunk/META-INF/extensions.xml

@@ -8 +8 @@
     </description>
     <version>1.0-dev</version>
-    <min-base-version>3.0</min-base-version>
+    <min-base-version>3.0.0</min-base-version>
     <copyright>BASE development team</copyright>
     <email>basedb-users@lists.sourceforge.net</email>

extensions/net.sf.basedb.hdfs/trunk/build.xml

@@ -10 +10 @@
   <!-- variables used -->
   <property name="name" value="hdfs" />
-  <property name="version" value="1.0pre" />
+  <property name="version" value="1.0-dev" />
   <property name="src" location="src" description="Location of source files" />
   <property name="build" location="build" description="Location of compiled files" />
@@ -21 +21 @@
   <property name="javac.target" value="1.6" />
   <property name="javac.encoding" value="UTF-8" />
+  <property name="depend.base-version" 
+    value="3.0.0" 
+    description="The BASE version that this project depends on."
+  />
   <property name="depend.jars" 
-    value="http://base2.thep.lu.se/base/jars/3.0.0" 
-    description="The location of the BASE core JARs that we depend on"
+    value="http://base2.thep.lu.se/base/jars/${depend.base-version}" 
+    description="The location of the BASE core JARs that this project depends on."
   />
 
@@ -90 +94 @@
     depends="build"
     >
-    <fail unless="base.home" message="base.home is not set to the path of BASE installation." />
-    <copy todir="${base.home}/www/WEB-INF/extensions">
+    <fail unless="base.plugins" message="base.plugins is not set to the path of BASE plug-ins directory." />
+    <copy todir="${base.plugins}">
       <fileset dir="." includes="lib/hdfs/*" />
       <fileset file="${jar.name}" />
     </copy>
-    
+    <echo>Copied '${jar.name}' and 'lib/hdfs/*' to '${base.plugins}'.</echo>
   </target>
   
@@ -127 +131 @@
   <target 
     name="checkjar"
-    description="Checks that the base-core-3.x.jar exists."
+    description="Checks that the base-core-${depend.base-version}.jar exists."
     >
     <available classname="net.sf.basedb.core.Application" 
-      classpathref="classpath" property="base2core" />
+      classpathref="classpath" property="base-core" />
 
-    <fail unless="base2core" message="Can't find base-core-3.x.jar in ./lib/compile. Try 'ant download-lib' to download the missing file." />
-    <echo>Found base-core-3.x.jar.</echo>
+    <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." />
+    <echo>Found base-core-${depend.base-version}.jar.</echo>
   </target>
   
   <target 
     name="download-lib"
-    description="Download base-core-3.x.jar."
+    description="Download base-core-${depend.base-version}.jar."
     >
     <echo>
@@ -147 +151 @@
 -------------------------------------------------------
     </echo>
-    <download-lib file="base-core-3.0.0.jar" />
+    <download-lib file="base-core-${depend.base-version}.jar" />
   </target>
   
@@ -181 +185 @@
       encoding="UTF-8"
     />
-
+    <replaceregexp 
+      file="META-INF/extensions.xml"
+      match="&lt;min-base-version&gt;.*&lt;/min-base-version&gt;"
+      replace="&lt;min-base-version&gt;${depend.base-version}&lt;/min-base-version&gt;"
+      encoding="UTF-8"
+    />
+    
     <echo>Don't forget to commit the changes to the subversion repository!</echo>
   </target>

extensions/net.sf.basedb.hdfs/trunk/src/net/sf/basedb/hdfs/Hdfs.java

@@ -32 +32 @@
     The current version of this package.
   */
-  public static final String VERSION = "1.0pre";
+  public static final String VERSION = "1.0-dev";
 
   /**