Migrated attachment for Guice issue 16, comment 6

hide-jarjar-and-internal.util-once-and-for-all.txt

### Eclipse Workspace Patch 1.0
#P guice
Index: extensions/assistedinject/build.xml
===================================================================
--- extensions/assistedinject/build.xml	(revision 1321)
+++ extensions/assistedinject/build.xml	(working copy)
@@ -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.">
Index: extensions/grapher/build.xml
===================================================================
--- extensions/grapher/build.xml	(revision 1321)
+++ extensions/grapher/build.xml	(working copy)
@@ -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.">
Index: common.xml
===================================================================
--- common.xml	(revision 1321)
+++ common.xml	(working copy)
@@ -112,6 +112,21 @@
   <target name="distjars"
       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.">
@@ -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>
Index: extensions/servlet/build.xml
===================================================================
--- extensions/servlet/build.xml	(revision 1321)
+++ extensions/servlet/build.xml	(working copy)
@@ -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.">
Index: extensions/multibindings/build.xml
===================================================================
--- extensions/multibindings/build.xml	(revision 1321)
+++ extensions/multibindings/build.xml	(working copy)
@@ -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.">
Index: extensions/jndi/build.xml
===================================================================
--- extensions/jndi/build.xml	(revision 1321)
+++ extensions/jndi/build.xml	(working copy)
@@ -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.">
Index: extensions/throwingproviders/build.xml
===================================================================
--- extensions/throwingproviders/build.xml	(revision 1321)
+++ extensions/throwingproviders/build.xml	(working copy)
@@ -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.">
Index: extensions/persist/build.xml
===================================================================
--- extensions/persist/build.xml	(revision 1321)
+++ extensions/persist/build.xml	(working copy)
@@ -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.">
Index: extensions/struts2/build.xml
===================================================================
--- extensions/struts2/build.xml	(revision 1321)
+++ extensions/struts2/build.xml	(working copy)
@@ -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>
 
Index: build.xml
===================================================================
--- build.xml	(revision 1321)
+++ build.xml	(working copy)
@@ -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"/>
Index: core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java
===================================================================
--- core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java	(revision 1321)
+++ core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java	(working copy)
@@ -140,7 +140,7 @@
   }
 
   public void testGetFinalizerUrl() {
-    assertNotNull(getClass().getResource("Finalizer.class"));
+    assertNotNull(getClass().getResource(Finalizer.class.getSimpleName() + ".class"));
   }
 }
 
Index: extensions/jmx/build.xml
===================================================================
--- extensions/jmx/build.xml	(revision 1321)
+++ extensions/jmx/build.xml	(working copy)
@@ -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.">
Index: extensions/spring/build.xml
===================================================================
--- extensions/spring/build.xml	(revision 1321)
+++ extensions/spring/build.xml	(working copy)
@@ -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.">