Return-Path: Delivered-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Received: (qmail 17382 invoked from network); 27 Mar 2011 00:54:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Mar 2011 00:54:58 -0000 Received: (qmail 21306 invoked by uid 500); 27 Mar 2011 00:54:58 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 21284 invoked by uid 500); 27 Mar 2011 00:54:58 -0000 Mailing-List: contact xbean-scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xbean-scm@geronimo.apache.org Delivered-To: mailing list xbean-scm@geronimo.apache.org Received: (qmail 21277 invoked by uid 99); 27 Mar 2011 00:54:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Mar 2011 00:54:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Mar 2011 00:54:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 40FEB23888FD; Sun, 27 Mar 2011 00:54:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1085846 - in /geronimo/xbean/trunk/xbean-finder/src: main/java/org/apache/xbean/finder/ main/java/org/apache/xbean/finder/archive/ main/java/org/apache/xbean/finder/filter/ main/java/org/apache/xbean/finder/util/ test/java/org/apache/xbean... Date: Sun, 27 Mar 2011 00:54:34 -0000 To: xbean-scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110327005435.40FEB23888FD@eris.apache.org> Author: dblevins Date: Sun Mar 27 00:54:33 2011 New Revision: 1085846 URL: http://svn.apache.org/viewvc?rev=1085846&view=rev Log: Organizing into subpackages Added: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/Archive.java (contents, props changed) - copied, changed from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Archive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java (contents, props changed) - copied, changed from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/BundleArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java (contents, props changed) - copied, changed from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassesArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClasspathArchive.java (contents, props changed) - copied, changed from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClasspathArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilteredArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ExcludeIncludeFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filter.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilterList.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filters.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/IncludeExcludeFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/PackageFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/RegexFilter.java (contents, props changed) - copied, changed from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/RegexFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/Classes.java (contents, props changed) - copied, changed from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Classes.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/SingleLinkedList.java (contents, props changed) - copied, changed from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/SingleLinkedList.java Removed: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Archive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/BundleArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Classes.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassesArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClasspathArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ExcludeIncludeFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilterList.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilteredArchive.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filters.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/IncludeExcludeFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/PackageFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/RegexFilter.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/SingleLinkedList.java Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FilteredArchiveTest.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FiltersTest.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedClassTest.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedFieldTest.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedMethodTest.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MockArchive.java geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/SingleLinkedListTest.java Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java Sun Mar 27 00:54:33 2011 @@ -23,14 +23,11 @@ package org.apache.xbean.finder; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; -import java.lang.reflect.AccessibleObject; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -38,6 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.xbean.finder.util.SingleLinkedList; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; import org.objectweb.asm.FieldVisitor; Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java Sun Mar 27 00:54:33 2011 @@ -20,6 +20,9 @@ package org.apache.xbean.finder; +import org.apache.xbean.finder.archive.Archive; +import org.apache.xbean.finder.util.Classes; +import org.apache.xbean.finder.util.SingleLinkedList; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Attribute; import org.objectweb.asm.ClassReader; Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/Archive.java (from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Archive.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/Archive.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/Archive.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Archive.java&r1=1084874&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Archive.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/Archive.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.archive; import java.io.IOException; import java.io.InputStream; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/Archive.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java (from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/BundleArchive.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/BundleArchive.java&r1=1084874&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/BundleArchive.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.archive; import org.apache.xbean.osgi.bundle.util.BundleResourceFinder; import org.apache.xbean.osgi.bundle.util.ResourceDiscoveryFilter; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/BundleArchive.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java (from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassesArchive.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassesArchive.java&r1=1084874&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassesArchive.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.archive; import java.io.IOException; import java.io.InputStream; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClassesArchive.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClasspathArchive.java (from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClasspathArchive.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClasspathArchive.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClasspathArchive.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClasspathArchive.java&r1=1084874&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClasspathArchive.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClasspathArchive.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.archive; import java.io.IOException; import java.io.InputStream; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/ClasspathArchive.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilteredArchive.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilteredArchive.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilteredArchive.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.archive; + +import org.apache.xbean.finder.filter.Filter; import java.io.IOException; import java.io.InputStream; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/archive/FilteredArchive.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFilter.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFilter.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFilter.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; /** * @version $Rev$ $Date$ Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ClassFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ExcludeIncludeFilter.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ExcludeIncludeFilter.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ExcludeIncludeFilter.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; /** * First, all Exclude directives are evaluated; if any match, the className is denied unless it also matches an Include directive. Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/ExcludeIncludeFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filter.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filter.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filter.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filter.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filter.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filter.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filter.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; /** * @version $Rev$ $Date$ Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilterList.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilterList.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/FilterList.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; import java.util.ArrayList; import java.util.Arrays; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/FilterList.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filters.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filters.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Filters.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; import java.util.ArrayList; import java.util.Arrays; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/Filters.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/IncludeExcludeFilter.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/IncludeExcludeFilter.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/IncludeExcludeFilter.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; /** * First, all Include directives are evaluated; at least one must match, or the className is rejected. Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/IncludeExcludeFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/PackageFilter.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/PackageFilter.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/PackageFilter.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; /** * @version $Rev$ $Date$ Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/PackageFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/RegexFilter.java (from r1085842, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/RegexFilter.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/RegexFilter.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/RegexFilter.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/RegexFilter.java&r1=1085842&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/RegexFilter.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/RegexFilter.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.filter; import java.util.regex.Pattern; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/filter/RegexFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/Classes.java (from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Classes.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/Classes.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/Classes.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Classes.java&r1=1084874&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/Classes.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/Classes.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.util; import java.lang.reflect.Array; import java.util.ArrayList; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/Classes.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/SingleLinkedList.java (from r1084874, geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/SingleLinkedList.java) URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/SingleLinkedList.java?p2=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/SingleLinkedList.java&p1=geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/SingleLinkedList.java&r1=1084874&r2=1085846&rev=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/SingleLinkedList.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/SingleLinkedList.java Sun Mar 27 00:54:33 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.xbean.finder; +package org.apache.xbean.finder.util; import java.lang.reflect.Array; import java.util.Collection; Propchange: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/util/SingleLinkedList.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FilteredArchiveTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FilteredArchiveTest.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FilteredArchiveTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FilteredArchiveTest.java Sun Mar 27 00:54:33 2011 @@ -17,6 +17,8 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import org.apache.xbean.finder.archive.FilteredArchive; +import org.apache.xbean.finder.filter.Filter; import java.util.ArrayList; import java.util.Iterator; @@ -123,12 +125,12 @@ public class FilteredArchiveTest extends "org.apache.xbean.finder.AnnotatedMethod", "org.apache.xbean.finder.AnnotatedTarget", "org.apache.xbean.finder.AnnotationFinder", - "org.apache.xbean.finder.Archive", + "org.apache.xbean.finder.archive.Archive", "org.apache.xbean.finder.BundleAnnotationFinder", - "org.apache.xbean.finder.BundleArchive", + "org.apache.xbean.finder.archive.BundleArchive", "org.apache.xbean.finder.BundleAssignableClassFinder", - "org.apache.xbean.finder.ClassesArchive", - "org.apache.xbean.finder.ClasspathArchive", + "org.apache.xbean.finder.archive.ClassesArchive", + "org.apache.xbean.finder.archive.ClasspathArchive", "org.apache.xbean.finder.MetaAnnotation", "org.apache.xbean.finder.PackageFilteredArchive", "org.apache.xbean.finder.PrefixFilteredArchive", Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FiltersTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FiltersTest.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FiltersTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/FiltersTest.java Sun Mar 27 00:54:33 2011 @@ -17,6 +17,12 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import org.apache.xbean.finder.filter.ClassFilter; +import org.apache.xbean.finder.filter.ExcludeIncludeFilter; +import org.apache.xbean.finder.filter.Filter; +import org.apache.xbean.finder.filter.FilterList; +import org.apache.xbean.finder.filter.Filters; +import org.apache.xbean.finder.filter.IncludeExcludeFilter; /** * @version $Rev$ $Date$ Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedClassTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedClassTest.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedClassTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedClassTest.java Sun Mar 27 00:54:33 2011 @@ -17,6 +17,7 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import org.apache.xbean.finder.archive.ClassesArchive; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedFieldTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedFieldTest.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedFieldTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedFieldTest.java Sun Mar 27 00:54:33 2011 @@ -17,6 +17,7 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import org.apache.xbean.finder.archive.ClassesArchive; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedMethodTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedMethodTest.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedMethodTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MetaAnnotatedMethodTest.java Sun Mar 27 00:54:33 2011 @@ -17,6 +17,7 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import org.apache.xbean.finder.archive.ClassesArchive; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MockArchive.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MockArchive.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MockArchive.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/MockArchive.java Sun Mar 27 00:54:33 2011 @@ -16,6 +16,8 @@ */ package org.apache.xbean.finder; +import org.apache.xbean.finder.archive.Archive; + import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; Modified: geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/SingleLinkedListTest.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/SingleLinkedListTest.java?rev=1085846&r1=1085845&r2=1085846&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/SingleLinkedListTest.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/test/java/org/apache/xbean/finder/SingleLinkedListTest.java Sun Mar 27 00:54:33 2011 @@ -17,6 +17,7 @@ package org.apache.xbean.finder; import junit.framework.TestCase; +import org.apache.xbean.finder.util.SingleLinkedList; import java.util.ArrayList; import java.util.Arrays;