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
diff --git a/build.xml b/build.xml
index 659a7d4..6b43633 100644
--- a/build.xml
+++ b/build.xml
@@ -2,9 +2,6 @@
<project name="guice" default="compile">
- <property name="DynamicImport-Package" value="org.aopalliance.intercept"/>
- <property name="exclude.imports" value="!com.google.common.*,!net.sf.*,!org.objectweb.*"/>
-
<import file="common.xml"/>
<path id="compile.classpath">
@@ -90,10 +87,15 @@
<pathelement location="lib/build/easymock.jar"/>
<pathelement location="lib/javax.inject.jar"/>
<pathelement location="lib/build/javax.inject-tck.jar"/>
+ <pathelement location="lib/build/bnd-0.0.384.jar"/>
+ <pathelement location="lib/build/felix-2.0.5.jar"/>
</classpath>
<arg value="com.google.inject.AllTests"/>
<syspropertyset>
<propertyref name="guice.custom.loader"/>
+ <propertyref name="version"/>
+ <propertyref name="build.dir"/>
+ <propertyref name="lib.dir"/>
</syspropertyset>
</java>
</target>