Skip to content

Commit

Permalink
BAD-38: Moved shims into their own project (pentaho-hadoop-shims)
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Burgess committed Jun 11, 2013
1 parent ce3fff6 commit 7f60f2d
Show file tree
Hide file tree
Showing 354 changed files with 3 additions and 24,387 deletions.
7 changes: 0 additions & 7 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,4 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.apache.ivyde.eclipse.ivynature</nature>
</natures>
<linkedResources>
<link>
<name>src-mapred</name>
<type>2</type>
<location>/Users/jordan/dev/pentaho/big-data-plugin/shims/common/src-mapred</location>
</link>
</linkedResources>
</projectDescription>
38 changes: 3 additions & 35 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,45 +66,16 @@
</target>

<target name="dist-noresolve" depends="jar,package" description="Builds and packages the application" />
<target name="dist" depends="build-shims,resolve,jar,package" description="Builds and packages the application" />
<target name="dist" depends="resolve,jar,package" description="Builds and packages the application" />

<target name="clean-all" depends="subfloor.clean-all,clean-pmr,clean-all-shims" />
<target name="clean-all" depends="subfloor.clean-all,clean-pmr" />

<target name="clean-dist">
<delete dir="${dist.dir}" />
<delete dir="${stage.dir}" />
<delete dir="${platform.unzip.dir}" />
</target>

<target name="clean-all-shims" description="Clean all shim projects">
<ant antfile="shims/build.xml" inheritall="false" target="clean-all" />
</target>

<!-- Build all the shim modules -->
<target name="build-shims" description="Build all shim projects (dist and publish-local)">
<ant antfile="shims/build.xml" inheritall="false">
<target name="build-all" />
</ant>
</target>

<!-- Publish all the shim modules -->
<target name="publish-shims" description="Publishes all shim projects. build-shims should be called previous to this.">
<ant antfile="shims/build.xml" target="publish" inheritall="false"/>
</target>

<!-- Test all the shim modules -->
<target name="test-shims" description="Tests all shim projects. build-shims should be called previous to this.">
<ant antfile="shims/build.xml" target="test" inheritall="false"/>
</target>

<!-- Generate code coverage for the shim modules -->
<target name="cobertura-shims" description="Run cobertura on all shim projects. build-shims should be called previous to this.">
<ant antfile="shims/build.xml" target="cobertura" inheritall="false"/>
</target>

<!-- Perform cobertura shim coverage in addition to our coverage -->
<target name="cobertura" depends="cobertura-shims,subfloor.cobertura" />

<target name="assemble.init">
<mkdir dir="${stage.dir}" />
<mkdir dir="${stage.dir}/${ivy.artifact.id}" />
Expand Down Expand Up @@ -226,10 +197,7 @@
</antcall>
</target>

<!-- Publish shims at the same time as publishing ourself -->
<target name="publish" depends="publish-shims,subfloor.publish" />

<target name="create-package-pom"
<target name="create-package-pom"
depends="install-ivy,subfloor-pkg.create-package-pom"
description="Creates a POM file based on the ivy dependencies for a separate package">
<ivy:makepom ivyfile="${package-samples.artifact.ivyfile}" pomfile="${package-samples.artifact.pomfile}" />
Expand Down
8 changes: 0 additions & 8 deletions shims/api/.classpath

This file was deleted.

18 changes: 0 additions & 18 deletions shims/api/.project

This file was deleted.

10 changes: 0 additions & 10 deletions shims/api/build.properties

This file was deleted.

16 changes: 0 additions & 16 deletions shims/api/build.xml

This file was deleted.

24 changes: 0 additions & 24 deletions shims/api/ivy.xml

This file was deleted.

26 changes: 0 additions & 26 deletions shims/api/ivysettings.xml

This file was deleted.

This file was deleted.

This file was deleted.

41 changes: 0 additions & 41 deletions shims/api/src/org/pentaho/hadoop/mapreduce/InKeyValueOrdinals.java

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7f60f2d

Please sign in to comment.