httplite: fix ant build file to match updates to source structure
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1189646 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/httplite/build.xml b/httplite/build.xml
index e503050..b5c085c 100644
--- a/httplite/build.xml
+++ b/httplite/build.xml
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<project name="org.apache.felix.http.lightweight" default="jar">
- <property name="src.dir" location="src/" />
+ <property name="src.dir" location="${basedir}/src" />
<property name="project.description" value="Lightweight HTTP Service for Apache Felix" />
+ <property name="project.version" value="0.1.0" />
<property name="external.dir" location="external" />
<property name="doc.dir" location="${basedir}/docs" />
<property name="build.dir" location="${basedir}/classes" />
@@ -35,9 +36,11 @@
<target name="fetch" depends="clean" unless="${skip.fetch}">
<mkdir dir="${external.dir}" />
- <exec executable="${wget.bin}" dir="${external.dir}">
- <arg value="-nc" />
- <arg value="http://www.meisei-u.ac.jp/mirror/apache/dist/felix/org.apache.felix.framework-4.0.1.jar" />
+ <exec executable="${wget.bin}">
+ <arg line="-P ${external.dir}" />
+ <arg line="--no-check-certificate" />
+ <arg line="-nc" />
+ <arg line="http://www.osgi.org/download/r4v42/osgi.core.jar" />
</exec>
<exec executable="${svn.bin}">
@@ -79,37 +82,37 @@
<javac destdir="${build.dir}" source="1.4" target="1.4" encoding="utf-8" fork="true" includeantruntime="false" debug="false">
<src path="${src.dir}/main/java" />
<src path="${src.dir}/share" />
- <classpath path="${external.dir}/org.apache.felix.framework-3.2.2.jar" />
+ <classpath path="${external.dir}/osgi.core.jar" />
</javac>
<javac destdir="${build.dir}-debug" source="1.4" target="1.4" encoding="utf-8" fork="true" includeantruntime="false" debug="true" debuglevel="lines,vars,source">
<src path="${src.dir}/main/java" />
<src path="${src.dir}/share" />
- <classpath path="${external.dir}/org.apache.felix.framework-3.2.2.jar" />
+ <classpath path="${external.dir}/osgi.core.jar" />
</javac>
</target>
- <target name="jar" depends="compile" description="create a Jar file for the application">
- <mkdir dir="${build.dir}/META-INF" />
- <copy toDir="${build.dir}/META-INF-MIN">
- <fileset dir="META-INF" />
- </copy>
+ <target name="jar" depends="compile" description="create a Jar file for the application">
+ <mkdir dir="${build.dir}/META-INF-MIN" />
+ <mkdir dir="${build.dir}/META-INF-ALL" />
- <copy toDir="${build.dir}/META-INF-ALL">
- <fileset dir="META-INF" />
- </copy>
-
- <manifest file="${build.dir}/META-INF-ALL/MANIFEST.MF" mode="update">
+ <manifest file="${build.dir}/META-INF-ALL/MANIFEST.MF">
<attribute name="Import-Package" value="org.osgi.framework" />
<attribute name="Export-Package" value='org.osgi.service.http;version="1.2.1", javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.resources;version="2.4"' />
<attribute name="Built-By" value="${user.name}" />
<attribute name="Built-Date" value="${TS_NOW}" />
+ <attribute name="Bundle-Name" value="${project.description} (Complete bundle)"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="${project.version}" />
</manifest>
- <manifest file="${build.dir}/META-INF-MIN/MANIFEST.MF" mode="update">
+ <manifest file="${build.dir}/META-INF-MIN/MANIFEST.MF">
<attribute name="Import-Package" value="org.osgi.framework,org.osgi.service.http,javax.servlet,javax.servlet.http,javax.servlet.resources" />
<attribute name="Export-Package" value="" />
<attribute name="Built-By" value="${user.name}" />
<attribute name="Built-Date" value="${TS_NOW}" />
+ <attribute name="Bundle-Name" value="${project.description} (Minimum bundle)"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="${project.version}" />
</manifest>
<jar destfile="${ant.project.name}-debug-all.jar" manifest="${build.dir}/META-INF-ALL/MANIFEST.MF">
@@ -125,7 +128,7 @@
</jar>
<jar destfile="${ant.project.name}-min.jar" manifest="${build.dir}/META-INF-MIN/MANIFEST.MF">
- <fileset dir="${build.dir}" includes="org/apache/felix/http/lightweight/**/*.class" />
+ <fileset dir="${build.dir}" includes="org/apache/felix/httplite/**/*.class" />
<fileset dir="." includes="LICENSE-2.0.txt" />
</jar>
</target>