issue 16. hide internal things (that can be hidden). need to followup to limit visibility on internal things that need to stay pseudo-open and really close the rest.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1322 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/build.xml b/build.xml
index 964e48c..c913e9d 100644
--- a/build.xml
+++ b/build.xml
@@ -76,14 +76,14 @@
</target>
<target name="test.dist"
- depends="jar, test.compile"
+ depends="jar, test.compile-with-deps"
description="Execute JUnit tests against distribution jar.">
<java fork="true"
classname="junit.textui.TestRunner"
failonerror="true"
taskname="junit">
<classpath>
- <pathelement location="${build.dir}/test"/>
+ <pathelement location="${build.dir}/guice-${version}-tests.jar"/>
<pathelement location="${build.dir}/dist/guice-${version}.jar"/>
<pathelement location="lib/aopalliance.jar"/>
<pathelement location="lib/build/junit.jar"/>
diff --git a/common.xml b/common.xml
index 8b61511..a9f50e5 100644
--- a/common.xml
+++ b/common.xml
@@ -113,6 +113,21 @@
depends="source.jar, jar"
description="Build jar files"/>
+ <target name="test.compile-with-deps" depends="test.compile"
+ description="Build a jar of tests with internal.util refocused.">
+ <mkdir dir="${build.dir}/dist"/>
+ <dirname property="common.basedir" file="${ant.file.common}"/>
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+ classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
+ <jarjar jarfile="${build.dir}/${ant.project.name}-${version}-tests.jar">
+ <fileset dir="${build.dir}/test"/>
+ <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/>
+ <rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/>
+ <keep pattern="com.google.inject.**"/>
+ <keep pattern="com.googlecode.inject.**"/>
+ </jarjar>
+ </target>
+
<target name="jar.withdeps" depends="compile"
description="Build jar with dependencies embedded.">
<mkdir dir="${build.dir}/dist"/>
@@ -123,10 +138,13 @@
<fileset dir="${build.dir}/classes"/>
<zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
<zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
- <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/>
- <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/>
+ <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
+ <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
+ <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
+ <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
+ <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/>
+ <rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/>
<keep pattern="com.google.inject.**"/>
</jarjar>
</target>
-
</project>
diff --git a/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java b/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java
index 779f3b4..bc1516b 100644
--- a/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java
+++ b/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java
@@ -140,7 +140,7 @@
}
public void testGetFinalizerUrl() {
- assertNotNull(getClass().getResource("Finalizer.class"));
+ assertNotNull(getClass().getResource(Finalizer.class.getSimpleName() + ".class"));
}
}
diff --git a/extensions/assistedinject/build.xml b/extensions/assistedinject/build.xml
index ecb1623..28afc25 100644
--- a/extensions/assistedinject/build.xml
+++ b/extensions/assistedinject/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/grapher/build.xml b/extensions/grapher/build.xml
index 444fe92..1715af3 100644
--- a/extensions/grapher/build.xml
+++ b/extensions/grapher/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/jmx/build.xml b/extensions/jmx/build.xml
index ea50b7d..e9436ee 100644
--- a/extensions/jmx/build.xml
+++ b/extensions/jmx/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/jndi/build.xml b/extensions/jndi/build.xml
index 2025999..82be3ed 100644
--- a/extensions/jndi/build.xml
+++ b/extensions/jndi/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/multibindings/build.xml b/extensions/multibindings/build.xml
index 804851e..b8b3399 100644
--- a/extensions/multibindings/build.xml
+++ b/extensions/multibindings/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/persist/build.xml b/extensions/persist/build.xml
index 2da0ae9..ad68079 100644
--- a/extensions/persist/build.xml
+++ b/extensions/persist/build.xml
@@ -8,7 +8,7 @@
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
<fileset dir="${ext.lib.dir}" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/servlet/build.xml b/extensions/servlet/build.xml
index 10d0c56..7b1f76f 100644
--- a/extensions/servlet/build.xml
+++ b/extensions/servlet/build.xml
@@ -9,7 +9,7 @@
<fileset dir="${lib.dir}/build" includes="*.jar"/>
<fileset dir="${ext.lib.dir}" includes="*.jar"/>
<fileset dir="${ext.lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/spring/build.xml b/extensions/spring/build.xml
index 5f97d0d..6f0d4e4 100644
--- a/extensions/spring/build.xml
+++ b/extensions/spring/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
diff --git a/extensions/struts2/build.xml b/extensions/struts2/build.xml
index 364e3a5..dbd5f2d 100644
--- a/extensions/struts2/build.xml
+++ b/extensions/struts2/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${ext.lib.dir}" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
<fileset dir="../servlet/build" includes="*.jar"/>
</path>
diff --git a/extensions/throwingproviders/build.xml b/extensions/throwingproviders/build.xml
index b6367d6..e9b55d3 100644
--- a/extensions/throwingproviders/build.xml
+++ b/extensions/throwingproviders/build.xml
@@ -7,7 +7,7 @@
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
+ <pathelement path="../../build/classes"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
