Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
CHUKWA-36. Fixed build structure for development to continue.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/chukwa/trunk@758128 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
macroadster committed Mar 25, 2009
1 parent 69d328c commit d31e074abc9149c7d776da9c5420e9d10b8370e3
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 56 deletions.
152 build.xml
@@ -67,10 +67,31 @@
<exclude name="**/*core*.jar" />
</fileset>
<fileset dir="${hadoop.home.jars.dir}"> <!-- ASR -->
<include name="**/*core*.jar" />
<include name="**/hadoop-0.2*-core.jar" />
</fileset>
<fileset dir="${common.ivy.lib.dir}">
<include name="**/*.jar" />
</fileset>
<path refid="contrib-classpath"/>
</path>
<path id="dp-classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar" />
<exclude name="**/excluded/" />
</fileset>
<pathelement location="${build.classes}"/>
<fileset dir="${hadoop.default.jars.dir}"> <!-- ASR -->
<include name="**/*.jar" />
<exclude name="**/*core*.jar" />
</fileset>
<fileset dir="${hadoop.home.jars.dir}"> <!-- ASR -->
<include name="**/hadoop-0.18.0-core.jar" />
</fileset>
<fileset dir="${common.ivy.lib.dir}">
<include name="**/*.jar" />
</fileset>
<pathelement location="${conf.dir}"/>
</path>
<path id="testClasspath">
<pathelement location="${build.classes}"/>
<pathelement location="${test.build.classes}"/>
@@ -90,9 +111,12 @@
<path id="testDemuxClasspath">
<pathelement location="${build.classes}"/>
<pathelement location="${test.build.classes}"/>
<fileset dir="${hadoop.jar}">
<fileset dir="${hadoop.default.jars.dir}"> <!-- ASR -->
<include name="**/*.jar" />
<exclude name="**/excluded/" />
<exclude name="**/hadoop-0.2*-core.jar" />
</fileset>
<fileset dir="${hadoop.home.jars.dir}"> <!-- ASR -->
<include name="**/*core*.jar" />
</fileset>
<fileset dir="${lib.dir}">
<include name="**/*.jar" />
@@ -249,8 +273,7 @@
<property name="test.include" value="Test*"/>
<property name="test.classpath.id" value="test.classpath"/>
<property name="test.output" value="yes"/>
<!--<property name="test.timeout" value="900000"/> -->
<property name="test.timeout" value="5000"/>
<property name="test.timeout" value="900000"/>
<property name="test.junit.output.format" value="plain"/>
<property name="test.junit.fork.mode" value="perTest" />
<property name="test.junit.printsummary" value="yes" />
@@ -273,12 +296,54 @@
</echo>
</target>

<target name="compile" depends="init" description="Compilation target">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.dir}/test"/>
<javac srcdir="src/java/org/apache/hadoop" destdir="${build.classes}" excludes="**/ChukwaTTInstru.java" debug="${javac.debug}">
<target name="compile" depends="compile-common,compile-inputtools,compile-datacollection,compile-extraction,compile-hicc" description="Compilation target">
</target>

<target name="compile-common" depends="init" description="Compilation target">
<javac srcdir="src/java" destdir="${build.classes}" debug="${javac.debug}">
<exclude name="org/apache/hadoop/chukwa/datacollection/**" />
<exclude name="org/apache/hadoop/chukwa/extraction/**" />
<exclude name="org/apache/hadoop/chukwa/inputtools/**" />
<exclude name="org/apache/hadoop/mapred/**" />
<compilerarg value="-Xlint"/>
<classpath refid="classpath" />
</javac>
</target>

<target name="compile-inputtools" depends="init,compile-common" description="Compile Input Tools">
<javac srcdir="src/java" destdir="${build.classes}" excludes="**/ChukwaTTInstru.java" debug="${javac.debug}">
<compilerarg value="-Xlint"/>
<exclude name="org/apache/hadoop/*" />
<include name="org/apache/hadoop/chukwa/inputtools/**" />
<classpath refid="classpath" />
</javac>
</target>

<target name="compile-datacollection" depends="init,compile-common" description="Compilation Data Collection Framework">
<javac srcdir="src/java" destdir="${build.classes}" debug="${javac.debug}">
<compilerarg value="-Xlint"/>
<classpath refid="classpath" />
<exclude name="org/apache/hadoop/*" />
<include name="org/apache/hadoop/chukwa/datacollection/**" />
</javac>
</target>

<target name="compile-extraction" depends="init,compile-common" description="Compilation Data Processing Framework">
<javac srcdir="src/java" destdir="${build.classes}" debug="${javac.debug}">
<compilerarg value="-Xlint"/>
<classpath refid="dp-classpath" />
<exclude name="org/apache/hadoop/chukwa/*" />
<include name="org/apache/hadoop/chukwa/database/**" />
<include name="org/apache/hadoop/chukwa/extraction/**" />
</javac>
</target>

<target name="compile-hicc" depends="init" description="Compilation HICC Framework">
<javac srcdir="src/java" destdir="${build.classes}" debug="${javac.debug}">
<compilerarg value="-Xlint"/>
<classpath refid="classpath" />
<exclude name="org/apache/hadoop/chukwa/*" />
<include name="org/apache/hadoop/chukwa/hicc/**" />
</javac>
</target>

@@ -291,7 +356,7 @@
<delete dir="${test.build.classes}"/>
<mkdir dir="${test.build.classes}"/>

<javac srcdir="${test.src.dir}/org/apache/hadoop/chukwa" destdir="${test.build.dir}/classes" debug="${javac.debug}">
<javac srcdir="${test.src.dir}" destdir="${test.build.dir}/classes" debug="${javac.debug}">
<classpath refid="testClasspath" />
<classpath refid="testDemuxClasspath" />
</javac>
@@ -316,10 +381,13 @@
<include name="**/${test.include}.java"/>
<exclude name="**/${test.exclude}.java"/>
<exclude name="**/TestAgentConfig.java"/>
<exclude name="**/TestDemux.java"/>
</fileset>
</batchtest>
<batchtest todir="${test.build.dir}" if="testcase">
<fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
<fileset dir="${test.src.dir}" includes="**/${testcase}.java">
<exclude name="**/TestDemux.java"/>
</fileset>
</batchtest>
</junit>
<fail if="tests.failed">Tests failed!</fail>
@@ -479,72 +547,50 @@
<copy todir="${build.dir}/hicc/WEB-INF/classes">
<fileset dir="${build.classes}">
<include name="org/apache/hadoop/chukwa/hicc/**/*.class" />
</fileset>
<fileset dir="${build.classes}">
<include name="org/apache/hadoop/chukwa/conf/**/*.class" />
</fileset>
<fileset dir="${build.classes}">
<include name="org/apache/hadoop/chukwa/database/**/*.class" />
<include name="org/apache/hadoop/chukwa/datacollection/**/*.class" />
</fileset>
<fileset dir="${build.classes}">
<include name="org/apache/hadoop/chukwa/extraction/engine/**/*.class" />
</fileset>
<fileset dir="${build.classes}">
<include name="org/apache/hadoop/chukwa/inputtools/*.class" />
</fileset>
<fileset dir="${build.classes}">
<include name="org/apache/hadoop/chukwa/util/**/*.class" />
</fileset>

<fileset dir="${basedir}/src/java">
<include name="org/apache/hadoop/chukwa/hicc/**/*.java" />
</fileset>
<fileset dir="${basedir}/src/java">
<include name="org/apache/hadoop/chukwa/conf/**/*.java" />
</fileset>
<fileset dir="${basedir}/src/java">
<include name="org/apache/hadoop/chukwa/datacollection/**/*.java" />
</fileset>
<fileset dir="${basedir}/src/java">
<include name="org/apache/hadoop/chukwa/extraction/engine/**/*.java" />
</fileset>
<fileset dir="${basedir}/src/java">
<include name="org/apache/hadoop/chukwa/inputtools/*.java" />
</fileset>
<fileset dir="${basedir}/src/java">
<include name="org/apache/hadoop/chukwa/util/**/*.java" />
</fileset>

</copy>
<copy todir="${build.dir}/hicc/WEB-INF/lib">
<fileset dir="${basedir}/lib">
<include name="json.jar" />
<include name="jstl.jar" />
<include name="servlet.jar" />
<include name="taglibs.jar" />
<include name="commons-fileupload-*.jar" />
<include name="commons-httpclient-*.jar" />
<include name="commons-logging-adapters-*.jar" />
<include name="commons-io-*.jar" />
<include name="commons-logging-api-*.jar" />
<include name="commons-logging.jar" />
<include name="log4j-*.jar" />
<include name="html-filter-1.0.jar" />
</fileset>
<fileset dir="${common.ivy.lib.dir}">
<include name="*.jar" />
<exclude name="jetty-*.jar" />
<exclude name="jsp-api*.jar" />
<exclude name="junit-*.jar" />
</fileset>
<fileset dir="${build.dir}">
<include name="${name}-core-${chukwaVersion}.jar" />
</fileset>
<fileset dir="${build.dir}/${final.name}/hadoopjars">
<include name="*.jar" />
<exclude name="hadoop-0.2*-core.jar" />
<exclude name="jasper-*.jar" />
<exclude name="jetty-*.jar" />
<exclude name="jsp-api.jar" />
<exclude name="jsp-api*.jar" />
</fileset>
</copy>
</target>

<target name="hicc_war" depends="compile, hicc" description="Create hicc jar">
<jar jarfile="${build.dir}/hicc.war" basedir="${build.dir}/hicc">
<fileset dir="${build.dir}/hicc" includes="**" />
</jar>
</target>

@@ -674,6 +720,14 @@
<fileset dir="${tools.dir}" />
</copy>

<copy todir="${build.dir}/${final.name}/var/descriptors">
<fileset dir="${basedir}/src/web/hicc/descriptors" />
</copy>

<copy todir="${build.dir}/${final.name}/var/views">
<fileset dir="${basedir}/src/web/hicc/views" />
</copy>

<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${build.dir}/${final.name}/tools">
<include name="**" />
@@ -856,14 +910,4 @@ echo
<rpm specFile="chukwa.spec" topDir="${build.dir}" cleanBuildDir="true" failOnError="true"/>
</target>

<!-- the normal classpath -->
<path id="classpath">
<pathelement location="${build.classes}"/>
<fileset dir="${lib.dir}">
<include name="**/*.jar" />
<exclude name="**/excluded/" />
</fileset>
<pathelement location="${conf.dir}"/>
</path>

</project>
Binary file not shown.
Binary file not shown.
21 ivy.xml
@@ -92,6 +92,25 @@
name="log4j"
rev="${log4j.version}"
conf="common->master"/>
<dependency org="taglibs"
name="standard"
rev="${taglibs.version}"
conf="common->default"/>
<dependency org="jspapi"
name="jsp-api"
rev="${jsp-api.version}"
conf="common->default"/>
<dependency org="jstl"
name="jstl"
rev="${jstl.version}"
conf="common->default"/>
<dependency org="mysql"
name="mysql-connector-java"
rev="${mysql-connector.version}"
conf="common->default"/>
<!-- dependency org="org.apache.hadoop"
name="hadoop-core"
rev="${hadoop.version}"
conf="common->default"/ -->
</dependencies>

</ivy-module>
@@ -29,4 +29,7 @@ servlet.version=4.0.6
servlet-api.version=5.5.12

# Not able to figureout the taglibs version
#taglibs.version=
taglibs.version=1.1.2
jsp-api.version=2.0
jstl.version=1.1.2
mysql-connector.version=5.1.6
Binary file not shown.

0 comments on commit d31e074

Please sign in to comment.