You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/02/23 19:55:57 UTC
svn commit: r1073881 [1/2] - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/config/
webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/
webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/
webbeans-impl/src/...
Author: struberg
Date: Wed Feb 23 18:55:55 2011
New Revision: 1073881
URL: http://svn.apache.org/viewvc?rev=1073881&view=rev
Log:
OWB-526 drop URLs from ScannerService
I also partly replaced scannotation and internalized+changed the AnnotationDB
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative3Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative4Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative5Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/initializerMethods/tests/BrokenInitializerMethodBecauseofGenericTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/stereotypes/WarningStereotypeTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/simple/SimpleDecoratorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/AbstractDecoratorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/BrokenDecoratorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/ConversationDecoratorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DecoratorAndInterceptorStackTests.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DependentDecoratorDestroyTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/GenericDecoratorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/MultipleDecoratorStackTests.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DependentMethodBeanTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DisposerMethodBeanTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionIntoConstructorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/noncontextual/InjectNonContextualTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/typeliteral/TypeLiteralTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/broken/BrokenTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/InterceptorPerformanceTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithStereoTypeInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentLifecycleTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/ejb/EjbInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/inheritance/InheritedInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/LifecycleTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/managed/ProxyFactoryTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/BeforeBeanDiscoveryTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/ExtensionErrorsTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddBeanTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddObserverMethodTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableEventTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/specializes/SpecializesProducer1Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/GetterStringInjectorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/InnerClassInjectStringProducerTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/MethodProducer1Test.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/AlternativeSpecializesProducerTest.java
openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ScannerService.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Wed Feb 23 18:55:55 2011
@@ -555,31 +555,28 @@ public class BeansDeployer
{
logger.debug("Deploying configurations from XML files has started.");
- Set<URL> xmlLocations = scanner.getBeanXmls();
- Iterator<URL> it = xmlLocations.iterator();
+ Set<String> xmlLocations = scanner.getBeanXmls();
+ Iterator<String> it = xmlLocations.iterator();
while (it.hasNext())
{
- URL fileURL = it.next();
- String fileName = fileURL.getFile();
+ String fileName = it.next();
if (logger.wblWillLogDebug())
{
- logger.debug("OpenWebBeans BeansDeployer configuring filename: " +
- fileName + " from URL: " + fileURL.toString());
+ logger.debug("OpenWebBeans BeansDeployer configuring filename: " + fileName);
}
InputStream fis = null;
try
{
- fis = fileURL.openStream();
+ fis = new URL(fileName).openStream();
this.xmlConfigurator.configure(fis, fileName, scanner);
}
catch (IOException e)
{
- throw new WebBeansDeploymentException("Error configuring: filename: " +
- fileName + " from fileURL: " + fileURL.toString(), e);
+ throw new WebBeansDeploymentException("Error configuring: filename: " + fileName , e);
}
finally
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Wed Feb 23 18:55:55 2011
@@ -19,8 +19,11 @@
package org.apache.webbeans.corespi.scanner;
+import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -34,14 +37,15 @@ import org.apache.webbeans.logger.WebBea
import org.apache.webbeans.spi.BDABeansXmlScanner;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.util.ClassUtil;
-import org.scannotation.AnnotationDB;
public abstract class AbstractMetaDataDiscovery implements ScannerService
{
protected final WebBeansLogger logger = WebBeansLogger.getLogger(getClass());
+ public static final String META_INF_BEANS_XML = "META-INF/beans.xml";
+
/** Location of the beans.xml files. */
- private final Set<URL> webBeansXmlLocations = new HashSet<URL>();
+ private final Set<String> webBeansXmlLocations = new HashSet<String>();
//private Map<String, InputStream> EJB_XML_LOCATIONS = new HashMap<String, InputStream>();
@@ -88,6 +92,46 @@ public abstract class AbstractMetaDataDi
abstract protected void configure() throws Exception;
+
+ /**
+ * Find the base paths of all available resources with the given
+ * resourceName in the classpath.
+ * The returned Strings will <i>NOT</i> contain the resourceName itself!
+ *
+ * @param resourceName the name of the resource, e.g. 'META-INF/beans.xml'
+ * @param loader the ClassLoader which should be used
+ * @return array of Strings with the URL path to the resources.
+ */
+ protected String[] findBeansXmlBases(String resourceName, ClassLoader loader)
+ {
+ ArrayList<String> list = new ArrayList<String>();
+ try
+ {
+ Enumeration<URL> urls = loader.getResources(resourceName);
+
+ while (urls.hasMoreElements())
+ {
+ URL url = urls.nextElement();
+ String urlString = url.toString();
+
+ addWebBeansXmlLocation(urlString);
+
+ int idx = urlString.lastIndexOf(resourceName);
+ urlString = urlString.substring(0, idx);
+
+ list.add(urlString);
+ }
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ return list.toArray(new String[list.size()]);
+
+ }
+
+
public void init(Object object)
{
@@ -115,15 +159,15 @@ public abstract class AbstractMetaDataDi
/**
* add the given beans.xml path to the locations list
- * @param file location path
+ * @param beansXmlLocation location path
*/
- protected void addWebBeansXmlLocation(URL file)
+ protected void addWebBeansXmlLocation(String beansXmlLocation)
{
if(this.logger.wblWillLogInfo())
{
- this.logger.info("added beans.xml marker: " + file.getFile());
+ this.logger.info("added beans.xml marker: " + beansXmlLocation);
}
- webBeansXmlLocations.add(file);
+ webBeansXmlLocations.add(beansXmlLocation);
}
/* (non-Javadoc)
@@ -155,7 +199,7 @@ public abstract class AbstractMetaDataDi
* @see org.apache.webbeans.corespi.ScannerService#getBeanXmls()
*/
@Override
- public Set<URL> getBeanXmls()
+ public Set<String> getBeanXmls()
{
return Collections.unmodifiableSet(webBeansXmlLocations);
}
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java?rev=1073881&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AnnotationDB.java Wed Feb 23 18:55:55 2011
@@ -0,0 +1,539 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.webbeans.corespi.scanner;
+
+
+import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.FieldInfo;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.ParameterAnnotationsAttribute;
+import javassist.bytecode.annotation.Annotation;
+import org.scannotation.archiveiterator.Filter;
+import org.scannotation.archiveiterator.IteratorFactory;
+import org.scannotation.archiveiterator.StreamIterator;
+
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The base of this class has been taken from
+ * <a href="http://sourceforge.net/projects/scannotation/">scannotation</a>
+ * which is not actively maintained anymore. Since it has Apache License v2.0,
+ * we maintain a bug fixed and highly adoped version on our own.
+ *
+ * The class allows you to scan an arbitrary set of "archives" for .class files. These class files
+ * are parsed to see what annotations they use. Two indexes are created. The javax, java, sun, com.sun, and javassist
+ * packages will not be scanned by default.
+ * <p/>
+ * One is a map of annotations and what classes
+ * use those annotations. This could be used, for example, by an EJB deployer to find all the EJBs contained
+ * in the archive
+ * <p/>
+ * Another is a mpa of classes and what annotations those classes use.
+ *
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class AnnotationDB implements Serializable
+{
+ protected Map<String, Set<String>> annotationIndex = new HashMap<String, Set<String>>();
+ protected Map<String, Set<String>> implementsIndex = new HashMap<String, Set<String>>();
+ protected Map<String, Set<String>> classIndex = new HashMap<String, Set<String>>();
+
+ protected transient boolean scanClassAnnotations = true;
+ protected transient boolean scanMethodAnnotations = true;
+ protected transient boolean scanParameterAnnotations = true;
+ protected transient boolean scanFieldAnnotations = true;
+ protected transient String[] ignoredPackages = {"javax", "java", "sun", "com.sun", "javassist"};
+
+ public class CrossReferenceException extends Exception
+ {
+ private Set<String> unresolved;
+
+ public CrossReferenceException(Set<String> unresolved)
+ {
+ this.unresolved = unresolved;
+ }
+
+ public Set<String> getUnresolved()
+ {
+ return unresolved;
+ }
+ }
+
+ public String[] getIgnoredPackages()
+ {
+ return ignoredPackages;
+ }
+
+ /**
+ * Override/overwrite any ignored packages
+ *
+ * @param ignoredPackages cannot be null
+ */
+ public void setIgnoredPackages(String[] ignoredPackages)
+ {
+ this.ignoredPackages = ignoredPackages;
+ }
+
+ public void addIgnoredPackages(String... ignored)
+ {
+ String[] tmp = new String[ignoredPackages.length + ignored.length];
+ int i = 0;
+ for (String ign : ignoredPackages)
+ {
+ tmp[i++] = ign;
+ }
+ for (String ign : ignored)
+ {
+ tmp[i++] = ign;
+ }
+ }
+
+ /**
+ * This method will cross reference annotations in the annotation index with any meta-annotations that they have
+ * and create additional entries as needed. For example:
+ *
+ * @HttpMethod("GET") public @interface GET {}
+ * <p/>
+ * The HttpMethod index will have additional classes added to it for any classes annotated with annotations that
+ * have the HttpMethod meta-annotation.
+ * <p/>
+ * WARNING: If the annotation class has not already been scaned, this method will load all annotation classes indexed
+ * as a resource so they must be in your classpath
+ */
+ public void crossReferenceMetaAnnotations() throws CrossReferenceException
+ {
+ Set<String> unresolved = new HashSet<String>();
+
+ Set<String> index = new HashSet<String>();
+ index.addAll(annotationIndex.keySet());
+
+ for (String annotation : index)
+ {
+ if (ignoreScan(annotation))
+ {
+ continue;
+ }
+ if (classIndex.containsKey(annotation))
+ {
+ for (String xref : classIndex.get(annotation))
+ {
+ annotationIndex.get(xref).addAll(annotationIndex.get(annotation));
+ }
+ continue;
+ }
+ InputStream bits = Thread.currentThread().getContextClassLoader().getResourceAsStream(annotation.replace('.', '/') + ".class");
+ if (bits == null)
+ {
+ unresolved.add(annotation);
+ continue;
+ }
+ try
+ {
+ scanClass(bits);
+ }
+ catch (IOException e)
+ {
+ unresolved.add(annotation);
+ }
+ for (String xref : classIndex.get(annotation))
+ {
+ annotationIndex.get(xref).addAll(annotationIndex.get(annotation));
+ }
+
+ }
+ if (unresolved.size() > 0)
+ {
+ throw new CrossReferenceException(unresolved);
+ }
+ }
+
+ /**
+ * Sometimes you want to see if a particular class implements an interface with certain annotations
+ * After you have loaded all your classpaths with the scanArchive() method, call this method to cross reference
+ * a class's implemented interfaces. The cross references will be added to the annotationIndex and
+ * classIndex indexes
+ *
+ * @throws CrossReferenceException an Exception thrown if referenced interfaces haven't been scanned
+ */
+ public void crossReferenceImplementedInterfaces() throws CrossReferenceException
+ {
+ Set<String> unresolved = new HashSet<String>();
+ for (String clazz : implementsIndex.keySet())
+ {
+ Set<String> intfs = implementsIndex.get(clazz);
+ for (String intf : intfs)
+ {
+ if (ignoreScan(intf))
+ {
+ continue;
+ }
+
+ Set<String> xrefAnnotations = classIndex.get(intf);
+ if (xrefAnnotations == null)
+ {
+ unresolved.add(intf);
+ }
+ else
+ {
+ Set<String> classAnnotations = classIndex.get(clazz);
+ if (classAnnotations == null)
+ {
+ classIndex.put(clazz, xrefAnnotations);
+ }
+ else
+ {
+ classAnnotations.addAll(xrefAnnotations);
+ }
+ for (String annotation : xrefAnnotations)
+ {
+ Set<String> classes = annotationIndex.get(annotation);
+ classes.add(clazz);
+ }
+ }
+ }
+ }
+ if (unresolved.size() > 0)
+ {
+ throw new CrossReferenceException(unresolved);
+ }
+
+ }
+
+ private boolean ignoreScan(String intf)
+ {
+ for (String ignored : ignoredPackages)
+ {
+ if (intf.startsWith(ignored + "."))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * returns a map keyed by the fully qualified string name of a annotation class. The Set returne is
+ * a list of classes that use that annotation somehow.
+ */
+ public Map<String, Set<String>> getAnnotationIndex()
+ {
+ return annotationIndex;
+ }
+
+ /**
+ * returns a map keyed by the list of classes scanned. The value set returned is a list of annotations
+ * used by that class.
+ */
+ public Map<String, Set<String>> getClassIndex()
+ {
+ return classIndex;
+ }
+
+
+ /**
+ * Whether or not you want AnnotationDB to scan for class level annotations
+ *
+ * @param scanClassAnnotations
+ */
+ public void setScanClassAnnotations(boolean scanClassAnnotations)
+ {
+ this.scanClassAnnotations = scanClassAnnotations;
+ }
+
+ /**
+ * Wheter or not you want AnnotationDB to scan for method level annotations
+ *
+ * @param scanMethodAnnotations
+ */
+ public void setScanMethodAnnotations(boolean scanMethodAnnotations)
+ {
+ this.scanMethodAnnotations = scanMethodAnnotations;
+ }
+
+ /**
+ * Whether or not you want AnnotationDB to scan for parameter level annotations
+ *
+ * @param scanParameterAnnotations
+ */
+ public void setScanParameterAnnotations(boolean scanParameterAnnotations)
+ {
+ this.scanParameterAnnotations = scanParameterAnnotations;
+ }
+
+ /**
+ * Whether or not you want AnnotationDB to scan for parameter level annotations
+ *
+ * @param scanFieldAnnotations
+ */
+ public void setScanFieldAnnotations(boolean scanFieldAnnotations)
+ {
+ this.scanFieldAnnotations = scanFieldAnnotations;
+ }
+
+
+ /**
+ * Scan a url that represents an "archive" this is a classpath directory or jar file
+ *
+ * @param urls variable list of URLs to scan as archives
+ * @throws IOException
+ */
+ public void scanArchives(String... urls) throws IOException
+ {
+ for (String urlPath : urls)
+ {
+ Filter filter = new Filter()
+ {
+ public boolean accepts(String filename)
+ {
+ if (filename.endsWith(".class"))
+ {
+ if (filename.startsWith("/"))
+ {
+ filename = filename.substring(1);
+ }
+
+ if (!ignoreScan(filename.replace('/', '.')))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ };
+
+ //X TODO drop URL and use native Strings as long as possible!
+ StreamIterator it = IteratorFactory.create(new URL(urlPath), filter);
+
+ InputStream stream;
+ while ((stream = it.next()) != null)
+ {
+ scanClass(stream);
+ }
+ }
+
+ }
+
+ /**
+ * Parse a .class file for annotations
+ *
+ * @param bits input stream pointing to .class file bits
+ * @throws IOException
+ */
+ public void scanClass(InputStream bits) throws IOException
+ {
+ DataInputStream dstream = new DataInputStream(new BufferedInputStream(bits));
+ ClassFile cf = null;
+ try
+ {
+ cf = new ClassFile(dstream);
+ classIndex.put(cf.getName(), new HashSet<String>());
+
+ if (scanClassAnnotations)
+ {
+ scanClass(cf);
+ }
+
+ if (scanMethodAnnotations || scanParameterAnnotations)
+ {
+ scanMethods(cf);
+ }
+
+ if (scanFieldAnnotations)
+ {
+ scanFields(cf);
+ }
+
+ // create an index of interfaces the class implements
+ if (cf.getInterfaces() != null)
+ {
+ Set<String> intfs = new HashSet<String>();
+ for (String intf : cf.getInterfaces())
+ {
+ intfs.add(intf);
+ }
+
+ implementsIndex.put(cf.getName(), intfs);
+ }
+
+ }
+ finally
+ {
+ dstream.close();
+ bits.close();
+ }
+ }
+
+ protected void scanClass(ClassFile cf)
+ {
+ String className = cf.getName();
+ AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.visibleTag);
+ AnnotationsAttribute invisible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.invisibleTag);
+
+ if (visible != null)
+ {
+ populate(visible.getAnnotations(), className);
+ }
+
+ if (invisible != null)
+ {
+ populate(invisible.getAnnotations(), className);
+ }
+ }
+
+ /**
+ * Scanns both the method and its parameters for annotations.
+ *
+ * @param cf
+ */
+ protected void scanMethods(ClassFile cf)
+ {
+ List methods = cf.getMethods();
+ if (methods == null)
+ {
+ return;
+ }
+
+ for (Object obj : methods)
+ {
+ MethodInfo method = (MethodInfo) obj;
+ if (scanMethodAnnotations)
+ {
+ AnnotationsAttribute visible = (AnnotationsAttribute) method.getAttribute(AnnotationsAttribute.visibleTag);
+ AnnotationsAttribute invisible = (AnnotationsAttribute) method.getAttribute(AnnotationsAttribute.invisibleTag);
+
+ if (visible != null)
+ {
+ populate(visible.getAnnotations(), cf.getName());
+ }
+ if (invisible != null)
+ {
+ populate(invisible.getAnnotations(), cf.getName());
+ }
+ }
+ if (scanParameterAnnotations)
+ {
+ ParameterAnnotationsAttribute paramsVisible = (ParameterAnnotationsAttribute) method.getAttribute(ParameterAnnotationsAttribute.visibleTag);
+ ParameterAnnotationsAttribute paramsInvisible = (ParameterAnnotationsAttribute) method.getAttribute(ParameterAnnotationsAttribute.invisibleTag);
+
+ if (paramsVisible != null && paramsVisible.getAnnotations() != null)
+ {
+ for (Annotation[] anns : paramsVisible.getAnnotations())
+ {
+ populate(anns, cf.getName());
+ }
+ }
+ if (paramsInvisible != null && paramsInvisible.getAnnotations() != null)
+ {
+ for (Annotation[] anns : paramsInvisible.getAnnotations())
+ {
+ populate(anns, cf.getName());
+ }
+ }
+ }
+ }
+ }
+
+ protected void scanFields(ClassFile cf)
+ {
+ List fields = cf.getFields();
+ if (fields == null)
+ {
+ return;
+ }
+
+ for (Object obj : fields)
+ {
+ FieldInfo field = (FieldInfo) obj;
+ AnnotationsAttribute visible = (AnnotationsAttribute) field.getAttribute(AnnotationsAttribute.visibleTag);
+ AnnotationsAttribute invisible = (AnnotationsAttribute) field.getAttribute(AnnotationsAttribute.invisibleTag);
+
+ if (visible != null)
+ {
+ populate(visible.getAnnotations(), cf.getName());
+ }
+ if (invisible != null)
+ {
+ populate(invisible.getAnnotations(), cf.getName());
+ }
+ }
+
+
+ }
+
+ protected void populate(Annotation[] annotations, String className)
+ {
+ if (annotations == null)
+ {
+ return;
+ }
+
+ Set<String> classAnnotations = classIndex.get(className);
+ for (Annotation ann : annotations)
+ {
+ Set<String> classes = annotationIndex.get(ann.getTypeName());
+ if (classes == null)
+ {
+ classes = new HashSet<String>();
+ annotationIndex.put(ann.getTypeName(), classes);
+ }
+ classes.add(className);
+ classAnnotations.add(ann.getTypeName());
+ }
+ }
+
+ /**
+ * Prints out annotationIndex
+ *
+ * @param writer
+ */
+ public void outputAnnotationIndex(PrintWriter writer)
+ {
+ for (String ann : annotationIndex.keySet())
+ {
+ writer.print(ann);
+ writer.print(": ");
+ Set<String> classes = annotationIndex.get(ann);
+ Iterator<String> it = classes.iterator();
+ while (it.hasNext())
+ {
+ writer.print(it.next());
+ if (it.hasNext())
+ {
+ writer.print(", ");
+ }
+ }
+ writer.println();
+ }
+ }
+
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java Wed Feb 23 18:55:55 2011
@@ -19,17 +19,16 @@
package org.apache.webbeans.corespi.se;
import java.io.IOException;
-import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javassist.bytecode.ClassFile;
+import org.apache.webbeans.corespi.scanner.AnnotationDB;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.util.ClassUtil;
-import org.scannotation.AnnotationDB;
/**
* Provides extensions to AnnotationDB that allow the beans.xml
@@ -53,7 +52,7 @@ public class BeansXmlAnnotationDB extend
private ScannerService scannerService;
/** Maps a resource (Ex: .jar) to a beans.xml location */
- Map<URL, URL> beansXmlResources;
+ Map<String, String> beansXmlResources;
public void setBdaBeansXmlScanner(ScannerService scannerService)
{
@@ -68,7 +67,7 @@ public class BeansXmlAnnotationDB extend
public BeansXmlAnnotationDB()
{
super();
- beansXmlResources=new HashMap<URL, URL>();
+ beansXmlResources=new HashMap<String, String>();
}
@Override
@@ -83,12 +82,12 @@ public class BeansXmlAnnotationDB extend
}
@Override
- public void scanArchives(URL... urls) throws IOException
+ public void scanArchives(String... urls) throws IOException
{
scanArchivesBeansXml(urls);
}
- public void setResourceBeansXml(URL resource,URL beansXml)
+ public void setResourceBeansXml(String resource, String beansXml)
{
if(logger.wblWillLogDebug())
{
@@ -97,11 +96,11 @@ public class BeansXmlAnnotationDB extend
beansXmlResources.put(resource, beansXml);
}
- private void scanArchivesBeansXml(URL... urls) throws IOException
+ private void scanArchivesBeansXml(String... urls) throws IOException
{
// Maps a resource (Ex: .jar) to a beans.xml location
populateResourceToBeansXml(urls);
- URL currentBeansXml = null;
+ String currentBeansXml = null;
for (int i = 0; i < urls.length; i++)
{
currentBeansXml = beansXmlResources.get(urls[i]);
@@ -110,7 +109,7 @@ public class BeansXmlAnnotationDB extend
throw new IllegalStateException("Could not locate beans.xml for resource: " + urls[i]);
}
// set current beans.xml based on archive being scanned
- setCurrentBeansXml(currentBeansXml.getFile());
+ setCurrentBeansXml(currentBeansXml);
super.scanArchives(urls[i]);
}
@@ -118,11 +117,11 @@ public class BeansXmlAnnotationDB extend
}
- private void populateResourceToBeansXml(URL[] resourceURLs) throws IOException
+ private void populateResourceToBeansXml(String[] resourceURLs) throws IOException
{
- URL beanXmlUrl;
+ String beanXmlUrl;
boolean isMatchFound;
- Iterator<URL> it = scannerService.getBeanXmls().iterator();
+ Iterator<String> it = scannerService.getBeanXmls().iterator();
while (it.hasNext())
{
isMatchFound = false;
@@ -140,7 +139,7 @@ public class BeansXmlAnnotationDB extend
for (int i = 0; (!isMatchFound && i < resourceURLs.length); i++)
{
- if (beanXmlUrl.getFile().startsWith(resourceURLs[i].getFile()))
+ if (beanXmlUrl.startsWith(resourceURLs[i]))
{
beansXmlResources.put(resourceURLs[i], beanXmlUrl);
isMatchFound = true;
@@ -150,7 +149,7 @@ public class BeansXmlAnnotationDB extend
{
StringBuilder sb = new StringBuilder();
sb.append("Could not find resource URL to match beans.xml: ");
- sb.append(beanXmlUrl.getFile());
+ sb.append(beanXmlUrl);
sb.append(", available resource URLs=");
for (int i = 0; i < resourceURLs.length; i++)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java Wed Feb 23 18:55:55 2011
@@ -19,16 +19,13 @@
package org.apache.webbeans.corespi.se;
import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
import org.apache.webbeans.util.WebBeansUtil;
-import org.scannotation.ClasspathUrlFinder;
public class DefaultScannerService extends AbstractMetaDataDiscovery
{
-
+
public DefaultScannerService()
{
super();
@@ -40,36 +37,14 @@ public class DefaultScannerService exten
}
- private void configureAnnotationDB() throws Exception
+ private void configureAnnotationDB() throws IOException
{
ClassLoader loader = WebBeansUtil.getCurrentClassLoader();
//Store collection of beans.xml's before scanning archives
- configureXML();
- URL[] urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml", loader);
+ String[] urlPaths = findBeansXmlBases(META_INF_BEANS_XML, loader);
- this.getAnnotationDB().scanArchives(urls);
-
+ this.getAnnotationDB().scanArchives(urlPaths);
}
- private void configureXML() throws Exception
- {
- try
- {
- Enumeration<URL> resources = getClass().getClassLoader().getResources("META-INF/beans.xml");
-
- while (resources.hasMoreElements())
- {
- URL resource = resources.nextElement();
- addWebBeansXmlLocation(resource);
- }
-
- }
- catch (IOException e)
- {
- throw e;
- }
- }
-
-
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java Wed Feb 23 18:55:55 2011
@@ -64,13 +64,13 @@ public class OpenWebBeansTestMetaDataDis
* Those xmls will be scanned by container.
* @param xmls beans xmls
*/
- public void deployXMLs(Collection<URL> xmls)
+ public void deployXMLs(Collection<String> xmls)
{
if(xmls != null)
{
- for(URL url : xmls)
+ for(String xml : xmls)
{
- addBeanXml(url);
+ addBeanXml(xml);
}
}
}
@@ -98,13 +98,13 @@ public class OpenWebBeansTestMetaDataDis
/**
* Adds new beans.xml url for scanning.
- * @param url new xml url
+ * @param beansXmlPath new beans.xml path
*/
- private void addBeanXml(URL url)
+ private void addBeanXml(String beansXmlPath)
{
- Asserts.assertNotNull(url);
+ Asserts.assertNotNull(beansXmlPath);
- addWebBeansXmlLocation(url);
+ addWebBeansXmlLocation(beansXmlPath);
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -34,7 +33,6 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.lifecycle.test.OpenWebBeansTestLifeCycle;
import org.apache.webbeans.lifecycle.test.OpenWebBeansTestMetaDataDiscoveryService;
-import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.util.WebBeansUtil;
import org.junit.Assert;
@@ -55,7 +53,7 @@ public abstract class AbstractUnitTest
startContainer(beanClasses, null);
}
- protected void startContainer(Collection<Class<?>> beanClasses, Collection<URL> beanXmls)
+ protected void startContainer(Collection<Class<?>> beanClasses, Collection<String> beanXmls)
{
WebBeansFinder.clearInstances(WebBeansUtil.getCurrentClassLoader());
//Creates a new container
@@ -119,7 +117,7 @@ public abstract class AbstractUnitTest
return (T) getBeanManager().getReference(bean, type, getBeanManager().createCreationalContext(bean));
}
- protected URL getXMLUrl(String packageName, String fileName)
+ protected String getXmlPath(String packageName, String fileName)
{
StringBuilder prefix = new StringBuilder(packageName.replace('.', '/'));
prefix.append("/");
@@ -127,7 +125,7 @@ public abstract class AbstractUnitTest
prefix.append(".xml");
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return loader.getResource(prefix.toString());
+ return loader.getResource(prefix.toString()).toExternalForm();
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative1Test.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests.concepts.alternatives.tests;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -38,18 +37,16 @@ import org.apache.webbeans.newtests.conc
import org.junit.Test;
public class Alternative1Test extends AbstractUnitTest {
-
+
@Test
@SuppressWarnings("unchecked")
public void testDisposerMethodInAlternativeBean()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
-
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DefaultBeanProducer.class);
beanClasses.add(AlternativeBeanProducer1.class);
- startContainer(beanClasses, beanXmls);
+ startContainer(beanClasses, null);
Annotation[] anns = new Annotation[1];
anns[0] = new AnnotationLiteral<QualifierProducerBased>()
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative2Test.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests.concepts.alternatives.tests;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -43,7 +42,7 @@ public class Alternative2Test extends A
@SuppressWarnings("unchecked")
public void testDisposerMethodInAlternativeBean()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DefaultBeanProducer.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative3Test.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative3Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative3Test.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative3Test.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests.concepts.alternatives.tests;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -43,7 +42,7 @@ public class Alternative3Test extends A
@SuppressWarnings("unchecked")
public void testDisposerMethodInAlternativeBean()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DefaultBeanProducer.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative4Test.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative4Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative4Test.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative4Test.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests.concepts.alternatives.tests;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -44,7 +43,7 @@ public class Alternative4Test extends A
@SuppressWarnings("unchecked")
public void testDisposerMethodInAlternativeBean()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DefaultBeanProducerWithoutDisposes.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative5Test.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative5Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative5Test.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/Alternative5Test.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests.concepts.alternatives.tests;
import java.lang.annotation.Annotation;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -47,8 +46,8 @@ public class Alternative5Test extends Ab
public void testDisposerMethodInAlternativeBean()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "AlternativeTest5"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "AlternativeTest5"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DefaultBeanProducerWithoutDisposes.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java Wed Feb 23 18:55:55 2011
@@ -18,7 +18,6 @@
*/
package org.apache.webbeans.newtests.concepts.alternatives.tests;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -46,8 +45,8 @@ public class AlternativeOnProducerFieldT
@Test
public void testProducerFieldAlternativeNotEnabled()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME ,"AlternativeOnProducerFieldTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "AlternativeOnProducerFieldTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(PencilProducerBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/initializerMethods/tests/BrokenInitializerMethodBecauseofGenericTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/initializerMethods/tests/BrokenInitializerMethodBecauseofGenericTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/initializerMethods/tests/BrokenInitializerMethodBecauseofGenericTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/initializerMethods/tests/BrokenInitializerMethodBecauseofGenericTest.java Wed Feb 23 18:55:55 2011
@@ -32,7 +32,7 @@ public class BrokenInitializerMethodBeca
@Test(expected=WebBeansConfigurationException.class)
public void testBrokenInitializerBecauseofGeneric()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(BrokenInitializerMethodBecauseofGeneric.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/stereotypes/WarningStereotypeTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/stereotypes/WarningStereotypeTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/stereotypes/WarningStereotypeTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/concepts/stereotypes/WarningStereotypeTest.java Wed Feb 23 18:55:55 2011
@@ -18,7 +18,6 @@
*/
package org.apache.webbeans.newtests.concepts.stereotypes;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,7 +33,7 @@ public class WarningStereotypeTest exten
classes.add(MyStereoType1.class);
classes.add(MyStereoType2.class);
- Collection<URL> xmls = new ArrayList<URL>();
+ Collection<String> xmls = new ArrayList<String>();
startContainer(classes,xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/simple/SimpleDecoratorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/simple/SimpleDecoratorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/simple/SimpleDecoratorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/simple/SimpleDecoratorTest.java Wed Feb 23 18:55:55 2011
@@ -20,7 +20,6 @@ package org.apache.webbeans.newtests.dec
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
@@ -46,8 +45,8 @@ public class SimpleDecoratorTest extends
classes.add(MyLog.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "SimpleDecoratorTest"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "SimpleDecoratorTest"));
startContainer(classes, xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/AbstractDecoratorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/AbstractDecoratorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/AbstractDecoratorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/AbstractDecoratorTest.java Wed Feb 23 18:55:55 2011
@@ -59,8 +59,8 @@ public class AbstractDecoratorTest exten
classes.add(OutputProvider.class);
classes.add(RequestStringBuilder.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "AbstractDecoratorTest"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "AbstractDecoratorTest"));
startContainer(classes, xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/BrokenDecoratorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/BrokenDecoratorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/BrokenDecoratorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/BrokenDecoratorTest.java Wed Feb 23 18:55:55 2011
@@ -42,8 +42,8 @@ public class BrokenDecoratorTest extends
classes.add(BrokenAlternative.class);
classes.add(BrokenName.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "BrokenDecoratorTest"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "BrokenDecoratorTest"));
startContainer(classes,xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/ConversationDecoratorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/ConversationDecoratorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/ConversationDecoratorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/ConversationDecoratorTest.java Wed Feb 23 18:55:55 2011
@@ -62,8 +62,8 @@ public class ConversationDecoratorTest e
Collection<Class<?>> classes = new ArrayList<Class<?>>();
classes.add(ConversationDecorator.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "ConversationDecoratorTest"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "ConversationDecoratorTest"));
startContainer(classes,xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DecoratorAndInterceptorStackTests.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DecoratorAndInterceptorStackTests.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DecoratorAndInterceptorStackTests.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DecoratorAndInterceptorStackTests.java Wed Feb 23 18:55:55 2011
@@ -55,8 +55,8 @@ public class DecoratorAndInterceptorStac
classes.add(MyIntercept.class);
classes.add(OutputInterceptor.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "DecoratorAndInterceptorStack"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "DecoratorAndInterceptorStack"));
startContainer(classes, xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DependentDecoratorDestroyTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DependentDecoratorDestroyTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DependentDecoratorDestroyTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/DependentDecoratorDestroyTest.java Wed Feb 23 18:55:55 2011
@@ -49,8 +49,8 @@ public class DependentDecoratorDestroyTe
classes.add(TransactionalInterceptor.class);
classes.add(MyDestory.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "DependentDecoratorDestroy"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "DependentDecoratorDestroy"));
startContainer(classes, xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/GenericDecoratorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/GenericDecoratorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/GenericDecoratorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/GenericDecoratorTest.java Wed Feb 23 18:55:55 2011
@@ -55,8 +55,8 @@ public class GenericDecoratorTest extend
classes.add(Garphly.class);
classes.add(GarphlyDecorator.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "GenericDecoratorTest"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "GenericDecoratorTest"));
startContainer(classes,xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/MultipleDecoratorStackTests.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/MultipleDecoratorStackTests.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/MultipleDecoratorStackTests.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/tests/MultipleDecoratorStackTests.java Wed Feb 23 18:55:55 2011
@@ -51,8 +51,8 @@ public class MultipleDecoratorStackTests
classes.add(OutputProvider.class);
classes.add(RequestStringBuilder.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "MultipleDecoratorStack"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "MultipleDecoratorStack"));
startContainer(classes, xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DependentMethodBeanTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DependentMethodBeanTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DependentMethodBeanTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DependentMethodBeanTest.java Wed Feb 23 18:55:55 2011
@@ -37,7 +37,7 @@ public class DependentMethodBeanTest ext
@SuppressWarnings("unchecked")
public void testDisposerMethod()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DependentBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DisposerMethodBeanTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DisposerMethodBeanTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DisposerMethodBeanTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/disposes/DisposerMethodBeanTest.java Wed Feb 23 18:55:55 2011
@@ -38,7 +38,7 @@ public class DisposerMethodBeanTest exte
@SuppressWarnings("unchecked")
public void testDisposerMethod()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DisposerMethodBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionIntoConstructorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionIntoConstructorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionIntoConstructorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionIntoConstructorTest.java Wed Feb 23 18:55:55 2011
@@ -44,7 +44,7 @@ public class CircularInjectionIntoConstr
@SuppressWarnings("unchecked")
public void testOneNormalOneDependent()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(CircularNormalInConstructor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/circular/tests/CircularInjectionTest.java Wed Feb 23 18:55:55 2011
@@ -44,7 +44,7 @@ public class CircularInjectionTest exten
@SuppressWarnings("unchecked")
public void testOneNormalOneDependent()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(CircularDependentScopedBean.class);
@@ -75,7 +75,7 @@ public class CircularInjectionTest exten
@SuppressWarnings("unchecked")
public void testOneDependentOneNormal()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(CircularDependentScopedBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java Wed Feb 23 18:55:55 2011
@@ -41,7 +41,7 @@ public class DependentProducerMethodInje
@Test
public void testDependentProducerMethodInjectionPoint() throws Exception
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(InjectionPointMetaDataOwner.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/noncontextual/InjectNonContextualTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/noncontextual/InjectNonContextualTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/noncontextual/InjectNonContextualTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/noncontextual/InjectNonContextualTest.java Wed Feb 23 18:55:55 2011
@@ -47,7 +47,7 @@ public class InjectNonContextualTest ext
@Test
public void testInjectingNonContextualBean()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(ContextualBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/typeliteral/TypeLiteralTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/typeliteral/TypeLiteralTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/typeliteral/TypeLiteralTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/typeliteral/TypeLiteralTest.java Wed Feb 23 18:55:55 2011
@@ -37,7 +37,7 @@ public class TypeLiteralTest extends Abs
@Test
public void testDependentProducerMethodInjectionPoint()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(Pencil.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/broken/BrokenTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/broken/BrokenTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/broken/BrokenTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/broken/BrokenTest.java Wed Feb 23 18:55:55 2011
@@ -39,8 +39,8 @@ public class BrokenTest extends Abstract
classes.add(BrokenAlternative.class);
classes.add(BrokenName.class);
- Collection<URL> xmls = new ArrayList<URL>();
- xmls.add(getXMLUrl(PACKAGE_NAME, "BrokenTest"));
+ Collection<String> xmls = new ArrayList<String>();
+ xmls.add(getXmlPath(PACKAGE_NAME, "BrokenTest"));
startContainer(classes,xmls);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java Wed Feb 23 18:55:55 2011
@@ -43,8 +43,8 @@ public class DependingInterceptorTest ex
@Test
public void testDependingBeanInterceptor()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "DependingInterceptorTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "DependingInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(TransactionInterceptor.class);
@@ -107,8 +107,8 @@ public class DependingInterceptorTest ex
@Test
public void testInterceptorCreation() throws Exception
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "DependingInterceptorTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "DependingInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(TransactionInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/InterceptorPerformanceTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/InterceptorPerformanceTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/InterceptorPerformanceTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/InterceptorPerformanceTest.java Wed Feb 23 18:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.webbeans.newtests.interceptors.business.tests;
import junit.framework.Assert;
-import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.newtests.interceptors.beans.ApplicationScopedBean;
@@ -51,8 +50,8 @@ public class InterceptorPerformanceTest
@Test
public void testInterceptorPerformance()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "DependingInterceptorTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "DependingInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(TransactionInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java Wed Feb 23 18:55:55 2011
@@ -43,8 +43,8 @@ public class WithInheritedBindingTypeTes
@Test
public void testStereoTypeBasedInterceptor()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "WithInheritedBindingTypeTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "WithInheritedBindingTypeTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(TransactionInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java Wed Feb 23 18:55:55 2011
@@ -47,8 +47,8 @@ public class WithInheritedStereoTypeInte
@SuppressWarnings("unchecked")
public void testInheritedStereoTypeWihtInterceptorBinding()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "WithInheritedStereoTypeInterceptorTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "WithInheritedStereoTypeInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(TransactionInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithStereoTypeInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithStereoTypeInterceptorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithStereoTypeInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithStereoTypeInterceptorTest.java Wed Feb 23 18:55:55 2011
@@ -41,8 +41,8 @@ public class WithStereoTypeInterceptorTe
@Test
public void testStereoTypeBasedInterceptor()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "WithStereoTypeInterceptorTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "WithStereoTypeInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(TransactionInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java Wed Feb 23 18:55:55 2011
@@ -18,7 +18,6 @@
*/
package org.apache.webbeans.newtests.interceptors.dependent;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -46,8 +45,8 @@ public class DependentInterceptorTest ex
@SuppressWarnings("unchecked")
public void testLifecycle()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "DependentInterceptorTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "DependentInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DependentInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentLifecycleTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentLifecycleTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentLifecycleTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentLifecycleTest.java Wed Feb 23 18:55:55 2011
@@ -38,7 +38,7 @@ public class DependentLifecycleTest exte
@SuppressWarnings("unchecked")
public void testLifecycle()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(DependentLifecycleBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/ejb/EjbInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/ejb/EjbInterceptorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/ejb/EjbInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/ejb/EjbInterceptorTest.java Wed Feb 23 18:55:55 2011
@@ -40,7 +40,7 @@ public class EjbInterceptorTest extends
@SuppressWarnings("unchecked")
public void testEjbInterceptor()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(RequestScopedBean.class);
beanClasses.add(ManagedBeanWithEjbInterceptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/inheritance/InheritedInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/inheritance/InheritedInterceptorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/inheritance/InheritedInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/inheritance/InheritedInterceptorTest.java Wed Feb 23 18:55:55 2011
@@ -45,9 +45,9 @@ public class InheritedInterceptorTest ex
@Before
public void setUp() {
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "InheritedInterceptorTest"));
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "InheritedInterceptorTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/LifecycleTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/LifecycleTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/LifecycleTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/LifecycleTest.java Wed Feb 23 18:55:55 2011
@@ -18,7 +18,6 @@
*/
package org.apache.webbeans.newtests.interceptors.lifecycle;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
@@ -44,8 +43,8 @@ public class LifecycleTest extends Abstr
@SuppressWarnings("unchecked")
public void testLifecycle()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "LifecycleTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "LifecycleTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(LifecycleInterceptor.class);
@@ -81,8 +80,8 @@ public class LifecycleTest extends Abstr
@Test
public void testNotannotated()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
- beanXmls.add(getXMLUrl(PACKAGE_NAME, "LifecycleTest"));
+ Collection<String> beanXmls = new ArrayList<String>();
+ beanXmls.add(getXmlPath(PACKAGE_NAME, "LifecycleTest"));
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(NotAnnotatedBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/managed/ProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/managed/ProxyFactoryTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/managed/ProxyFactoryTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/managed/ProxyFactoryTest.java Wed Feb 23 18:55:55 2011
@@ -38,7 +38,7 @@ public class ProxyFactoryTest extends Ab
@SuppressWarnings("unchecked")
@Test
public void testProxyFactoryWithMultipleInterfaces() {
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
beanClasses.add(MyEntityServiceImpl.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/BeforeBeanDiscoveryTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/BeforeBeanDiscoveryTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/BeforeBeanDiscoveryTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/BeforeBeanDiscoveryTest.java Wed Feb 23 18:55:55 2011
@@ -40,7 +40,7 @@ public class BeforeBeanDiscoveryTest ext
@Test
public void testAddAdditionalAnnotatedType()
{
- Collection<URL> beanXmls = new ArrayList<URL>();
+ Collection<String> beanXmls = new ArrayList<String>();
Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();