[jboss-svn-commits] JBoss Common SVN: r4296 - in arquillian/trunk: containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 21 09:59:13 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-04-21 09:59:11 -0400 (Wed, 21 Apr 2010)
New Revision: 4296
Modified:
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEConfiguration.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java
arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/SecurityActions.java
arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/CDIInjectionEnricher.java
arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/SecurityActions.java
arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java
arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/SecurityActions.java
arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java
arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/SecurityActions.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/Arquillian.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java
Log:
ARQ-101
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEConfiguration.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEConfiguration.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEConfiguration.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -28,10 +28,6 @@
public class WeldSEConfiguration implements ContainerConfiguration
{
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.ContainerConfiguration#getContainerProfile()
- */
- @Override
public ContainerProfile getContainerProfile()
{
return ContainerProfile.STANDALONE;
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSEContainer.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -51,35 +51,19 @@
private WeldSEConfiguration configuration;
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
- */
- @Override
public void setup(Configuration configuration)
{
this.configuration = configuration.getContainerConfig(WeldSEConfiguration.class);
}
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.DeployableContainer#start()
- */
- @Override
public void start() throws LifecycleException
{
}
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.DeployableContainer#stop()
- */
- @Override
public void stop() throws LifecycleException
{
}
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.DeployableContainer#deploy(org.jboss.shrinkwrap.api.Archive)
- */
- @Override
public ContainerMethodExecutor deploy(final Archive<?> archive)
throws DeploymentException
{
@@ -87,19 +71,16 @@
Deployment deployment = new Deployment()
{
- @Override
public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
{
return Arrays.asList(beanArchive);
}
- @Override
public ServiceRegistry getServices()
{
return beanArchive.getServices();
}
- @Override
public BeanDeploymentArchive loadBeanDeploymentArchive(
Class<?> beanClass)
{
@@ -146,10 +127,6 @@
};
}
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.DeployableContainer#undeploy(org.jboss.shrinkwrap.api.Archive)
- */
- @Override
public void undeploy(Archive<?> archive) throws DeploymentException
{
WeldHolder holder = WELD_MANAGER.get();
Modified: arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/containers/weld-embedded/src/main/java/org/jboss/arquillian/weld/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -65,7 +65,6 @@
return archive;
}
- @Override
public Collection<URL> getBeansXml()
{
List<URL> beanClasses = new ArrayList<URL>();
@@ -77,6 +76,7 @@
beanClasses.add(
new URL(null, "archive://" + entry.getKey().get(), new URLStreamHandler()
{
+ @Override
protected java.net.URLConnection openConnection(URL u) throws java.io.IOException
{
return new URLConnection(u)
@@ -101,7 +101,6 @@
return beanClasses;
}
- @Override
public Collection<Class<?>> getBeanClasses()
{
List<Class<?>> beanClasses = new ArrayList<Class<?>>();
@@ -119,25 +118,21 @@
return beanClasses;
}
- @Override
public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
{
return Collections.emptySet();
}
- @Override
public Collection<EjbDescriptor<?>> getEjbs()
{
return Collections.emptySet();
}
- @Override
public String getId()
{
return archive.getName();
}
- @Override
public ServiceRegistry getServices()
{
return serviceRegistry;
Modified: arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/SecurityActions.java
===================================================================
--- arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/SecurityActions.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/spi/src/main/java/org/jboss/arquillian/spi/util/SecurityActions.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -72,7 +72,6 @@
{
return AccessController.doPrivileged(new PrivilegedExceptionAction<Constructor<?>>()
{
- @Override
public Constructor<?> run() throws NoSuchMethodException
{
return clazz.getConstructor(argumentTypes);
@@ -169,7 +168,6 @@
private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
INSTANCE;
- @Override
public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
Modified: arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/CDIInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/CDIInjectionEnricher.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/CDIInjectionEnricher.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -35,7 +35,6 @@
private static final String JNDI_BEAN_MANAGER_JBOSS = "java:app/BeanManager";
private static final String ANNOTATION_NAME = "javax.inject.Inject";
- @Override
public void enrich(Object testCase)
{
if(SecurityActions.isClassPresent(ANNOTATION_NAME))
Modified: arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/SecurityActions.java
===================================================================
--- arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/SecurityActions.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testenrichers/cdi/src/main/java/org/jboss/arquillian/testenricher/cdi/SecurityActions.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -76,7 +76,6 @@
{
return AccessController.doPrivileged(new PrivilegedExceptionAction<Constructor<?>>()
{
- @Override
public Constructor<?> run() throws NoSuchMethodException
{
return clazz.getConstructor(argumentTypes);
@@ -181,7 +180,6 @@
{
List<Field> declaredAccessableFields = AccessController.doPrivileged(new PrivilegedAction<List<Field>>()
{
- @Override
public List<Field> run()
{
List<Field> foundFields = new ArrayList<Field>();
@@ -212,7 +210,6 @@
private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
INSTANCE;
- @Override
public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
Modified: arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/EJBInjectionEnricher.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -38,7 +38,6 @@
private static final String ANNOTATION_FIELD_BEAN_INTERFACE = "beanInterface";
private static final String ANNOTATION_FIELD_MAPPED_NAME = "mappedName";
- @Override
public void enrich(Object testCase)
{
if(SecurityActions.isClassPresent(ANNOTATION_NAME))
Modified: arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/SecurityActions.java
===================================================================
--- arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/SecurityActions.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testenrichers/ejb/src/main/java/org/jboss/arquillian/testenricher/ejb/SecurityActions.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -76,7 +76,6 @@
{
return AccessController.doPrivileged(new PrivilegedExceptionAction<Constructor<?>>()
{
- @Override
public Constructor<?> run() throws NoSuchMethodException
{
return clazz.getConstructor(argumentTypes);
@@ -181,7 +180,6 @@
{
List<Field> declaredAccessableFields = AccessController.doPrivileged(new PrivilegedAction<List<Field>>()
{
- @Override
public List<Field> run()
{
List<Field> foundFields = new ArrayList<Field>();
@@ -212,7 +210,6 @@
private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
INSTANCE;
- @Override
public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
Modified: arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java
===================================================================
--- arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/ResourceInjectionEnricher.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -36,7 +36,6 @@
private static final String RESOURCE_LOOKUP_PREFIX = "java:/comp/env";
private static final String ANNOTATION_NAME = "javax.annotation.Resource";
- @Override
public void enrich(Object testCase)
{
if(SecurityActions.isClassPresent(ANNOTATION_NAME))
Modified: arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/SecurityActions.java
===================================================================
--- arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/SecurityActions.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testenrichers/resource/src/main/java/org/jboss/arquillian/testenricher/resource/SecurityActions.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -76,7 +76,6 @@
{
return AccessController.doPrivileged(new PrivilegedExceptionAction<Constructor<?>>()
{
- @Override
public Constructor<?> run() throws NoSuchMethodException
{
return clazz.getConstructor(argumentTypes);
@@ -181,7 +180,6 @@
{
List<Field> declaredAccessableFields = AccessController.doPrivileged(new PrivilegedAction<List<Field>>()
{
- @Override
public List<Field> run()
{
List<Field> foundFields = new ArrayList<Field>();
@@ -212,7 +210,6 @@
private enum GetTcclAction implements PrivilegedAction<ClassLoader> {
INSTANCE;
- @Override
public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/Arquillian.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/Arquillian.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/Arquillian.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -96,19 +96,16 @@
{
result = deployableTest.get().test(new TestMethodExecutor()
{
- @Override
public void invoke() throws Throwable
{
callback.runTestMethod(testResult);
}
- @Override
public Method getMethod()
{
return testResult.getMethod().getMethod();
}
- @Override
public Object getInstance()
{
return Arquillian.this;
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestListener.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -34,59 +34,31 @@
private ITestContext context;
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onFinish(org.testng.ITestContext)
- */
- @Override
public void onFinish(ITestContext paramITestContext)
{
context = paramITestContext;
}
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onStart(org.testng.ITestContext)
- */
- @Override
public void onStart(ITestContext paramITestContext)
{
}
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onTestFailedButWithinSuccessPercentage(org.testng.ITestResult)
- */
- @Override
public void onTestFailedButWithinSuccessPercentage(ITestResult paramITestResult)
{
}
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onTestFailure(org.testng.ITestResult)
- */
- @Override
public void onTestFailure(ITestResult paramITestResult)
{
}
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onTestSkipped(org.testng.ITestResult)
- */
- @Override
public void onTestSkipped(ITestResult paramITestResult)
{
}
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onTestStart(org.testng.ITestResult)
- */
- @Override
public void onTestStart(ITestResult paramITestResult)
{
}
- /* (non-Javadoc)
- * @see org.testng.ITestListener#onTestSuccess(org.testng.ITestResult)
- */
- @Override
public void onTestSuccess(ITestResult paramITestResult)
{
}
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -43,10 +43,7 @@
*/
public class TestNGDeploymentAppender implements AuxiliaryArchiveAppender
{
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.DeploymentAppender#createArchive()
- */
- @Override
+
public Archive<?> createAuxiliaryArchive()
{
return Archives.create("arquillian-testng.jar", JavaArchive.class)
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java 2010-04-21 13:55:25 UTC (rev 4295)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGTestRunner.java 2010-04-21 13:59:11 UTC (rev 4296)
@@ -38,10 +38,7 @@
*/
public class TestNGTestRunner implements TestRunner
{
- /* (non-Javadoc)
- * @see org.jboss.arquillian.spi.TestRunner#execute(java.lang.Class, java.lang.String)
- */
- @Override
+
public TestResult execute(Class<?> testClass, String methodName)
{
DeployableTestBuilder.setProfile(ContainerProfile.CONTAINER);
More information about the jboss-svn-commits
mailing list