Author: pete.muir(a)jboss.org Date: 2009-02-18 13:41:21 -0500 (Wed, 18 Feb 2009) New Revision: 1576 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EjbJarArtifactDescriptor.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java Log: put web-beans.xml in the ejb Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java 2009-02-18 18:15:05 UTC (rev 1575) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java 2009-02-18 18:41:21 UTC (rev 1576) @@ -24,8 +24,8 @@ public EarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName) { - super(declaringClass, beansXmlSourceFileName); - this.ejbJar = new EjbJarArtifactDescriptor(declaringClass); + super(declaringClass, null); + this.ejbJar = new EjbJarArtifactDescriptor(declaringClass, beansXmlSourceFileName); this.war = new WarArtifactDescriptor(declaringClass, null) { @@ -94,9 +94,9 @@ } @Override - public String getBeansDestination() + protected boolean isAddBeansXml() { - return "META-INF/web-beans.xml"; + return false; } @Override Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EjbJarArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EjbJarArtifactDescriptor.java 2009-02-18 18:15:05 UTC (rev 1575) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EjbJarArtifactDescriptor.java 2009-02-18 18:41:21 UTC (rev 1576) @@ -3,19 +3,19 @@ import java.net.URL; -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; import org.jboss.jsr299.tck.impl.packaging.ResourceDescriptor; +import org.jboss.jsr299.tck.impl.packaging.jsr299.JSR299ArtifactDescriptor; -public class EjbJarArtifactDescriptor extends ArtifactDescriptor +public class EjbJarArtifactDescriptor extends JSR299ArtifactDescriptor { public static final String EJB_JAR_XML_DESTINATION = "META-INF/ejb-jar.xml"; public static final String STANDARD_EJB_JAR_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml"; public static final String CUSTOM_EJB_JAR_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/ear/custom-ejb-jar.xml"; - public EjbJarArtifactDescriptor(Class<?> declaringClass) + public EjbJarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName) { - super(declaringClass); + super(declaringClass, beansXmlSourceFileName); URL ejbJarXml = loadResource(CUSTOM_EJB_JAR_XML_FILE_NAME); if (ejbJarXml == null) { Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java 2009-02-18 18:15:05 UTC (rev 1575) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java 2009-02-18 18:41:21 UTC (rev 1576) @@ -64,23 +64,29 @@ File metaInf = new File(root, "META-INF"); assert metaInf.isDirectory(); - assert metaInf.list().length == 3; + assert metaInf.list().length == 2; List<String> metaInfs = Arrays.asList(metaInf.list()); assert metaInfs.contains("application.xml"); - assert metaInfs.contains("web-beans-tck.properties"); - assert metaInfs.contains("web-beans.xml"); - - File applicationXml = new File(metaInf, "application.xml"); assert applicationXml.length() > 0; + File webBeansTckProperties = new File(metaInf, "web-beans-tck.properties"); + assert webBeansTckProperties.isFile(); + assert webBeansTckProperties.length() > 0; + File ejbJarRoot = ear.getEjbJar().getExplodedJar(); File ejbJarXml = new File(ejbJarRoot, "META-INF/ejb-jar.xml"); assert ejbJarXml.isFile(); assert ejbJarXml.length() > 0; + File webbeansXml = new File(ejbJarRoot, "META-INF/web-beans.xml"); + assert webbeansXml.isFile(); + assert webbeansXml.length() == 0; + + + File currentPackage = getCurrentPackageAsFile(ejbJarRoot); File[] cowClasses = currentPackage.listFiles(new FilenameFilter() { @@ -122,7 +128,6 @@ } is.close(); assert fileNames.contains("META-INF/application.xml"); - assert fileNames.contains("META-INF/web-beans.xml"); assert fileNames.contains("META-INF/web-beans-tck.properties"); assert fileNames.contains("lib/tck-support.jar"); assert fileNames.contains(DummyTest.class.getName() + ".jar"); @@ -141,6 +146,7 @@ } is.close(); assert fileNames.contains("META-INF/ejb-jar.xml"); + assert fileNames.contains("META-INF/web-beans.xml"); assert fileNames.contains("org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.class"); }