[google-guice] r1322 committed - issue 16. hide internal things (that can be hidden). need to followu...

google-guice Tue, 26 Oct 2010 18:49:48 -0700

Revision: 1322
Author: sberlin
Date: Tue Oct 26 18:48:00 2010

Log: issue 16. hide internal things (that can be hidden). need tofollowup to limit visibility on internal things that need to staypseudo-open and really close the rest.

http://code.google.com/p/google-guice/source/detail?r=1322


Modified:
 /trunk/build.xml
 /trunk/common.xml

/trunk/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.java

 /trunk/extensions/assistedinject/build.xml
 /trunk/extensions/grapher/build.xml
 /trunk/extensions/jmx/build.xml
 /trunk/extensions/jndi/build.xml
 /trunk/extensions/multibindings/build.xml
 /trunk/extensions/persist/build.xml
 /trunk/extensions/servlet/build.xml
 /trunk/extensions/spring/build.xml
 /trunk/extensions/struts2/build.xml
 /trunk/extensions/throwingproviders/build.xml

=======================================
--- /trunk/build.xml    Mon Oct 25 18:41:46 2010
+++ /trunk/build.xml    Tue Oct 26 18:48:00 2010
@@ -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"/>
=======================================
--- /trunk/common.xml   Thu Oct 21 14:37:21 2010
+++ /trunk/common.xml   Tue Oct 26 18:48:00 2010
@@ -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"/>

+ <jarjarjarfile="${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.uti...@1"/>+ <rule pattern="com.google.inject.internal.util.**.*"result="com.google.inject.internal.ut...@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"/>

<zipfilesetsrc="${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.cgl...@1"/>- <rule pattern="org.objectweb.asm.**"result="com.google.inject.internal.a...@1"/>+ <rule pattern="net.sf.cglib.*"result="com.google.inject.internal.cgli...@1"/>+ <rule pattern="net.sf.cglib.**.*"result="com.google.inject.internal.cgl...@1.$@2"/>+ <rule pattern="org.objectweb.asm.*"result="com.google.inject.internal.as...@1"/>+ <rule pattern="org.objectweb.asm.**.*"result="com.google.inject.internal.a...@1.$@2"/>+ <rule pattern="com.google.inject.internal.util.*"result="com.google.inject.internal.uti...@1"/>+ <rule pattern="com.google.inject.internal.util.**.*"result="com.google.inject.internal.ut...@1.$@2"/>

       <keep pattern="com.google.inject.**"/>
     </jarjar>
   </target>
-
 </project>
=======================================

---/trunk/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.javaSat Jul 3 08:51:31 2010+++/trunk/core/test/com/google/inject/internal/util/FinalizableReferenceQueueTest.javaTue Oct 26 18:48:00 2010

@@ -140,7 +140,7 @@
   }

   public void testGetFinalizerUrl() {
-    assertNotNull(getClass().getResource("Finalizer.class"));

+ assertNotNull(getClass().getResource(Finalizer.class.getSimpleName()+ ".class"));

   }
 }

=======================================
--- /trunk/extensions/assistedinject/build.xml  Sat Nov 29 12:45:55 2008
+++ /trunk/extensions/assistedinject/build.xml  Tue Oct 26 18:48:00 2010
@@ -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>