[webbeans-commits] Webbeans SVN: r1553 - tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 17:30:14 -0500 (Mon, 16 Feb 2009)
New Revision: 1553
Modified:
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java
Log:
Javadoc
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-02-16 22:19:44 UTC (rev 1552)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-02-16 22:30:14 UTC (rev 1553)
@@ -38,6 +38,9 @@
* The container should be in an fully initialized state when the
* method returns
*
+ * Deprecated, {@link #deploy(Iterable, Iterable)} should be used with real
+ * beans.xml files. This method will be removed when the TCK is released.
+ *
* @param classes the classes to deploy
* @return the manager created as a result of initializing the container
*/
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1552 - in tck/trunk/impl/src: main/java/org/jboss/jsr299/tck/impl/packaging/ear and 10 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 17:19:44 -0500 (Mon, 16 Feb 2009)
New Revision: 1552
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/
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/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/web.xml
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Cow.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Fox.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/DummyTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/default/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java
Log:
Add support for EAR/EJB artifacts
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 22:17:19 UTC (rev 1551)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -266,17 +266,20 @@
File root = new File(System.getProperty("java.io.tmpdir") + "/" + getClass().getName() + "." + random.nextInt());
root.mkdir();
root.deleteOnExit();
- for (Class<?> clazz : getClasses())
+ for (Class<?> clazz : classes)
{
copyClass(clazz, getClassesRoot(root));
}
- for (ResourceDescriptor resourceDescriptor : getResources())
+ for (ResourceDescriptor resourceDescriptor : resources)
{
copyResource(resourceDescriptor, root);
}
- for (ResourceDescriptor resourceDescriptor : getLibraries())
+ if (isLibrariesSupported())
{
- copyResource(resourceDescriptor, getLibraryRoot(root));
+ for (ResourceDescriptor resourceDescriptor : libraries)
+ {
+ copyResource(resourceDescriptor, getLibraryRoot(root));
+ }
}
this.explodedJar = root;
}
@@ -341,7 +344,7 @@
public void writeArtifactToDisk(String outputDirectory, String fileName) throws IOException
{
- File file = new File(outputDirectory, fileName + getExtension());
+ File file = new File(outputDirectory, fileName);
file.createNewFile();
OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
InputStream jar = getJarAsStream();
@@ -425,7 +428,7 @@
@Override
public String toString()
{
- return "Declared by: " + declaringClass.getName() + " Classes: " + getClasses() + " Resources: " + getResources();
+ return "Declared by: " + declaringClass.getName() + " Classes: " + classes + " Resources: " + resources;
}
public Class<?> getDeclaringClass()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-16 22:17:19 UTC (rev 1551)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -17,6 +17,7 @@
import org.apache.log4j.Logger;
import org.jboss.jsr299.tck.api.Configuration;
+import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor;
import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor;
@@ -196,11 +197,11 @@
}
else if (packagingType.equals(EAR))
{
- throw new UnsupportedOperationException();
+ artifact = new EarArtifactDescriptor(declaringClass, beansXml);
}
else if (!standalone && ejbs)
{
- throw new UnsupportedOperationException();
+ artifact = new EarArtifactDescriptor(declaringClass, beansXml);
}
else if (!standalone)
{
Added: 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 (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,133 @@
+package org.jboss.jsr299.tck.impl.packaging.ear;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.jboss.jsr299.tck.impl.packaging.ResourceDescriptor;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
+import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor;
+
+public class EarArtifactDescriptor extends TCKArtifactDescriptor
+{
+
+ private static final Logger log = Logger.getLogger(EarArtifactDescriptor.class);
+
+ public static final String APPLICATION_XML_DESTINATION = "META-INF/application.xml";
+
+ private final EjbJarArtifactDescriptor ejbJar;
+ private final WarArtifactDescriptor war;
+
+ public EarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
+ {
+ super(declaringClass, beansXmlSourceFileName);
+ this.ejbJar = new EjbJarArtifactDescriptor(declaringClass);
+ this.war = new WarArtifactDescriptor(declaringClass, null)
+ {
+
+ @Override
+ protected boolean isAddBeansXml()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isLibrariesSupported()
+ {
+ return false;
+ }
+
+ };
+ try
+ {
+ getResources().add(new ResourceDescriptor(APPLICATION_XML_DESTINATION, getApplicationXml(declaringClass)));
+ }
+ catch (IOException e)
+ {
+ log.warn("Error generating ear");
+ }
+
+ }
+
+ @Override
+ public Set<Class<?>> getClasses()
+ {
+ return getEjbJar().getClasses();
+ }
+
+ public EjbJarArtifactDescriptor getEjbJar()
+ {
+ return ejbJar;
+ }
+
+ public WarArtifactDescriptor getWar()
+ {
+ return war;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ear, " + super.toString();
+ }
+
+ @Override
+ public String getExtension()
+ {
+ return ".ear";
+ }
+
+ @Override
+ public boolean isLibrariesSupported()
+ {
+ return true;
+ }
+
+ @Override
+ protected String getLibrariesRoot()
+ {
+ return "lib";
+ }
+
+ @Override
+ public String getBeansDestination()
+ {
+ return "META-INF/web-beans.xml";
+ }
+
+ @Override
+ public void create() throws IOException
+ {
+ getResources().add(new ResourceDescriptor(war.getDefaultName(), war.getJar()));
+ getResources().add(new ResourceDescriptor(ejbJar.getDefaultName(), ejbJar.getJar()));
+ super.create();
+ }
+
+ private static InputStream getApplicationXml(Class<?> declaringClass) throws IOException
+ {
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ Writer writer = new PrintWriter(os);
+ writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ writer.write("<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n" +
+ "\t\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
+ "\t\txsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd\" \n" +
+ "\t\tversion=\"5\">\n\n");
+ writer.write("\t<display-name>JSR-99 TCK: " + declaringClass.getName() + "</display-name>\n\n");
+ writer.write("\t<module>\n" +
+ "\t\t<web>\n" +
+ "\t\t\t<web-uri>" + declaringClass.getName() +".war</web-uri>\n" +
+ "\t\t\t<context-root>/" + declaringClass.getName() + "</context-root>\n" +
+ "\t\t</web>\n" +
+ "\t</module>\n\n");
+ writer.write("\t<module>\n" +
+ "\t\t<ejb>" + declaringClass.getName() +".jar</ejb>\n" +
+ "\t</module>\n\n");
+ writer.write("</application>\n");
+ writer.flush();
+ return new ByteArrayInputStream(os.toByteArray());
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EjbJarArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,39 @@
+package org.jboss.jsr299.tck.impl.packaging.ear;
+import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource;
+
+import java.net.URL;
+
+import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor;
+import org.jboss.jsr299.tck.impl.packaging.ResourceDescriptor;
+
+public class EjbJarArtifactDescriptor extends ArtifactDescriptor
+{
+
+ 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)
+ {
+ super(declaringClass);
+ URL ejbJarXml = loadResource(CUSTOM_EJB_JAR_XML_FILE_NAME);
+ if (ejbJarXml == null)
+ {
+ ejbJarXml = loadResource(STANDARD_EJB_JAR_XML_FILE_NAME);
+ }
+ getResources().add(new ResourceDescriptor(EJB_JAR_XML_DESTINATION, ejbJarXml));
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ejb jar, " + super.toString();
+ }
+
+ @Override
+ public boolean isLibrariesSupported()
+ {
+ return false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EjbJarArtifactDescriptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java 2009-02-16 22:17:19 UTC (rev 1551)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -16,12 +16,19 @@
public JSR299ArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
{
super(declaringClass);
- if (isEmpty(beansXmlSourceFileName))
+ if (!isAddBeansXml())
{
- beansXmlSourceFileName = STANDARD_BEANS_XML_FILE_NAME;
+ this.beansXml = null;
}
- this.beansXml = new ResourceDescriptor(getBeansDestination(), beansXmlSourceFileName);
- getResources().add(beansXml);
+ else
+ {
+ if (isEmpty(beansXmlSourceFileName))
+ {
+ beansXmlSourceFileName = STANDARD_BEANS_XML_FILE_NAME;
+ }
+ this.beansXml = new ResourceDescriptor(getBeansDestination(), beansXmlSourceFileName);
+ getResources().add(beansXml);
+ }
}
public String getBeansDestination()
@@ -34,4 +41,9 @@
return beansXml;
}
+ protected boolean isAddBeansXml()
+ {
+ return true;
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-16 22:17:19 UTC (rev 1551)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -46,17 +46,20 @@
public TCKArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
{
super(declaringClass, beansXmlSourceFileName);
- getLibraries().add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar"));
- getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/jsr299-tck-api.jar"));
- getLibraries().add(getTckSupportJar());
- try
+ if (isLibrariesSupported())
{
- getResources().add(new ResourceDescriptor(getClassesRoot() + DeploymentProperties.RESOURCE_BUNDLE, getDeploymentProperties(declaringClass)));
+ getLibraries().add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar"));
+ getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/jsr299-tck-api.jar"));
+ getLibraries().add(getTckSupportJar());
+ try
+ {
+ getResources().add(new ResourceDescriptor(getClassesRoot() + DeploymentProperties.RESOURCE_BUNDLE, getDeploymentProperties(declaringClass)));
+ }
+ catch (IOException e)
+ {
+ log.warn("Error generating deployment properties", e);
+ }
}
- catch (IOException e)
- {
- log.warn("Error generating deployment properties", e);
- }
}
private static InputStream getDeploymentProperties(Class<?> declaringClass) throws IOException
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16 22:17:19 UTC (rev 1551)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -1,66 +0,0 @@
-package org.jboss.jsr299.tck.impl.packaging.war;
-import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource;
-
-import java.io.File;
-import java.net.URL;
-
-import org.jboss.jsr299.tck.impl.packaging.ResourceDescriptor;
-import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
-
-public class WarArtifactDescriptor extends TCKArtifactDescriptor
-{
-
- public static final String WEB_XML_DESTINATION = "WEB-INF/web.xml";
- public static final String STANDARD_WEB_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/war/default/web.xml";
- public static final String CUSTOM_WEB_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/war/default/custom-web.xml";
-
- private File webInfClasses;
- private File webInfLib;
-
- public WarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
- {
- super(declaringClass, beansXmlSourceFileName);
- URL webXml = loadResource(CUSTOM_WEB_XML_FILE_NAME);
- if (webXml == null)
- {
- webXml = loadResource(STANDARD_WEB_XML_FILE_NAME);
- }
- getResources().add(new ResourceDescriptor(WEB_XML_DESTINATION, webXml));
- }
-
- @Override
- public String getClassesRoot()
- {
- return "WEB-INF/classes/";
- }
-
- @Override
- public String toString()
- {
- return "war, " + super.toString();
- }
-
- @Override
- public String getExtension()
- {
- return ".war";
- }
-
- @Override
- public boolean isLibrariesSupported()
- {
- return true;
- }
-
- @Override
- protected String getLibrariesRoot()
- {
- return "WEB-INF/lib";
- }
-
- @Override
- public String getBeansDestination()
- {
- return "WEB-INF/web-beans.xml";
- }
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,62 @@
+package org.jboss.jsr299.tck.impl.packaging.war;
+import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource;
+
+import java.net.URL;
+
+import org.jboss.jsr299.tck.impl.packaging.ResourceDescriptor;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
+
+public class WarArtifactDescriptor extends TCKArtifactDescriptor
+{
+
+ public static final String WEB_XML_DESTINATION = "WEB-INF/web.xml";
+ public static final String STANDARD_WEB_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/war/web.xml";
+ public static final String CUSTOM_WEB_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/war/custom-web.xml";
+
+ public WarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName)
+ {
+ super(declaringClass, beansXmlSourceFileName);
+ URL webXml = loadResource(CUSTOM_WEB_XML_FILE_NAME);
+ if (webXml == null)
+ {
+ webXml = loadResource(STANDARD_WEB_XML_FILE_NAME);
+ }
+ getResources().add(new ResourceDescriptor(WEB_XML_DESTINATION, webXml));
+ }
+
+ @Override
+ public String getClassesRoot()
+ {
+ return "WEB-INF/classes/";
+ }
+
+ @Override
+ public String toString()
+ {
+ return "war, " + super.toString();
+ }
+
+ @Override
+ public String getExtension()
+ {
+ return ".war";
+ }
+
+ @Override
+ public boolean isLibrariesSupported()
+ {
+ return true;
+ }
+
+ @Override
+ protected String getLibrariesRoot()
+ {
+ return "WEB-INF/lib";
+ }
+
+ @Override
+ public String getBeansDestination()
+ {
+ return "WEB-INF/web-beans.xml";
+ }
+}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+
+</ejb-jar>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/ear/ejb-jar.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/web.xml (from rev 1546, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/default/web.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/web.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/web.xml 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>JSR-299 TCK</display-name>
+
+ <servlet>
+ <servlet-name>JSR-299 TCK Test Runner</servlet-name>
+ <servlet-class>org.jboss.jsr299.tck.impl.runner.servlet.ServletTestRunner</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JSR-299 TCK Test Runner</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/war/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java 2009-02-16 22:17:19 UTC (rev 1551)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/AbstractArtifactTest.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -3,9 +3,12 @@
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.Reader;
import java.util.Arrays;
@@ -109,4 +112,23 @@
}
}
+ protected static void copy(InputStream inputStream, File file) throws IOException
+ {
+ OutputStream os = new FileOutputStream(file);
+ try
+ {
+ byte[] buf = new byte[1024];
+ int i = 0;
+ while ((i = inputStream.read(buf)) != -1)
+ {
+ os.write(buf, 0, i);
+ }
+ }
+ finally
+ {
+ os.close();
+ }
+
+ }
+
}
Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Cow.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.test.impl.packaging.declarative.ear;
+
+class Cow
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,39 @@
+package org.jboss.jsr299.tck.test.impl.packaging.declarative.ear;
+
+import java.io.File;
+
+import org.jboss.jsr299.tck.api.Configuration;
+import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator;
+import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor;
+import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration;
+import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class DeclarativeEarTest extends AbstractArtifactTest
+{
+
+ private Configuration configuration;
+
+ @BeforeClass
+ public void beforeClass()
+ {
+ configuration = new MockConfiguration();
+ configuration.setStandalone(true);
+ }
+
+ @Test
+ public void testDeclarativeEar() throws Exception
+ {
+ TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyTest.class);
+ assert artifact instanceof EarArtifactDescriptor;
+ EarArtifactDescriptor earArtifact = (EarArtifactDescriptor) artifact;
+ assert artifact.getExplodedJar().list().length == 4;
+ File currentPackage = getCurrentPackageAsFile(earArtifact.getEjbJar().getExplodedJar());
+ assert new File(currentPackage, "Cow.class").isFile();
+ assert new File(currentPackage, "DummyTest.class").isFile();
+ assert new File(currentPackage, "Fox.class").isFile();
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DeclarativeEarTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DummyTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DummyTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DummyTest.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.test.impl.packaging.declarative.ear;
+
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.IntegrationTest;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+
+
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+class DummyTest
+{
+
+ public void test()
+ {
+ assert true;
+ }
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/DummyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Fox.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Fox.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Fox.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.test.impl.packaging.declarative.ear;
+
+class Fox
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ear/Fox.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.test.impl.packaging.descriptors.ear;
+
+class Cow
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/DummyTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/DummyTest.java (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/DummyTest.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.test.impl.packaging.descriptors.ear;
+
+public class DummyTest
+{
+
+}
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/DummyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java 2009-02-16 22:19:44 UTC (rev 1552)
@@ -0,0 +1,148 @@
+package org.jboss.jsr299.tck.test.impl.packaging.descriptors.ear;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor;
+import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest;
+import org.testng.annotations.Test;
+
+public class EarArtifactTest extends AbstractArtifactTest
+{
+ @Test
+ public void testDefaultEar() throws Exception
+ {
+ EarArtifactDescriptor ear = new EarArtifactDescriptor(DummyTest.class, null);
+ ear.getClasses().add(Cow.class);
+ File root = ear.getExplodedJar();
+ assert root.isDirectory();
+ assert root.listFiles().length == 4;
+
+ File warRoot = ear.getWar().getExplodedJar();
+ assert warRoot.listFiles().length == 1;
+ assert warRoot.isDirectory();
+ assert warRoot.listFiles(WEB_INF_FILTER).length == 1;
+ File webInf = warRoot.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;
+ assert !new File(webInf, "web-beans.xml").exists();
+
+ File webInfLib = new File(webInf, "lib");
+ assert !webInfLib.exists();
+
+ File webInfClasses = new File(webInf, "classes");
+ assert !webInfClasses.exists();
+
+ File ejbJar = new File(root, DummyTest.class.getName() + ".jar");
+ assert ejbJar.exists();
+ assert ejbJar.length() > 0;
+
+ File war = new File(root, DummyTest.class.getName() + ".war");
+ assert war.exists();
+ assert war.length() > 0;
+
+ File lib = new File(root, "lib");
+ assert lib.isDirectory();
+ assert lib.list().length == 3;
+ List<String> libs = Arrays.asList(lib.list());
+ assert libs.contains("jsr-299-tck-api.jar");
+ assert libs.contains("testng.jar");
+ assert libs.contains("tck-support.jar");
+
+ File metaInf = new File(root, "META-INF");
+ assert metaInf.isDirectory();
+ assert metaInf.list().length == 3;
+ 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 ejbJarRoot = ear.getEjbJar().getExplodedJar();
+
+ File ejbJarXml = new File(ejbJarRoot, "META-INF/ejb-jar.xml");
+ assert ejbJarXml.isFile();
+ assert ejbJarXml.length() > 0;
+
+ File currentPackage = getCurrentPackageAsFile(ejbJarRoot);
+ 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();
+ File tckPackage = getPackageAsFile(AbstractDeclarativeTest.class.getPackage(), ejbJarRoot);
+ File[] abstractTestClasses = tckPackage.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.equals("AbstractTest.class");
+ }
+
+ });
+
+
+ }
+
+ @Test
+ public void testJarProduction() throws Exception
+ {
+ EarArtifactDescriptor ear = new EarArtifactDescriptor(DummyTest.class, null);
+ ear.getClasses().add(Cow.class);
+ JarInputStream is = new JarInputStream(ear.getJarAsStream());
+ JarEntry entry;
+ List<String> fileNames = new ArrayList<String>();
+ while ((entry = is.getNextJarEntry()) != null)
+ {
+ fileNames.add(entry.getName().replace(File.separator, "/"));
+ }
+ 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");
+ assert fileNames.contains(DummyTest.class.getName() + ".war");
+
+
+ File ejbJar = new File(ear.getExplodedJar(), DummyTest.class.getName() + ".jar");
+ assert ejbJar.exists();
+ assert ejbJar.isFile();
+ assert ejbJar.length() > 0;
+ is = new JarInputStream(new FileInputStream(ejbJar));
+ fileNames = new ArrayList<String>();
+ while ((entry = is.getNextJarEntry()) != null)
+ {
+ fileNames.add(entry.getName().replace(File.separator, "/"));
+ }
+ is.close();
+ assert fileNames.contains("META-INF/ejb-jar.xml");
+ assert fileNames.contains("org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/Cow.class");
+ }
+
+}
+
Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/ear/EarArtifactTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1551 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 17:17:19 -0500 (Mon, 16 Feb 2009)
New Revision: 1551
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
Log:
Increase the default JBoss boot timeout
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-16 21:40:32 UTC (rev 1550)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-16 22:17:19 UTC (rev 1551)
@@ -125,7 +125,7 @@
{
log.info("Using JBoss instance in " + jbossHome + " at URL " + configuration.getHost());
}
- this.bootTimeout = Long.getLong(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 120000);
+ this.bootTimeout = Long.getLong(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 240000);
if (Boolean.getBoolean(FORCE_RESTART_PROPERTY_NAME))
{
if (isJBossUp())
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1550 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/initializer and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-16 16:40:32 -0500 (Mon, 16 Feb 2009)
New Revision: 1550
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Few more tests and id's assigned.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-02-16 19:57:40 UTC (rev 1549)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-02-16 21:40:32 UTC (rev 1550)
@@ -3,6 +3,7 @@
import javax.context.RequestScoped;
import javax.ejb.Remove;
import javax.ejb.Stateful;
+import javax.event.Observes;
import javax.inject.Disposes;
@Stateful
@@ -13,5 +14,9 @@
public void bye(@Disposes Object something) {
}
-
+
+ public void anObserverMethod(@Observes String event)
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-16 19:57:40 UTC (rev 1549)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-16 21:40:32 UTC (rev 1550)
@@ -104,8 +104,10 @@
* @Standard, � @New as the only binding annotation, � no Web Bean name, � no
* stereotypes, and such that � the implementation class is the
* declared type of the injection point.
+ *
+ * TODO It is difficult to prove if a bean has any stereotypes
*/
- @Test(groups = { "stub", "new" })
+ @Test(groups = { "stub", "new", "underInvestigation" })
@SpecAssertion(section = "3.3.6", id = "unknown")
public void testNewBeanHasNoStereotypes()
{
@@ -120,7 +122,7 @@
* Section 3.3.2, �Which EJBs are enterprise Web Beans?�, then the Web Bean
* is an enterprise Web Bean.
*/
- @Test(groups = { "new", "stub" })
+ @Test(groups = { "new", "stub", "ejb3" })
@SpecAssertion(section = "3.3.6", id = "unknown")
public void testNewBeanIsEnterpriseWebBeanIfParameterTypeIsEnterpriseWebBean()
{
@@ -138,12 +140,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new", "stub" })
- @SpecAssertion(section = "3.3.6", id = "unknown")
- public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
- {
- assert false;
- }
+// @Test(groups = { "new", "stub" })
+// public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
+// {
+// assert false;
+// }
/**
* Furthermore, this Web Bean: � has the same Web Bean constructor,
@@ -156,12 +157,11 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new", "stub" })
- @SpecAssertion(section = "3.3.6", id = "unknown")
- public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
- {
- assert false;
- }
+// @Test(groups = { "new", "stub" })
+// public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
+// {
+// assert false;
+// }
/**
* Furthermore, this Web Bean: � has the same Web Bean constructor,
@@ -174,11 +174,13 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = {"new", "stub" })
- @SpecAssertion(section = "3.3.6", id = "unknown")
+ @Test(groups = {"new" })
+ @SpecAssertion(section = "3.3.6", id = "i")
public void testNewBeanHasNoObservers()
{
- assert false;
+ deployBeans(GoldenRetriever.class);
+ // Should just be 1 observer from bean, not new bean
+ assert getCurrentManager().resolveObservers("event").size() == 1;
}
/**
@@ -191,9 +193,11 @@
* defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
+ *
+ * TODO There is no way to prove that a new bean has no producer fields
*/
- @Test(groups = { "new", "stub" })
- @SpecAssertion(section = "3.3.6", id = "unknown")
+ @Test(groups = { "new", "stub", "underInvestigation" })
+ @SpecAssertion(section = "3.3.6", id = "k")
public void testNewBeanHasNoProducerFields()
{
assert false;
@@ -209,8 +213,10 @@
* defined using annotations�that is, it has all the interceptor binding
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
+ *
+ * TODO There really is no way to prove that a @New bean has no producers
*/
- @Test(groups = { "new", "stub" })
+ @Test(groups = { "new", "stub", "underInvestigation" })
@SpecAssertion(section = "3.3.6", id = "unknown")
public void testNewBeanHasNoProducerMethods()
{
@@ -228,7 +234,7 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "new", "stub" })
+ @Test(groups = { "new", "stub", "disposal" })
@SpecAssertion(section = "3.3.6", id = "unknown")
public void testNewBeanHasNoDisposalMethods()
{
@@ -246,7 +252,7 @@
* types declared by annotations that appear on the implementation class, and
* � has no decorators.
*/
- @Test(groups = { "stub", "new" })
+ @Test(groups = { "stub", "new", "interceptors" })
@SpecAssertion(section = "3.3.6", id = "unknown")
public void testNewBeanHasSameInterceptorMethodsAsWrappedBean()
{
@@ -357,21 +363,22 @@
* enterprise Web Bean implementation class, a DefinitionException is thrown
* by the container at deployment time.
*/
- @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.3.6", id = "unknown")
- public void testNewAnnotationCannotBeAppliedToNonWebBeanImplementationClass()
- {
- assert false;
- }
+// @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
+// public void testNewAnnotationCannotBeAppliedToNonWebBeanImplementationClass()
+// {
+// assert false;
+// }
/**
* No Web Bean defined using annotations or XML may explicitly declare @New
* as a binding type
*/
- @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "stub", "new", "webbeansxml" }, expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.3.6", id = "unknown")
public void testNewAnnotationCannotBeExplicitlyDeclared()
{
+ // This only needs to be tested with XML since the annotation itself
+ // does not target types.
assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-16 19:57:40 UTC (rev 1549)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-16 21:40:32 UTC (rev 1550)
@@ -17,35 +17,35 @@
{
@Test(expectedExceptions = DefinitionException.class, groups = "initializerMethod")
- @SpecAssertion(section = "3.8", id = "unknown")
+ @SpecAssertion(section = "3.9", id = "a")
public void testStaticInitializerMethodNotAllowed()
{
createSimpleBean(Dottrel.class);
}
- @Test(groups = { "stub", "initializerMethod", "servlet" })
- @SpecAssertion(section = "3.9", id = "unknown")
+ @Test(groups = { "stub", "initializerMethod", "servlet", "integration" })
+ @SpecAssertion(section = "3.9", id = "d")
public void testInitializerMethodCalledOnServlet()
{
assert false;
}
@Test(groups = { "stub", "initializerMethod", "ejb3", "integration" })
- @SpecAssertion(section = "3.9", id = "unknown")
+ @SpecAssertion(section = "3.9", id = "d")
public void testInitializerMethodCalledOnEJBSessionBean()
{
assert false;
}
- @Test(groups = { "stub", "initializerMethod", "ejb3" })
- @SpecAssertion(section = "3.9", id = "unknown")
+ @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" })
+ @SpecAssertion(section = "3.9", id = "d")
public void testInitializerMethodCalledOnEJBMDB()
{
assert false;
}
- @Test(groups = { "stub", "initializerMethod", "ejb3", "singletons" })
- @SpecAssertion(section = "3.9", id = "unknown")
+ @Test(groups = { "stub", "initializerMethod", "ejb3", "singletons", "integration" })
+ @SpecAssertion(section = "3.9", id = "d")
public void testInitializerMethodCalledOnEJBSingleton()
{
assert false;
@@ -55,7 +55,7 @@
* If the bean is a session bean, the initializer method is not required to
* be a business method of the session bean
*/
- @Test(groups = { "stub", "initializerMethod", "ejb3" })
+ @Test(groups = { "initializerMethod", "ejb3" })
@SpecAssertion(section = "3.9", id = "c")
public void testInitializerMethodNotABusinessMethod()
{
@@ -63,14 +63,16 @@
}
@Test(groups = { "stub", "initializerMethod", "interceptors" })
- @SpecAssertion(section = "3.9", id = "unknown")
+ @SpecAssertion(section = "3.9", id = "f")
public void testMethodInterceptorNotCalledOnInitializerMethod()
{
assert false;
}
@Test(groups = { "initializerMethod" })
- @SpecAssertions( { @SpecAssertion(section = "3.9", id = "unknown"), @SpecAssertion(section = "5.3", id = "unknown"), @SpecAssertion(section = "3.9.2", id = "unknown"), @SpecAssertion(section = "3.9.3", id = "unknown") })
+ @SpecAssertions( {
+ @SpecAssertion(section = "3.9", id = "g"),
+ @SpecAssertion(section = "5.3", id = "b") })
public void testMultipleInitializerMethodsAreCalled()
{
getCurrentManager().addBean(createSimpleBean(Fox.class));
@@ -83,42 +85,42 @@
}
@Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class)
- @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "unknown"), @SpecAssertion(section = "3.4.2", id = "unknown") })
+ @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "b"), @SpecAssertion(section = "3.4.2", id = "c") })
public void testInitializerMethodAnnotatedProduces()
{
createSimpleBean(Pheasant.class);
}
@Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.9.1", id = "unknown")
+ @SpecAssertion(section = "3.9.1", id = "c")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
createSimpleBean(Capercaillie.class);
}
@Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.9.1", id = "unknown")
+ @SpecAssertion(section = "3.9.1", id = "d")
public void testInitializerMethodHasParameterAnnotatedObserves()
{
createSimpleBean(Grouse.class);
}
@Test(groups = { "stub", "initializerMethod", "webbeansxml" })
- @SpecAssertion(section = "3.9.2", id = "unknown")
+ @SpecAssertion(section = "3.9.2", id = "a")
public void testInitializerMethodDeclaredInXml()
{
assert false;
}
@Test(groups = { "stub", "initializerMethod", "webbeansxml" })
- @SpecAssertion(section = "3.9.2", id = "unknown")
+ @SpecAssertion(section = "3.9.2", id = "b")
public void testInitializerMethodDeclaredInXmlIgnoresBindingAnnotationsInJava()
{
assert false;
}
@Test(groups = { "stub", "initializerMethod", "webbeansxml" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.9.2", id = "unknown")
+ @SpecAssertion(section = "3.9.2", id = "c")
public void testInitializerMethodDeclaredInXmlDoesNotExist()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-16 19:57:40 UTC (rev 1549)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-16 21:40:32 UTC (rev 1550)
@@ -842,8 +842,23 @@
<assertion id="i">
<text>Every EJB that satisfies the requirements of Section 3.3.2, "Which EJBs are beans?" is a bean, with scope, deployment type and bindings defined using annotations.
-Additionally, for each such session bean, a second bean exists which has no observer methods, producer methods or fields or disposal methods</text>
+Additionally, for each such session bean, a second bean exists which has no observer methods</text>
</assertion>
+
+ <assertion id="j">
+ <text>Every EJB that satisfies the requirements of Section 3.3.2, "Which EJBs are beans?" is a bean, with scope, deployment type and bindings defined using annotations.
+Additionally, for each such session bean, a second bean exists which has no producer methods</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>Every EJB that satisfies the requirements of Section 3.3.2, "Which EJBs are beans?" is a bean, with scope, deployment type and bindings defined using annotations.
+Additionally, for each such session bean, a second bean exists which has no producer fields</text>
+ </assertion>
+
+ <assertion id="l">
+ <text>Every EJB that satisfies the requirements of Section 3.3.2, "Which EJBs are beans?" is a bean, with scope, deployment type and bindings defined using annotations.
+Additionally, for each such session bean, a second bean exists which has no disposal methods</text>
+ </assertion>
</section>
<section id="3.3.7" title="Specializing a session bean">
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1549 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 14:57:40 -0500 (Mon, 16 Feb 2009)
New Revision: 1549
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
Log:
fixes for windows
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-16 19:49:10 UTC (rev 1548)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-16 19:57:40 UTC (rev 1549)
@@ -216,7 +216,7 @@
String command[] = {
"sh",
"-c",
- "cd " + jbossHome + "/bin; JAVA_OPTS=" + JAVA_OPTS + " ./" + scriptFileName + ".sh " + params
+ "cd /D " + jbossHome + "/bin;set JAVA_OPTS=" + JAVA_OPTS + " ./" + scriptFileName + ".sh " + params
};
p = runtime.exec(command);
}
@@ -232,7 +232,7 @@
{
try
{
- DataOutputStream out = new DataOutputStream(new FileOutputStream("/tmp/jboss.log"));
+ DataOutputStream out = new DataOutputStream(new FileOutputStream(System.getProperty("java.io.tmpdir") + "jboss.log"));
int c;
while((c = is.read()) != -1)
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1548 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 14:49:10 -0500 (Mon, 16 Feb 2009)
New Revision: 1548
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
Log:
Slightly safer java_opts
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-16 19:39:54 UTC (rev 1547)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-16 19:49:10 UTC (rev 1548)
@@ -25,9 +25,10 @@
public abstract class AbstractContainersImpl implements Configurable, Containers
{
- public static String JAVA_OPTS = "\"-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -ea\"";
+ public static String JAVA_OPTS = "-ea";
public static final String JBOSS_HOME_PROPERTY_NAME = "jboss.home";
+ public static final String JAVA_OPTS_PROPERTY_NAME = "java.opts";
public static final String JBOSS_AS_DIR_PROPERTY_NAME = "jboss-as.dir";
public static final String JBOSS_BOOT_TIMEOUT_PROPERTY_NAME = "jboss.boot.timeout";
public static final String FORCE_RESTART_PROPERTY_NAME = "jboss.force.restart";
@@ -39,6 +40,7 @@
private String jbossHttpUrl;
private boolean jbossWasStarted;
private long bootTimeout;
+ private String javaOpts;
protected static void copy(InputStream inputStream, File file) throws IOException
{
@@ -109,6 +111,12 @@
}
}
jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
+ javaOpts = System.getProperty(JAVA_OPTS_PROPERTY_NAME);
+ if (javaOpts == null)
+ {
+ javaOpts = "";
+ }
+ javaOpts = "\"" + javaOpts + JAVA_OPTS + "\"";
if (jbossHome == null)
{
throw new IllegalArgumentException("-D" + JBOSS_HOME_PROPERTY_NAME + " must be set");
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1547 - tck/trunk/impl and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 14:39:54 -0500 (Mon, 16 Feb 2009)
New Revision: 1547
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
tck/trunk/impl/pom.xml
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
Log:
Fixes for windows
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-02-16 19:03:19 UTC (rev 1546)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-02-16 19:39:54 UTC (rev 1547)
@@ -42,7 +42,14 @@
public void setup() throws IOException
{
super.setup();
-
+ try
+ {
+ initDeploymentManager();
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e);
+ }
}
public void deploy(InputStream archiveStream, String name) throws DeploymentException, IOException
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-02-16 19:03:19 UTC (rev 1546)
+++ tck/trunk/impl/pom.xml 2009-02-16 19:39:54 UTC (rev 1547)
@@ -233,10 +233,10 @@
<tasks>
<java classname="org.jboss.jsr299.tck.api.TCK" classpathref="maven.compile.classpath" failonerror="true" fork="true">
<jvmarg line="-DdumpArtifacts=true"/>
- <jvmarg line="-Dorg.jboss.jsr299.tck.outputDirectory=${project.build.directory}/jsr299-artifacts" />
+ <jvmarg line="-Dorg.jboss.jsr299.tck.outputDirectory=target/jsr299-artifacts" />
<jvmarg line="-Dorg.jboss.jsr299.tck.libraryDirectory=${libraryDirectory}" />
</java>
- <echo>Dumped artifacts to ${project.build.directory}/jsr299-artifacts</echo>
+ <echo>Dumped artifacts to ${basedir}/target/jsr299-artifacts</echo>
</tasks>
</configuration>
<goals>
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 19:03:19 UTC (rev 1546)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 19:39:54 UTC (rev 1547)
@@ -21,6 +21,7 @@
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
+import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
@@ -31,6 +32,8 @@
import org.apache.log4j.Logger;
import org.jboss.jsr299.tck.impl.util.Files;
+import com.sun.java_cup.internal.runtime.Scanner;
+
public class ArtifactDescriptor
{
@@ -173,7 +176,11 @@
public InputStream jar() throws IOException
{
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- JarOutputStream jarOutputStream = new JarOutputStream(byteArrayOutputStream, new Manifest());
+ Manifest manifest = new Manifest();
+ Attributes attributes = manifest.getMainAttributes();
+ attributes.putValue("Created-By", "JSR-299 TCK Harness");
+ attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ JarOutputStream jarOutputStream = new JarOutputStream(byteArrayOutputStream, manifest);
jar(root, jarOutputStream);
jarOutputStream.close();
return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
@@ -192,7 +199,7 @@
else
{
FileInputStream fis = new FileInputStream(child);
- JarEntry jarEntry = new JarEntry(child.getPath().substring(root.getPath().length() + 1));
+ JarEntry jarEntry = new JarEntry(child.getPath().substring(root.getPath().length() + 1).replaceAll("\\" + File.separator, "/"));
jarOutputStream.putNextEntry(jarEntry);
Files.copy(fis, jarOutputStream);
fis.close();
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1546 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 14:03:19 -0500 (Mon, 16 Feb 2009)
New Revision: 1546
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
Log:
use jar streams
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 19:02:24 UTC (rev 1545)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 19:03:19 UTC (rev 1546)
@@ -21,10 +21,12 @@
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
import org.apache.log4j.Logger;
import org.jboss.jsr299.tck.impl.util.Files;
@@ -158,26 +160,26 @@
}
- private static class Zipper
+ private static class JarCreator
{
private final File root;
- public Zipper(File root)
+ public JarCreator(File root)
{
this.root = root;
}
- public InputStream zip() throws IOException
+ public InputStream jar() throws IOException
{
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream);
- zip(root, zipOutputStream);
- zipOutputStream.close();
+ JarOutputStream jarOutputStream = new JarOutputStream(byteArrayOutputStream, new Manifest());
+ jar(root, jarOutputStream);
+ jarOutputStream.close();
return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
}
- private void zip(File directory, ZipOutputStream zipOutputStream) throws IOException
+ private void jar(File directory, JarOutputStream jarOutputStream) throws IOException
{
File[] children = directory.listFiles();
//loop through dirList, and zip the files
@@ -185,14 +187,14 @@
{
if (child.isDirectory())
{
- zip(child, zipOutputStream);
+ jar(child, jarOutputStream);
}
else
{
FileInputStream fis = new FileInputStream(child);
- ZipEntry zipEntry = new ZipEntry(child.getPath().substring(root.getPath().length() + 1));
- zipOutputStream.putNextEntry(zipEntry);
- Files.copy(fis, zipOutputStream);
+ JarEntry jarEntry = new JarEntry(child.getPath().substring(root.getPath().length() + 1));
+ jarOutputStream.putNextEntry(jarEntry);
+ Files.copy(fis, jarOutputStream);
fis.close();
}
}
@@ -226,7 +228,7 @@
{
if (jar == null)
{
- jar = new Zipper(getExplodedJar()).zip();
+ jar = new JarCreator(getExplodedJar()).jar();
}
return jar;
}
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1545 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: servlet and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-02-16 14:02:24 -0500 (Mon, 16 Feb 2009)
New Revision: 1545
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
Log:
Better session for conversation destruction
Re-scheduling old conversation for destruction after beginning new
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-02-16 18:24:24 UTC (rev 1544)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-02-16 19:02:24 UTC (rev 1545)
@@ -95,7 +95,7 @@
*/
public void destroy(HttpSession session)
{
- log.trace("Destroying conversation " + cid);
+ log.debug("Destroying conversation " + cid);
if (!terminationHandle.isCancelled())
{
cancelTermination();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-02-16 18:24:24 UTC (rev 1544)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-02-16 19:02:24 UTC (rev 1545)
@@ -31,18 +31,20 @@
* The current conversation implementation
*
* @author Nicklas Karlsson
- * @see javax.context.Conversation
+ * @see javax.context.Conversation
*/
@RequestScoped
@Named("conversation")
@WebBean
public class ConversationImpl implements Conversation
{
-
+
private static LogProvider log = Logging.getLogProvider(ConversationImpl.class);
// The conversation ID
private String cid;
+ // The original conversation ID (if any)
+ private String originalCid;
// Is the conversation long-running?
private boolean longRunning;
// The inactivity timeout in milliseconds
@@ -54,9 +56,9 @@
public ConversationImpl()
{
}
-
+
/**
- * Initializes a new conversation
+ * Initializes a new conversation
*
* @param conversationIdGenerator The conversation ID generator
* @param timeoutInMilliseconds The inactivity timeout in milliseconds
@@ -77,6 +79,10 @@
public void begin(String id)
{
+ if (originalCid == null)
+ {
+ originalCid = cid;
+ }
cid = id;
begin();
}
@@ -113,7 +119,7 @@
*
* @param cid The new conversation ID
* @param longRunning The new long-running status
- * @param timeout The new inactivity timeout in milliseconds
+ * @param timeout The new inactivity timeout in milliseconds
*/
public void switchTo(String cid, boolean longRunning, long timeoutInMilliseconds)
{
@@ -135,4 +141,9 @@
log.debug("Set conversation " + cid + " to long-running: " + longRunning);
this.longRunning = longRunning;
}
+
+ public String getOriginalCid()
+ {
+ return originalCid;
+ }
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-16 18:24:24 UTC (rev 1544)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-16 19:02:24 UTC (rev 1545)
@@ -22,11 +22,11 @@
import java.util.concurrent.Future;
import javax.context.SessionScoped;
-import javax.faces.context.FacesContext;
import javax.inject.Current;
import javax.inject.Produces;
import javax.servlet.http.HttpSession;
+import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.WebBean;
import org.jboss.webbeans.context.ConversationContext;
import org.jboss.webbeans.conversation.bindings.ConversationConcurrentAccessTimeout;
@@ -34,6 +34,7 @@
import org.jboss.webbeans.conversation.bindings.ConversationInactivityTimeout;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.servlet.HttpSessionManager;
/**
* The default conversation manager
@@ -59,10 +60,6 @@
@Current
private ConversationImpl currentConversation;
- // The current HTTP session
- @Current
- private HttpSession session;
-
// The conversation timeout in milliseconds waiting for access to a blocked
// conversation
@ConversationConcurrentAccessTimeout
@@ -160,7 +157,8 @@
}
}
- // TODO: check that stuff gets terminated when you flip between several long-running conversations
+ // TODO: check that stuff gets terminated when you flip between several
+ // long-running conversations
public void cleanupConversation()
{
String cid = currentConversation.getId();
@@ -199,6 +197,15 @@
}
ConversationContext.INSTANCE.destroy();
}
+ // If Conversation.begin(String) is called, it might be that the
+ // conversation will be switched. We need to unlock this original
+ // conversation and re-schedule it for termination
+ String originalCid = currentConversation.getOriginalCid();
+ if (originalCid != null && longRunningConversations.containsKey(originalCid))
+ {
+ longRunningConversations.get(originalCid).unlock();
+ longRunningConversations.get(originalCid).reScheduleTermination(scheduleForTermination(originalCid));
+ }
}
/**
@@ -209,7 +216,8 @@
*/
private Future<?> scheduleForTermination(String cid)
{
- Runnable terminationTask = new TerminationTask(cid, (HttpSession) FacesContext.getCurrentInstance().getExternalContext().getSession(true));
+ HttpSession session = CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).getSession();
+ Runnable terminationTask = new TerminationTask(cid, session);
return conversationTerminator.scheduleForTermination(terminationTask, inactivityTimeout);
}
@@ -249,6 +257,7 @@
public void destroyAllConversations()
{
+ HttpSession session = CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).getSession();
log.debug("Destroying " + longRunningConversations.size() + " long-running conversations in session " + session.getId());
for (ConversationEntry conversationEntry : longRunningConversations.values())
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-02-16 18:24:24 UTC (rev 1544)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java 2009-02-16 19:02:24 UTC (rev 1545)
@@ -20,7 +20,7 @@
@Produces
@RequestScoped
@WebBean
- HttpSession produceSession()
+ public HttpSession getSession()
{
return session;
}
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1544 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging: war and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-16 13:24:24 -0500 (Mon, 16 Feb 2009)
New Revision: 1544
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
Log:
Make sure all temp files are deleted
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 17:59:43 UTC (rev 1543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 18:24:24 UTC (rev 1544)
@@ -212,6 +212,7 @@
private File explodedJar;
private File classesRoot;
+ private File librariesRoot;
public ArtifactDescriptor(Class<?> declaringClass)
{
@@ -402,9 +403,7 @@
{
if (classesRoot == null)
{
- classesRoot = new File(archiveRoot, getClassesRoot());
- classesRoot.mkdirs();
- classesRoot.deleteOnExit();
+ classesRoot = makeDirectoryStructure(archiveRoot, getClassesRoot());
}
return classesRoot;
}
@@ -437,9 +436,18 @@
public File getLibraryRoot(File archiveRoot)
{
- return archiveRoot;
+ if (librariesRoot == null)
+ {
+ librariesRoot = makeDirectoryStructure(archiveRoot, getLibrariesRoot());
+ }
+ return librariesRoot;
}
+ protected String getLibrariesRoot()
+ {
+ return "/";
+ }
+
public boolean isLibrariesSupported()
{
return false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16 17:59:43 UTC (rev 1543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16 18:24:24 UTC (rev 1544)
@@ -53,18 +53,9 @@
}
@Override
- public File getLibraryRoot(File archiveRoot)
+ protected String getLibrariesRoot()
{
- if (webInfLib == null)
- {
- File webInf = new File(archiveRoot, "WEB-INF");
- webInf.mkdir();
- webInf.deleteOnExit();
- webInfLib = new File(webInf, "lib");
- webInfLib.deleteOnExit();
- webInfLib.mkdirs();
- }
- return webInfLib;
+ return "WEB-INF/lib";
}
@Override
17 years, 1 month
- 1
- 0