[webbeans-commits] Webbeans SVN: r1796 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bean/proxy and 12 other directories.

Author: pete.muir(a)jboss.org Date: 2009-03-06 10:27:47 -0500 (Fri, 06 Mar 2009) New Revision: 1796 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java Modified: ri/trunk/impl/pom.xml ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextMap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Resolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ServletInjector.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java ri/trunk/jboss-tck-runner/pom.xml ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java ri/trunk/spi/pom.xml ri/trunk/version-matrix/pom.xml Log: remove google collections dependency Modified: ri/trunk/impl/pom.xml =================================================================== --- ri/trunk/impl/pom.xml 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/pom.xml 2009-03-06 15:27:47 UTC (rev 1796) @@ -105,11 +105,6 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - </dependencies> <build> Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/ClientProxyProvider.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -29,8 +29,8 @@ import javax.inject.manager.Bean; import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.util.ConcurrentCache; import org.jboss.webbeans.util.Proxies; +import org.jboss.webbeans.util.collections.ConcurrentCache; /** * A proxy pool for holding scope adaptors (client proxies) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -22,6 +22,7 @@ import javax.context.ContextNotActiveException; import javax.context.Contextual; import javax.context.CreationalContext; +import javax.inject.manager.Bean; import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.log.LogProvider; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextMap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextMap.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextMap.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -26,7 +26,7 @@ import javax.context.Context; -import com.google.common.collect.ForwardingMap; +import org.jboss.webbeans.util.collections.ForwardingMap; /** * A map from a scope to a list of contexts Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -30,9 +30,8 @@ import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; +import org.jboss.webbeans.util.collections.ForwardingMap; -import com.google.common.collect.ForwardingMap; - /** * The event bus is where observers are registered and events are fired. * Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Resolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Resolver.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/Resolver.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -35,8 +35,8 @@ import org.jboss.webbeans.introspector.ForwardingAnnotatedItem; import org.jboss.webbeans.metadata.BindingTypeModel; import org.jboss.webbeans.metadata.MetaDataCache; -import org.jboss.webbeans.util.ConcurrentCache; import org.jboss.webbeans.util.ListComparator; +import org.jboss.webbeans.util.collections.ConcurrentCache; /** * Implementation of Web Beans type safe and name based bean resolution Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ServletInjector.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ServletInjector.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ServletInjector.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -8,7 +8,7 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; import org.jboss.webbeans.util.Beans; -import org.jboss.webbeans.util.ConcurrentCache; +import org.jboss.webbeans.util.collections.ConcurrentCache; public class ServletInjector { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -19,6 +19,8 @@ import java.lang.reflect.Field; +import javax.inject.manager.Manager; + /** * AnnotatedField provides a uniform access to the annotations on an annotated * field Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotationStore.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -15,9 +15,8 @@ import org.jboss.webbeans.literal.CurrentLiteral; import org.jboss.webbeans.util.Strings; +import org.jboss.webbeans.util.collections.ForwardingMap; -import com.google.common.collect.ForwardingMap; - public class AnnotationStore { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -34,9 +34,8 @@ import org.jboss.webbeans.introspector.ForwardingAnnotatedMember; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; +import org.jboss.webbeans.util.collections.ForwardingMap; -import com.google.common.collect.ForwardingMap; - /** * Represents an abstract annotated memeber (field, method or constructor) * Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -30,9 +30,8 @@ import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.util.Strings; +import org.jboss.webbeans.util.collections.ForwardingMap; -import com.google.common.collect.ForwardingMap; - /** * Represents an annotated annotation * Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -39,9 +39,8 @@ import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; import org.jboss.webbeans.util.Strings; +import org.jboss.webbeans.util.collections.ForwardingMap; -import com.google.common.collect.ForwardingMap; - /** * Represents an annotated class * Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -26,6 +26,7 @@ import java.util.List; import java.util.Set; +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedParameter; import org.jboss.webbeans.introspector.AnnotatedType; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/MetaDataCache.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -20,7 +20,7 @@ import java.lang.annotation.Annotation; import java.util.concurrent.Callable; -import org.jboss.webbeans.util.ConcurrentCache; +import org.jboss.webbeans.util.collections.ConcurrentCache; /** * Metadata singleton for holding EJB metadata, scope models etc. Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -1,188 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.webbeans.util; - -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; - -import com.google.common.collect.ForwardingMap; - -/** - * Represents a thread safe map - * - * @author Pete Muir - */ -public class ConcurrentCache<K, V> extends ForwardingMap<K, Future<V>> -{ - - // The backing map with the value wrapped in a Future instance - private ConcurrentHashMap<K, Future<V>> map; - - /** - * Constructor - */ - public ConcurrentCache() - { - map = new ConcurrentHashMap<K, Future<V>>(); - } - - /** - * Gets the Future value from the map - * - * @param key The key to look for - * @return The Future instance of the value - */ - - public <T extends V> Future<T> getFuture(K key) - { - @SuppressWarnings("unchecked") - Future<T> future = (Future<T>) super.get(key); - return future; - } - - /** - * Gets a value from the map. Blocks until it is available - * - * @param key The key to look for - * @return The value - */ - public <T extends V> T getValue(K key) - { - @SuppressWarnings("unchecked") - Future<T> value = (Future<T>) map.get(key); - if (value != null) - { - boolean interrupted = false; - try - { - while (true) - { - try - { - return value.get(); - } - catch (InterruptedException e) - { - interrupted = true; - } - catch (ExecutionException e) - { - rethrow(e); - } - } - } - finally - { - if (interrupted) - { - Thread.currentThread().interrupt(); - } - } - } - else - { - return null; - } - } - - /** - * Adds an item to the map if it's not already there - - * @param key The key to place the item under - * @param callable The item, wrapped in a Callable instance - * @return The item added - */ - public <E> E putIfAbsent(K key, Callable<E> callable) - { - @SuppressWarnings("unchecked") - Future<E> future = (Future<E>) map.get(key); - Future<E> value = future; - if (value == null) - { - FutureTask<E> task = new FutureTask<E>(callable); - value = task; - @SuppressWarnings("unchecked") - Future<V> t = (Future<V>) task; - map.put(key, t); - task.run(); - } - boolean interrupted = false; - try - { - while (true) - { - try - { - return value.get(); - } - catch (InterruptedException e) - { - interrupted = true; - } - catch (ExecutionException e) - { - rethrow(e); - } - } - } - finally - { - if (interrupted) - { - Thread.currentThread().interrupt(); - } - } - } - - /** - * Gets the delegate map - * - * @return The backing map - */ - @Override - protected Map<K, Future<V>> delegate() - { - return map; - } - - /** - * Examines and re-throws an exception - * - * @param e The exception that happened during execution - */ - protected void rethrow(ExecutionException e) - { - if (e.getCause() instanceof RuntimeException) - { - throw (RuntimeException) e.getCause(); - } - else if (e.getCause() instanceof Error) - { - throw (Error) e.getCause(); - } - else - { - throw new IllegalStateException(e.getCause()); - } - } - -} \ No newline at end of file Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java (from rev 1791, ri/trunk/impl/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -0,0 +1,187 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.util.collections; + +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.FutureTask; + + +/** + * Represents a thread safe map + * + * @author Pete Muir + */ +public class ConcurrentCache<K, V> extends ForwardingMap<K, Future<V>> +{ + + // The backing map with the value wrapped in a Future instance + private ConcurrentHashMap<K, Future<V>> map; + + /** + * Constructor + */ + public ConcurrentCache() + { + map = new ConcurrentHashMap<K, Future<V>>(); + } + + /** + * Gets the Future value from the map + * + * @param key The key to look for + * @return The Future instance of the value + */ + + public <T extends V> Future<T> getFuture(K key) + { + @SuppressWarnings("unchecked") + Future<T> future = (Future<T>) super.get(key); + return future; + } + + /** + * Gets a value from the map. Blocks until it is available + * + * @param key The key to look for + * @return The value + */ + public <T extends V> T getValue(K key) + { + @SuppressWarnings("unchecked") + Future<T> value = (Future<T>) map.get(key); + if (value != null) + { + boolean interrupted = false; + try + { + while (true) + { + try + { + return value.get(); + } + catch (InterruptedException e) + { + interrupted = true; + } + catch (ExecutionException e) + { + rethrow(e); + } + } + } + finally + { + if (interrupted) + { + Thread.currentThread().interrupt(); + } + } + } + else + { + return null; + } + } + + /** + * Adds an item to the map if it's not already there + + * @param key The key to place the item under + * @param callable The item, wrapped in a Callable instance + * @return The item added + */ + public <E> E putIfAbsent(K key, Callable<E> callable) + { + @SuppressWarnings("unchecked") + Future<E> future = (Future<E>) map.get(key); + Future<E> value = future; + if (value == null) + { + FutureTask<E> task = new FutureTask<E>(callable); + value = task; + @SuppressWarnings("unchecked") + Future<V> t = (Future<V>) task; + map.put(key, t); + task.run(); + } + boolean interrupted = false; + try + { + while (true) + { + try + { + return value.get(); + } + catch (InterruptedException e) + { + interrupted = true; + } + catch (ExecutionException e) + { + rethrow(e); + } + } + } + finally + { + if (interrupted) + { + Thread.currentThread().interrupt(); + } + } + } + + /** + * Gets the delegate map + * + * @return The backing map + */ + @Override + protected Map<K, Future<V>> delegate() + { + return map; + } + + /** + * Examines and re-throws an exception + * + * @param e The exception that happened during execution + */ + protected void rethrow(ExecutionException e) + { + if (e.getCause() instanceof RuntimeException) + { + throw (RuntimeException) e.getCause(); + } + else if (e.getCause() instanceof Error) + { + throw (Error) e.getCause(); + } + else + { + throw new IllegalStateException(e.getCause()); + } + } + +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentCache.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2007 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.util.collections; + +import java.util.Collection; +import java.util.Iterator; + +/** + * A collection which forwards all its method calls to another collection. + * Subclasses should override one or more methods to modify the behavior of the + * backing collection as desired per the <a + * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>. + * + * @see ForwardingObject + * @author Kevin Bourrillion + * @author Pete Muir + */ +public abstract class ForwardingCollection<E> extends ForwardingObject implements Collection<E> +{ + + @Override + protected abstract Collection<E> delegate(); + + public Iterator<E> iterator() + { + return delegate().iterator(); + } + + public int size() + { + return delegate().size(); + } + + /** + * {@inheritDoc} + * + * <p> + * This method always throws a {@link NullPointerException} when {@code + * collection} is null. + */ + public boolean removeAll(Collection<?> collection) + { + return delegate().removeAll(checkNotNull(collection)); + } + + public boolean isEmpty() + { + return delegate().isEmpty(); + } + + public boolean contains(Object object) + { + return delegate().contains(object); + } + + public Object[] toArray() + { + return delegate().toArray(); + } + + public <T> T[] toArray(T[] array) + { + return delegate().toArray(array); + } + + public boolean add(E element) + { + return delegate().add(element); + } + + public boolean remove(Object object) + { + return delegate().remove(object); + } + + public boolean containsAll(Collection<?> collection) + { + return delegate().containsAll(collection); + } + + public boolean addAll(Collection<? extends E> collection) + { + return delegate().addAll(collection); + } + + /** + * {@inheritDoc} + * + * <p> + * This method always throws a {@link NullPointerException} when {@code + * collection} is null. + */ + public boolean retainAll(Collection<?> collection) + { + return delegate().retainAll(checkNotNull(collection)); + } + + public void clear() + { + delegate().clear(); + } + + /** + * Ensures that an object reference passed as a parameter to the calling + * method is not null. + * + * @param reference + * an object reference + * @return the non-null reference that was validated + * @throws NullPointerException + * if {@code reference} is null + */ + public static <T> T checkNotNull(T reference) + { + if (reference == null) + { + throw new NullPointerException(); + } + return reference; + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingCollection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -0,0 +1,212 @@ +/* + * Copyright (C) 2007 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.util.collections; + +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +/** + * A map which forwards all its method calls to another map. Subclasses should + * override one or more methods to modify the behavior of the backing map as + * desired per the <a + * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>. + * + * @see ForwardingObject + * @author Kevin Bourrillion + * @author Jared Levy + */ +public abstract class ForwardingMap<K, V> extends ForwardingObject implements Map<K, V> +{ + + @Override + protected abstract Map<K, V> delegate(); + + public int size() + { + return delegate().size(); + } + + public boolean isEmpty() + { + return delegate().isEmpty(); + } + + public V remove(Object object) + { + return delegate().remove(object); + } + + public void clear() + { + delegate().clear(); + } + + public boolean containsKey(Object key) + { + return delegate().containsKey(key); + } + + public boolean containsValue(Object value) + { + return delegate().containsValue(value); + } + + public V get(Object key) + { + return delegate().get(key); + } + + public V put(K key, V value) + { + return delegate().put(key, value); + } + + public void putAll(Map<? extends K, ? extends V> map) + { + delegate().putAll(map); + } + + private transient Set<K> keySet; + + /** + * {@inheritDoc} + * + * <p> + * The returned set's {@code removeAll} and {@code retainAll} methods always + * throw a {@link NullPointerException} when given a null collection. + */ + public Set<K> keySet() + { + return (keySet == null) ? keySet = createKeySet() : keySet; + } + + /** + * Generates a {@link Set} for use by {@link #keySet()}. + * + * <p> + * ForwardingMap's implementation of keySet() calls this method to generate a + * collection of values, and then reuses that Set for subsequent invocations. + * By default, this Set is essentially the result of invoking keySet() on the + * delegate. Override this method if you want to provide another + * implementation. + * + * @return A set for use by keySet(). + */ + protected Set<K> createKeySet() + { + final Set<K> delegate = delegate().keySet(); + return new ForwardingSet<K>() + { + @Override + protected Set<K> delegate() + { + return delegate; + } + }; + } + + private transient Collection<V> values; + + /** + * {@inheritDoc} + * + * <p> + * The returned collection's {@code removeAll} and {@code retainAll} methods + * always throw a {@link NullPointerException} when given a null collection. + */ + public Collection<V> values() + { + return (values == null) ? values = createValues() : values; + } + + /** + * Generates a {@link Collection} for use by {@link #values()}. + * + * <p> + * ForwardingMap's implementation of {@code values()} calls this method to + * generate a collection of values, and then reuses that collection for + * subsequent invocations. By default, this collection is essentially the + * result of invoking values() on the delegate. Override this method if you + * want to provide another implementation. + * + * @return A set for use by values(). + */ + protected Collection<V> createValues() + { + final Collection<V> delegate = delegate().values(); + return new ForwardingCollection<V>() + { + @Override + protected Collection<V> delegate() + { + return delegate; + } + }; + } + + private transient Set<Entry<K, V>> entrySet; + + /** + * {@inheritDoc} + * + * <p> + * The returned set's {@code removeAll} and {@code retainAll} methods always + * throw a {@link NullPointerException} when given a null collection. + */ + public Set<Entry<K, V>> entrySet() + { + return (entrySet == null) ? entrySet = createEntrySet() : entrySet; + } + + /** + * Generates a {@link Set} for use by {@link #entrySet()}. + * + * <p> + * ForwardingMap's implementation of entrySet() calls this method to generate + * a set of entries, and then reuses that set for subsequent invocations. By + * default, this set is essentially the result of invoking entrySet() on the + * delegate. Override this method if you want to provide another + * implementation. + * + * @return A set for use by entrySet(). + */ + protected Set<Entry<K, V>> createEntrySet() + { + final Set<Entry<K, V>> delegate = delegate().entrySet(); + return new ForwardingSet<Entry<K, V>>() + { + @Override + protected Set<Entry<K, V>> delegate() + { + return delegate; + } + }; + } + + @Override + public boolean equals(Object object) + { + return object == this || delegate().equals(object); + } + + @Override + public int hashCode() + { + return delegate().hashCode(); + } +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingMap.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2007 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.util.collections; + +import java.io.Serializable; + +/** + * An abstract base class for implementing the <a + * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>. + * The {@link #delegate()} method must be overridden to return the instance + * being decorated. + * + * This class does <i>not</i> forward the {@code hashCode} and {@code equals} + * methods through to the backing object, but relies on {@code Object}'s + * implementation. This is necessary to preserve the symmetry of {@code equals}. + * Custom definitions of equality are usually based on an interface, such as + * {@code Set} or {@code List}, so that the implementation of {@code equals} can + * cast the object being tested for equality to the custom interface. {@code + * ForwardingObject} implements no such custom interfaces directly; they are + * implemented only in subclasses. Therefore, forwarding {@code equals} would + * break symmetry, as the forwarding object might consider itself equal to the + * object being tested, but the reverse could not be true. This behavior is + * consistent with the JDK's collection wrappers, such as + * {@link java.util.Collections#unmodifiableCollection}. Use an + * interface-specific subclass of {@code ForwardingObject}, such as + * {@link ForwardingList}, to preserve equality behavior, or override {@code + * equals} directly. + * + * <p> + * The {@code toString} method is forwarded to the delegate. Although this class + * does not implement {@link Serializable}, a serializable subclass may be + * created since this class has a parameter-less constructor. + * + * @author Mike Bostock + */ +public abstract class ForwardingObject +{ + + /** Sole constructor. */ + protected ForwardingObject() + { + } + + /** + * Returns the backing delegate instance that methods are forwarded to. + * Abstract subclasses generally override the {@link ForwardingObject} method + * with an abstract method that has a more specific return type, such as + * {@link ForwardingSet#delegate}. Concrete subclasses override this method + * to supply the instance being decorated. + */ + protected abstract Object delegate(); + + /** + * Returns the string representation generated by the delegate's {@code + * toString} method. + */ + @Override + public String toString() + { + return delegate().toString(); + } + + /* No equals or hashCode. See class comments for details. */ +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingObject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2007 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.webbeans.util.collections; + +import java.util.Set; + +/** + * A set which forwards all its method calls to another set. Subclasses should + * override one or more methods to modify the behavior of the backing set as + * desired per the <a + * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>. + * + * @see ForwardingObject + * @author Kevin Bourrillion + */ +public abstract class ForwardingSet<E> extends ForwardingCollection<E> implements Set<E> +{ + + @Override + protected abstract Set<E> delegate(); + + @Override + public boolean equals(Object object) + { + return object == this || delegate().equals(object); + } + + @Override + public int hashCode() + { + return delegate().hashCode(); + } +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/collections/ForwardingSet.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-03-06 15:27:47 UTC (rev 1796) @@ -28,11 +28,6 @@ </dependency> <dependency> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </dependency> - - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <classifier>jdk15</classifier> @@ -43,13 +38,42 @@ <artifactId>jsr299-tck-impl</artifactId> </dependency> +<!-- <dependency>--> +<!-- <groupId>org.jboss.naming</groupId>--> +<!-- <artifactId>jnp-client</artifactId>--> +<!-- <scope>runtime</scope>--> +<!-- </dependency>--> +<!-- --> +<!-- <dependency>--> +<!-- <groupId>org.jboss.aspects</groupId>--> +<!-- <artifactId>jboss-security-aspects</artifactId>--> +<!-- <scope>runtime</scope>--> +<!-- </dependency>--> +<!-- --> +<!-- <dependency>--> +<!-- <groupId>org.jboss.aspects</groupId>--> +<!-- <artifactId>jboss-remoting-aspects</artifactId>--> +<!-- <scope>runtime</scope>--> +<!-- </dependency>--> +<!-- --> +<!-- <dependency>--> +<!-- <groupId>oswego-concurrent</groupId>--> +<!-- <artifactId>concurrent</artifactId>--> +<!-- <scope>runtime</scope>--> +<!-- </dependency>--> +<!----> <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + </dependency> + + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <type>pom</type> + <scope>runtime</scope> </dependency> - </dependencies> <build> Deleted: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -1,52 +0,0 @@ -package org.jboss.webbeans.tck.integration.jbossas; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.log4j.Logger; - - -public class FileSystemContainersImpl extends AbstractContainersImpl -{ - - private static Logger log = Logger.getLogger(FileSystemContainersImpl.class); - - private File deployDir; - - public FileSystemContainersImpl() throws IOException - { - deployDir = new File(jbossHome, "server/default/deploy"); - if (!deployDir.isDirectory()) - { - throw new IllegalArgumentException(deployDir.getPath() + " is not a directory"); - } - log.info("Deploying TCK artifacts to " + deployDir.getPath()); - } - - public void deploy(InputStream archive, String name) throws IOException - { - File file = new File(deployDir, name); - log.info("Deploying test " + name); - file.createNewFile(); - copy(archive, file); - } - - public void undeploy(String name) throws IOException - { - File file = new File(deployDir, name); - if (file.exists()) - { - file.delete(); - } - try - { - // Give the app a chance to undeploy - Thread.sleep(1000); - } - catch (InterruptedException e) - { - Thread.currentThread().interrupt(); - } - } - -} Deleted: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -1,64 +0,0 @@ -package org.jboss.webbeans.tck.integration.jbossas; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.DeploymentException; -import org.jboss.test.JBossTestServices; - - -public class JBossTestServicesContainersImpl extends AbstractContainersImpl -{ - - private Logger log = Logger.getLogger(JBossTestServicesContainersImpl.class); - - private final JBossTestServices testServices; - private final File tmpdir; - - public JBossTestServicesContainersImpl() throws Exception - { - this.testServices = new JBossTestServices(JBossTestServicesContainersImpl.class); - testServices.setUpLogging(); - testServices.init(); - tmpdir = new File(System.getProperty("java.io.tmpdir"), "org.jboss.webbeans.tck.integration.jbossas"); - tmpdir.mkdir(); - tmpdir.deleteOnExit(); - } - - public void deploy(InputStream archiveStream, String name) throws DeploymentException, IOException - { - File archive = new File(tmpdir, name); - archive.deleteOnExit(); - copy(archiveStream, archive); - try - { - testServices.deploy(getTmpArchiveName(name)); - } - catch (Exception e) - { - throw new DeploymentException("Error deploying " + name, e); - } - } - - public void undeploy(String name) throws IOException - { - try - { - testServices.undeploy(getTmpArchiveName(name)); - } - catch (Exception e) - { - IOException ioe = new IOException("Error undeploying " + name); - ioe.initCause(e); - throw ioe; - } - } - - private String getTmpArchiveName(String name) - { - File file = new File(tmpdir, name); - return file.toURI().toString(); - } - -} Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-03-06 15:27:47 UTC (rev 1796) @@ -18,7 +18,6 @@ import org.jboss.managed.api.ManagedDeployment.DeploymentPhase; import org.jboss.profileservice.spi.ProfileKey; import org.jboss.profileservice.spi.ProfileService; -import org.jboss.test.JBossTestServices; import org.jboss.virtual.VFS; public class ProfileServiceContainersImpl extends AbstractContainersImpl @@ -29,15 +28,11 @@ private final List<String> failedUndeployments; private DeploymentManager deploymentManager; - private JBossTestServices testServices; private final File tmpdir; public ProfileServiceContainersImpl() throws Exception { - this.testServices = new JBossTestServices(JBossTestServicesContainersImpl.class); - this.testServices.setUpLogging(); - this.testServices.init(); tmpdir = new File(System.getProperty("java.io.tmpdir"), "org.jboss.webbeans.tck.integration.jbossas"); tmpdir.mkdir(); tmpdir.deleteOnExit(); @@ -136,7 +131,7 @@ protected void initDeploymentManager() throws Exception { String profileName = "default"; - InitialContext ctx = testServices.getInitialContext(); + InitialContext ctx = new InitialContext(); ProfileService ps = (ProfileService) ctx.lookup("ProfileService"); deploymentManager = ps.getDeploymentManager(); ProfileKey defaultKey = new ProfileKey(profileName); Modified: ri/trunk/spi/pom.xml =================================================================== --- ri/trunk/spi/pom.xml 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/spi/pom.xml 2009-03-06 15:27:47 UTC (rev 1796) @@ -35,11 +35,6 @@ </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <optional>true</optional> Modified: ri/trunk/version-matrix/pom.xml =================================================================== --- ri/trunk/version-matrix/pom.xml 2009-03-06 14:53:51 UTC (rev 1795) +++ ri/trunk/version-matrix/pom.xml 2009-03-06 15:27:47 UTC (rev 1796) @@ -126,12 +126,6 @@ <artifactId>jsf-api</artifactId> <version>1.2_10</version> </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>0.8</version> - </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> @@ -237,53 +231,45 @@ <version>${jsr299.tck.version}</version> </dependency> +<!-- <dependency>--> +<!-- <groupId>org.jboss.naming</groupId>--> +<!-- <artifactId>jnp-client</artifactId>--> +<!-- <version>5.0.1.GA</version>--> +<!-- </dependency>--> +<!-- --> +<!-- <dependency>--> +<!-- <groupId>org.jboss.aspects</groupId>--> +<!-- <artifactId>jboss-security-aspects</artifactId>--> +<!-- <version>1.0.0.GA</version>--> +<!-- </dependency>--> +<!-- --> +<!-- <dependency>--> +<!-- <groupId>org.jboss.aspects</groupId>--> +<!-- <artifactId>jboss-remoting-aspects</artifactId>--> +<!-- <version>1.0.1.GA</version>--> +<!-- </dependency>--> +<!-- --> +<!-- --> +<!-- <dependency>--> +<!-- <groupId>oswego-concurrent</groupId>--> +<!-- <artifactId>concurrent</artifactId>--> +<!-- <version>1.3.4-jboss-update1</version>--> +<!-- </dependency>--> + <dependency> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - <version>1.1.3.GA</version> - <exclusions> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant-junit</artifactId> - </exclusion> - <exclusion> - <groupId>jboss.profiler.jvmti</groupId> - <artifactId>jboss-profiler-jvmti</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.0.3.GA</version> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> - <version>5.0.0.GA</version> + <version>5.0.1.GA</version> <type>pom</type> </dependency> + </dependencies> </dependencyManagement>