[webbeans-commits] Webbeans SVN: r1429 - in tck/trunk/impl/src: main/java/org/jboss/webbeans/tck/impl/packaging/jsr299 and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Feb 6 10:23:34 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-06 10:23:34 -0500 (Fri, 06 Feb 2009)
New Revision: 1429
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WebXml.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.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/jsr299/BeansXml.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/declarativeArtifact/war/ArtifactTest.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java
Log:
Switch to allowing a porting package to specify a custom web.xml
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -13,7 +13,6 @@
import org.jboss.webbeans.tck.impl.packaging.jsr299.BeansXml;
import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.packaging.war.WebXml;
public class DeclarativeArtifactProcessor
{
@@ -22,7 +21,6 @@
private final boolean ejbs;
private final boolean addDeclaringPackage;
private final String beansXml;
- private final String webXml;
private final PackagingType packagingType;
private final Collection<ResourceDescriptor> resources;
private final Collection<Class<?>> classes;
@@ -82,22 +80,6 @@
throw new IllegalArgumentException("Cannot specify @Packaging(WAR) or @Packaging(EAR) if @Integration test is not present");
}
- if (declaringClass.isAnnotationPresent(WebXml.class))
- {
- if (packagingType == null)
- {
- throw new IllegalArgumentException("Cannot specify @WebXml for non-integration tests");
- }
- else
- {
- this.webXml = asAbsolutePath(declaringClass.getAnnotation(WebXml.class).value());
- }
- }
- else
- {
- this.webXml = null;
- }
-
if (declaringClass.isAnnotationPresent(Resources.class))
{
this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value());
@@ -122,7 +104,7 @@
final TCKArtifactDescriptor artifact;
if (packagingType.equals(WAR))
{
- artifact = new WarArtifactDescriptor(declaringClass, beansXml, webXml);
+ artifact = new WarArtifactDescriptor(declaringClass, beansXml);
}
else if (packagingType.equals(EAR))
{
@@ -134,7 +116,7 @@
}
else if (!standalone)
{
- artifact = new WarArtifactDescriptor(declaringClass, beansXml, null);
+ artifact = new WarArtifactDescriptor(declaringClass, beansXml);
}
else
{
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-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/Resource.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -8,13 +8,11 @@
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/jsr299/BeansXml.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/BeansXml.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/BeansXml.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -8,13 +8,11 @@
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
*
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-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -1,8 +1,8 @@
package org.jboss.webbeans.tck.impl.packaging.war;
+import static org.jboss.webbeans.tck.impl.util.Reflections.loadResource;
-import static org.jboss.webbeans.tck.impl.util.Strings.isEmpty;
-
import java.io.File;
+import java.net.URL;
import org.jboss.webbeans.tck.impl.packaging.ResourceDescriptor;
import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
@@ -12,17 +12,19 @@
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";
+ public static final String CUSTOM_WEB_XML_FILE_NAME = "org/jboss/webbeans/tck/impl/packaging/war/default/custom-web.xml";
private File webInfClasses;
- public WarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName, String webXmlSourceFileName)
+ public WarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
{
super(declaringClass, beansXmlSourceFileName);
- if (isEmpty(webXmlSourceFileName))
+ URL webXml = loadResource(CUSTOM_WEB_XML_FILE_NAME);
+ if (webXml == null)
{
- webXmlSourceFileName = STANDARD_WEB_XML_FILE_NAME;
+ webXml = loadResource(STANDARD_WEB_XML_FILE_NAME);
}
- getResources().add(new ResourceDescriptor(WEB_XML_DESTINATION, webXmlSourceFileName));
+ getResources().add(new ResourceDescriptor(WEB_XML_DESTINATION, webXml));
}
@Override
Deleted: 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-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/war/WebXml.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -1,34 +0,0 @@
-package org.jboss.webbeans.tck.impl.packaging.war;
-
-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
- *
- */
- at Documented
- at Retention(RUNTIME)
- at Target(TYPE)
-public @interface WebXml
-{
-
- /**
- * Location of the overriding file, relative to the current location or the
- * root this classpath
- *
- */
- String value();
-
-}
Modified: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -27,23 +27,5 @@
assert webXml.getName().equals("web.xml");
assert webXml.length() != 0;
}
-
- @Test
- public void testCustomWebXml() throws Exception
- {
- DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomWebXmlTest.class, false);
- TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact();
- File root = artifact.getExplodedJar();
- assert root.listFiles(WEB_INF_FILTER).length == 1;
- 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 readFile(webXml).startsWith("<web></web>");
- }
}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -1,22 +0,0 @@
-package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war;
-
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.IntegrationTest;
-import org.jboss.webbeans.tck.impl.packaging.Packaging;
-import org.jboss.webbeans.tck.impl.packaging.PackagingType;
-import org.jboss.webbeans.tck.impl.packaging.war.WebXml;
-
-
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.WAR)
- at WebXml("my-web.xml")
-class DummyCustomWebXmlTest
-{
-
- public void test()
- {
- assert true;
- }
-
-}
Modified: 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 2009-02-06 15:07:43 UTC (rev 1428)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java 2009-02-06 15:23:34 UTC (rev 1429)
@@ -16,7 +16,7 @@
@Test
public void testDefaultWar() throws Exception
{
- WarArtifactDescriptor war = new WarArtifactDescriptor(null, null, null);
+ WarArtifactDescriptor war = new WarArtifactDescriptor(null, null);
war.getClasses().add(Cow.class);
File root = war.getExplodedJar();
assert root.listFiles().length == 2;
@@ -59,7 +59,7 @@
@Test
public void testJarProduction() throws Exception
{
- WarArtifactDescriptor war = new WarArtifactDescriptor(null, null, null);
+ WarArtifactDescriptor war = new WarArtifactDescriptor(null, null);
war.getClasses().add(Cow.class);
JarInputStream is = new JarInputStream(war.getJar());
JarEntry entry;
More information about the weld-commits
mailing list