diff options
| author | sberlin <sberlin@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-05-09 12:48:24 +0000 |
|---|---|---|
| committer | sberlin <sberlin@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-05-09 12:48:24 +0000 |
| commit | f7ac6ea677ccfff6c3bec7db1d3621e6b6cf4097 (patch) | |
| tree | 7f38550677d7f791df8b5eb174f1fa031d11d741 /common.xml | |
| parent | 34d2f00eee00ba170c3dffa72154399b830a67a6 (diff) | |
| download | guice-f7ac6ea677ccfff6c3bec7db1d3621e6b6cf4097.tar.gz | |
Patches to let Guice be more OSGi (and classloader) friendly. Solves issue 439, issue 337, issue 443, and issue 343. All provided by Stuart McCulloch. Many thanks, Stuart!
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1158 d779f126-a31b-0410-b53b-1d3aecad763e
Diffstat (limited to 'common.xml')
| -rw-r--r-- | common.xml | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -7,7 +7,7 @@ <!-- can be overridden at the command line with -Dversion= or in IDEA, in the ant properties dialog --> <property name="version" value="snapshot"/> - <property name="api.version" value="2.1"/> + <property name="api.version" value="1.3"/> <target name="compile" description="Compile Java source."> <mkdir dir="${build.dir}/classes"/> @@ -25,13 +25,14 @@ <target name="manifest" description="Generate OSGi manifest." depends="compile"> <dirname property="common.basedir" file="${ant.file.common}"/> <taskdef resource="aQute/bnd/ant/taskdef.properties" - classpath="${common.basedir}/lib/build/bnd-0.0.305.jar"/> + classpath="${common.basedir}/lib/build/bnd-0.0.384.jar"/> <fail unless="module" message="Missing 'module' property (use the primary package name in this jar)"/> + <property name="imports" value=""/> <property name="Bundle-Name" value="${ant.project.name}"/> <property name="Bundle-SymbolicName" value="${module}"/> - <property name="Bundle-Version" value="${replace;${version};^[^0-9];${api.version}.$0}"/> + <property name="Bundle-Version" value="${replace;${version};^[^0-9];0.0.0.$0}"/> <property name="Bundle-Description" value="Guice is a lightweight dependency injection framework for Java 5 and above"/> <property name="Bundle-DocURL" value="http://code.google.com/p/google-guice/"/> @@ -39,12 +40,18 @@ <property name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0"/> <property name="Bundle-Vendor" value="Google Inc."/> - <property name="exclude.imports" value=""/> - <property name="api.range" value=""[${api.version},${version;+;${api.version}})""/> - <property name="guice.imports" value="com.google.inject.*;version=${api.range}"/> - <property name="Import-Package" value="${exclude.imports},${guice.imports},*;resolution:=optional"/> <property name="Export-Package" value="!${module}.internal.*,${module}.*;version=${api.version}"/> + <condition property="Import-Package" value="!com.google.inject.*,*" else="!${module}.*,${imports},*"> + <istrue value="${fragment}"/> + </condition> + + <condition property="Fragment-Host" value="com.google.inject"> + <istrue value="${fragment}"/> + </condition> + + <property name="-nouses" value="true"/> + <property name="-removeheaders" value="Bnd-LastModified,Ignore-Package,Include-Resource,Private-Package,Tool"/> <bndwrap jars="${build.dir}/classes" output="${build.dir}"/> |