Skip to content

Commit

Permalink
- Added bnd.jar to ./lib dir
Browse files Browse the repository at this point in the history
- Changed build.xml to make use of bnd.jar, instead of downloading it
  • Loading branch information
belaban committed Aug 11, 2011
1 parent f52ac4f commit 86b816e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ tmp/
bla*.java
doc/manual/target
doc/tutorial/target
bnd/
conf/MANIFEST.MF


Expand Down
19 changes: 4 additions & 15 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<property name="timestamp" value=".timestamp"/>
<property name="protocols.xml" value="${manual.dir}/en/modules/protocols.xml"/>
<property name="maven.executable" value="mvn"/>
<property name="bnd.dir" value="${root.dir}/bnd"/>

<!-- 5 minutes per test suite timeout -->
<property name="unittest.timeout.low" value="500000"/>
Expand All @@ -54,11 +53,6 @@
<include name="*.jar"/>
</fileset>
</path>
<path id="bnd.classpath">
<fileset dir="${bnd.dir}">
<include name="*.jar"/>
</fileset>
</path>

<taskdef resource="testngtasks" classpathref="jg.classpath"/>

Expand Down Expand Up @@ -167,18 +161,17 @@
description="Creates the jgroups-${version}.jar (includes everything)"
depends="clean,compile-no-unittests,compile-essential-unittests">
<mkdir dir="${dist.dir}"/>
<get src="http://dl.dropbox.com/u/2590603/bnd/biz.aQute.bnd.jar" dest="bnd/biz.aQute.bnd.jar" skipexisting="true"/>
<xmlproperty file="${ant.file}" collapseAttributes="true" prefix="bnd"/>
<property name="bndclasspath" refid="jg.classpath"/>
<property name="-savemanifest" value="${conf.dir}/MANIFEST.MF"/>
<property name="-output" value="${conf.dir}"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="jg.classpath"/>
<bnd
classpath="${bndclasspath}"
eclipse="false"
failok="false"
exceptions="true"
files="${bnd.dir}/jgroups.bnd" />
files="${conf.dir}/jgroups.bnd" />
<jar destfile="${dist.dir}/jgroups-${version}.jar"
basedir="${compile.dir}"
manifest="${conf.dir}/MANIFEST.MF"
Expand All @@ -199,17 +192,16 @@
<target name="jgroups-sources.jar"
description="Creates the jgroups-sources.jar. Includes only core source files, no demos, no tests">
<mkdir dir="${dist.dir}"/>
<get src="http://dl.dropbox.com/u/2590603/bnd/biz.aQute.bnd.jar" dest="bnd/biz.aQute.bnd.jar" skipexisting="true"/>
<property name="bndclasspath" refid="jg.classpath"/>
<property name="-savemanifest" value="${conf.dir}/MANIFEST.MF"/>
<property name="-output" value="${conf.dir}"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="jg.classpath"/>
<bnd
classpath=""
eclipse="false"
failok="false"
exceptions="true"
files="${bnd.dir}/jgroups.bnd" />
files="${conf.dir}/jgroups.bnd" />
<jar jarfile="${dist.dir}/jgroups-sources.jar"
basedir="${src.dir}"
manifest="${conf.dir}/MANIFEST.MF"
Expand Down Expand Up @@ -312,9 +304,6 @@
<delete dir="${manual.dir}/target"/>
<delete dir="${tutorial.dir}/target"/>
<delete dir="${root.dir}/schema" failonerror="false"/>
<delete>
<fileset dir="${bnd.dir}" includes="biz*"/>
</delete>
</target>


Expand Down
File renamed without changes.
Binary file added lib/bnd.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions lib/licenses/thirdparty-licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
projectHome='http://ant.apache.org/'
description='ANT (compile time), needed for generation of test reports'>
<jar name='serializer.jar' />
</module>
<module name='BND'
licenseType='apache-2.0'
version='1.44.0'
projectHome='http://www.aqute.biz/Bnd/Bnd'
description='Used to generate an OSGI compliant conf/MANIFEST.MF'>
<jar name='bnd.jar' />
</module>
<module name='Bouncy castle'
licenseType='bouncycastle'
Expand Down

0 comments on commit 86b816e

Please sign in to comment.