[webbeans-commits] Webbeans SVN: r1415 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl: packaging and 2 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-04 14:34:41 -0500 (Wed, 04 Feb 2009) New Revision: 1415 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Classes.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/EjbArtifact.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/IntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Packaging.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resource.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resources.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/BeansXml.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WebXml.java Log: javadoc Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -0,0 +1,100 @@ +package org.jboss.webbeans.tck.impl; + +import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration; +import static org.jboss.webbeans.tck.impl.util.Reflections.loadResources; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLDecoder; +import java.util.HashSet; +import java.util.Set; + +import org.apache.log4j.Logger; + +public class InContainerTestRunner +{ + + private static class URLScanner + { + private static final Logger log = Logger.getLogger(URLScanner.class); + + private final Package pkg; + + private final Set<String> classes = new HashSet<String>(); + + public URLScanner(Package pkg) + { + this.pkg = pkg; + } + + private void scanPackage() + { + try + { + Set<String> paths = new HashSet<String>(); + String packageName = pkg.getName().replace(".", "/"); + for (URL url : loadResources(packageName)) + { + String urlPath = url.getFile(); + urlPath = URLDecoder.decode(urlPath, "UTF-8"); + if ( urlPath.startsWith("file:") ) + { + urlPath = urlPath.substring(5); + } + if ( urlPath.indexOf('!')>0 ) + { + urlPath = urlPath.substring(0, urlPath.indexOf('!')); + } + paths.add(urlPath); + } + handle(paths); + } + catch (IOException ioe) + { + log.warn("could not read: " + pkg.getName(), ioe); + } + } + + private void handle(Set<String> paths) + { + for ( String urlPath: paths ) + { + log.trace("scanning: " + urlPath); + File file = new File(urlPath); + if ( file.isDirectory() ) + { + for ( File child: file.listFiles() ) + { + if ( !child.isDirectory() && child.getName().endsWith(".class")) + { + classes.add(pkg.getName() + "." + child.getName().substring(0, child.getName().lastIndexOf(".class"))); + } + } + } + } + } + + public Set<String> getClassNames() + { + scanPackage(); + return classes; + } + + } + + public InContainerTestRunner() + { + // TODO Auto-generated constructor stub + } + + public void run() + { + + if (configuration().getTestSuite().isStandalone()) + { + + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Artifact.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -18,6 +18,10 @@ * classes and /META-INF/beans.xml file). * * @see EjbArtifact + * @see Classes + * @see IntegrationTest + * @see Packaging + * @see Resources * * @author Pete Muir * Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Classes.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Classes.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Classes.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -10,6 +10,10 @@ /** * Add classes to the deployed artifact * + * @see Artifact + * @see EjbArtifact + * @see Resources + * * @author Pete Muir * */ Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/EjbArtifact.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/EjbArtifact.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/EjbArtifact.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -19,6 +19,10 @@ * @author Pete Muir * * @see Artifact + * @see Classes + * @see IntegrationTest + * @see Packaging + * @see Resources * */ @Documented Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/IntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/IntegrationTest.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/IntegrationTest.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -10,6 +10,10 @@ * Mark this test as an integration test, always requiring running in a * container. * + * @see Artifact + * @see EjbArtifact + * @see IntegrationTest + * * @author Pete Muir * */ Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Packaging.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Packaging.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Packaging.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -11,6 +11,10 @@ * Mark this test as requiring specific packaging when deployed to a container * for intgration testing. * + * @see IntegrationTest + * @see Artifact + * @see EjbArtifact + * * @author Pete Muir * */ Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resource.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resource.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resource.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -7,10 +7,15 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.jboss.webbeans.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.webbeans.tck.impl.packaging.war.WebXml; + /** * Specify an additional resource to be added to the artifact. * * @see Resources + * @see WebXml + * @see BeansXml * * @author Pete Muir * Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resources.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resources.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resources.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -10,6 +10,9 @@ * Specify additional resources for an artifact * * @see Resource + * @see Classes + * @see Artifact + * @see EjbArtifact * * @author Pete Muir * Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/BeansXml.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/BeansXml.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/BeansXml.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -3,14 +3,33 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.jboss.webbeans.tck.impl.packaging.Resource; +import org.jboss.webbeans.tck.impl.packaging.war.WebXml; + +/** + * Override the default (empty) META-INF/beans.xml + * + * @see Resource + * @see WebXml + * + * @author Pete Muir + * + */ +@Documented @Retention(RUNTIME) @Target(TYPE) public @interface BeansXml { + /** + * Location of the overriding file, relative to the current location or the + * root this classpath + * + */ String value(); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WebXml.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WebXml.java 2009-02-04 19:20:01 UTC (rev 1414) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WebXml.java 2009-02-04 19:34:41 UTC (rev 1415) @@ -3,14 +3,32 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.jboss.webbeans.tck.impl.packaging.Resource; +import org.jboss.webbeans.tck.impl.packaging.jsr299.BeansXml; + +/** + * Override the default WEB-INF/web.xml + * + * @see Resource + * @see BeansXml + * @author Pete Muir + * + */ +@Documented @Retention(RUNTIME) @Target(TYPE) public @interface WebXml { + /** + * Location of the overriding file, relative to the current location or the + * root this classpath + * + */ String value(); }