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

Author: pete.muir(a)jboss.org Date: 2009-02-04 13:46:21 -0500 (Wed, 04 Feb 2009) New Revision: 1412 Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java Log: Put war classes into WEB-INF/classes Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java 2009-02-04 18:28:42 UTC (rev 1411) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.java 2009-02-04 18:46:21 UTC (rev 1412) @@ -176,14 +176,14 @@ root.deleteOnExit(); for (Class<?> clazz : getClasses()) { - copyClass(clazz, root); + copyClass(clazz, getClassesRoot(root)); } for (Package pkg : getPackages()) { URLPackageScanner packageScanner = new URLPackageScanner(pkg); for (String className : packageScanner.getClassNames()) { - copyClass(className, root); + copyClass(className, getClassesRoot(root)); } } for (ResourceDescriptor resourceDescriptor : getResources()) @@ -266,4 +266,9 @@ return packages; } + public File getClassesRoot(File archiveRoot) + { + return archiveRoot; + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-04 18:28:42 UTC (rev 1411) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-04 18:46:21 UTC (rev 1412) @@ -2,6 +2,8 @@ import static org.jboss.webbeans.tck.impl.util.Strings.isEmpty; +import java.io.File; + import org.jboss.webbeans.tck.impl.packaging.ResourceDescriptor; import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; @@ -11,6 +13,8 @@ public static final String WEB_XML_DESTINATION = "WEB-INF/web.xml"; public static final String STANDARD_WEB_XML_FILE_NAME = "org/jboss/webbeans/tck/impl/packaging/war/default/web.xml"; + private File webInfClasses; + public WarArtifactDescriptor(String beansXmlSourceFileName, String webXmlSourceFileName) { super(beansXmlSourceFileName); @@ -21,4 +25,15 @@ getResources().add(new ResourceDescriptor(WEB_XML_DESTINATION, webXmlSourceFileName)); } + @Override + public File getClassesRoot(File archiveRoot) + { + if (webInfClasses == null) + { + webInfClasses = new File(archiveRoot, "WEB-INF/classes"); + webInfClasses.mkdirs(); + } + return webInfClasses; + } + } Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-04 18:28:42 UTC (rev 1411) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-04 18:46:21 UTC (rev 1412) @@ -20,6 +20,14 @@ } }; + protected static final FilenameFilter CLASSES_FILTER = new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.equals("classes"); + } + }; + protected static final FilenameFilter META_INF_FILTER = new FilenameFilter() { public boolean accept(File dir, String name) Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java 2009-02-04 18:28:42 UTC (rev 1411) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java 2009-02-04 18:46:21 UTC (rev 1412) @@ -1,16 +1,10 @@ package org.jboss.webbeans.tck.impl.test.packaging; import java.io.File; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.List; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; import org.jboss.webbeans.tck.AbstractTest; import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor; import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor; import org.jboss.webbeans.tck.impl.util.Reflections; import org.jboss.webbeans.tck.literals.NewLiteral; import org.testng.annotations.Test; @@ -19,48 +13,6 @@ { @Test - public void testDefaultWar() throws Exception - { - WarArtifactDescriptor war = new WarArtifactDescriptor(null, null); - war.getClasses().add(Cow.class); - File root = war.create(); - assert root.listFiles().length == 3; - assert root.isDirectory(); - assert root.listFiles(WEB_INF_FILTER).length == 1; - File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.getName().equals("META-INF"); - assert metaInf.isDirectory(); - assert metaInf.listFiles().length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; - File beansXml = metaInf.listFiles(BEANS_XML_FILTER)[0]; - assert beansXml.isFile(); - assert beansXml.getName().equals("beans.xml"); - assert beansXml.length() == 0; - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.getName().equals("WEB-INF"); - assert webInf.isDirectory(); - assert webInf.listFiles().length == 1; - assert webInf.listFiles(WEB_XML_FILTER).length == 1; - File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; - assert webXml.isFile(); - assert webXml.getName().equals("web.xml"); - assert webXml.length() != 0; - File currentPackage = getCurrentPackageAsFile(root); - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - } - - @Test public void testDefaultTCKArtifact() throws Exception { ArtifactDescriptor artifactDescriptor = new TCKArtifactDescriptor(null); @@ -70,23 +22,5 @@ assert getPackageAsFile(AbstractTest.class.getPackage(), root).listFiles().length > 0; } - @Test - public void testJarProduction() throws Exception - { - WarArtifactDescriptor war = new WarArtifactDescriptor(null, null); - war.getClasses().add(Cow.class); - JarInputStream is = war.asJar(); - JarEntry entry; - List<String> fileNames = new ArrayList<String>(); - while ((entry = is.getNextJarEntry()) != null) - { - fileNames.add(entry.getName()); - } - assert fileNames.contains("META-INF/beans.xml"); - assert fileNames.contains("WEB-INF/web.xml"); - assert fileNames.contains("org/jboss/webbeans/tck/impl/test/packaging/Cow.class"); - assert fileNames.contains("org/jboss/webbeans/tck/AbstractTest.class"); - assert fileNames.contains("org/jboss/webbeans/tck/impl/util/Reflections.class"); - } } Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java 2009-02-04 18:46:21 UTC (rev 1412) @@ -0,0 +1,87 @@ +package org.jboss.webbeans.tck.impl.test.packaging.war; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; + +import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class ArtifactTest extends AbstractArtifactTest +{ + @Test + public void testDefaultWar() throws Exception + { + WarArtifactDescriptor war = new WarArtifactDescriptor(null, null); + war.getClasses().add(Cow.class); + File root = war.create(); + assert root.listFiles().length == 2; + assert root.isDirectory(); + assert root.listFiles(WEB_INF_FILTER).length == 1; + File metaInf = root.listFiles(META_INF_FILTER)[0]; + assert metaInf.getName().equals("META-INF"); + assert metaInf.isDirectory(); + assert metaInf.listFiles().length == 1; + assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; + File beansXml = metaInf.listFiles(BEANS_XML_FILTER)[0]; + assert beansXml.isFile(); + assert beansXml.getName().equals("beans.xml"); + assert beansXml.length() == 0; + File webInf = root.listFiles(WEB_INF_FILTER)[0]; + assert webInf.getName().equals("WEB-INF"); + assert webInf.isDirectory(); + assert webInf.listFiles().length == 2; + assert webInf.listFiles(WEB_XML_FILTER).length == 1; + File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; + assert webXml.isFile(); + assert webXml.getName().equals("web.xml"); + assert webXml.length() != 0; + File currentPackage = getCurrentPackageAsFile(root); + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + } + + + @Test + public void testJarProduction() throws Exception + { + WarArtifactDescriptor war = new WarArtifactDescriptor(null, null); + war.getClasses().add(Cow.class); + JarInputStream is = war.asJar(); + JarEntry entry; + List<String> fileNames = new ArrayList<String>(); + while ((entry = is.getNextJarEntry()) != null) + { + fileNames.add(entry.getName()); + } + assert fileNames.contains("META-INF/beans.xml"); + assert fileNames.contains("WEB-INF/web.xml"); + assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.class"); + assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/AbstractTest.class"); + assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/impl/util/Reflections.class"); + } + + @Override + protected File getPackageAsFile(Package pkg, File root) + { + root = root.listFiles(WEB_INF_FILTER)[0]; + root = root.listFiles(CLASSES_FILTER)[0]; + return super.getPackageAsFile(pkg, root); + } + +} + Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java 2009-02-04 18:46:21 UTC (rev 1412) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.impl.test.packaging.war; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain