[jboss-cvs] JBossAS SVN: r111405 - in projects/jboss-jca/trunk: adapters/src/test/java/org/jboss/jca/adapters and 19 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 19 10:38:34 EDT 2011
Author: jesper.pedersen
Date: 2011-05-19 10:38:33 -0400 (Thu, 19 May 2011)
New Revision: 111405
Added:
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/ArquillianJCATestUtils.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/package.html
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/SecurityActions.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ArquillianJCATestUtils.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCALoadableExtension.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/InputStreamDescriptor.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/package.html
projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
Removed:
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/ArquillianJCATestUtils.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java
projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
Modified:
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2DriverTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2SecurityDomainTestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java
projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra15out/TestAdminObject.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra10dtdoutTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15dtdinoutTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15inoutTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarAdminObjectTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarDefaultnsTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303TestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303TestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoconfpropTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16assoTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16dtdinoutTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutIronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutannoTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutjarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutmultiannoTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutnoraTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutoverwriteTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarDefaultnsTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outTestCase.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outnoraTestCase.java
projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java
projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainerConfiguration.java
projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java
projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/tools/findbugs/filter.xml
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/cf/ConnectionFactoryWithWrongConstructor.java
Log:
[JBJCA-579] [JBJCA-580] [JBJCA-581] Arquillian 1.0.0.Beta1, ShrinkWrap 1.0.0.Beta2 and ShrinkWrap Descriptors 1.0.0.Beta1
Added: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/ArquillianJCATestUtils.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/ArquillianJCATestUtils.java (rev 0)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/ArquillianJCATestUtils.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.adapters;
+
+import java.util.UUID;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+
+/**
+ * An ArquillianJCATestUtils.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public final class ArquillianJCATestUtils
+{
+ /**
+ * Build a shrinkwrap rar adding all necessary classes
+ *
+ * @param archiveName the archhive name
+ * @param packageName the package name
+ * @return the shrinkwrapped rar
+ * @throws Exception in case of error creating the archive
+ */
+ public static ResourceAdapterArchive buidShrinkwrapRa(String archiveName, String packageName) throws Exception
+ {
+ ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, archiveName);
+
+ JavaArchive ja = ShrinkWrap.create(JavaArchive.class, UUID.randomUUID().toString() + ".jar");
+ ja.addPackages(true, packageName.replace('.', '/'));
+
+ raa.addAsLibrary(ja);
+
+ return raa;
+ }
+
+ /**
+ * Build a shrinkwrap rar for jdbc local
+ *
+ * @return the shrinkwrapped rar
+ * @throws Exception in case of error creating the archive
+ */
+ public static ResourceAdapterArchive buildShrinkwrapJdbcLocal() throws Exception
+ {
+ ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, "jdbc-local.rar");
+ JavaArchive ja = buildShrinkwrapJdbcJar();
+
+ raa.addAsLibrary(ja);
+ raa.addAsManifestResource("jdbc/local/META-INF/ra.xml", "ra.xml");
+
+ return raa;
+ }
+
+ /**
+ * Build a shrinkwrap rar for jdbc xa
+ *
+ * @return the shrinkwrapped rar
+ * @throws Exception in case of error creating the archive
+ */
+ public static ResourceAdapterArchive buildShrinkwrapJdbcXa() throws Exception
+ {
+ ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, "jdbc-xa.rar");
+ JavaArchive ja = buildShrinkwrapJdbcJar();
+
+ raa.addAsLibrary(ja);
+ raa.addAsManifestResource("jdbc/xa/META-INF/ra.xml", "ra.xml");
+
+ return raa;
+ }
+
+ /**
+ * Build the JDBC JAR archive
+ * @return The archive
+ */
+ private static JavaArchive buildShrinkwrapJdbcJar()
+ {
+ String packageName = "org/jboss/jca/adapters/jdbc";
+
+ JavaArchive ja = ShrinkWrap.create(JavaArchive.class, "ironjacamar-jdbc.jar");
+ ja.addPackages(true, packageName);
+
+ return ja;
+ }
+}
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ExceptionSorterTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -21,8 +21,9 @@
*/
package org.jboss.jca.adapters.jdbc.spi;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
import org.jboss.jca.adapters.jdbc.spi.testimpl.TestExceptionSorter;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import java.sql.SQLException;
@@ -31,10 +32,10 @@
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,21 +59,30 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-local.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcLocal(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-exception-sorter-ds.xml", "datasources-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcLocal();
+ }
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd = new InputStreamDescriptor("h2-exception-sorter-ds.xml",
+ cl.getResourceAsStream("h2-exception-sorter-ds.xml"));
+ return isd;
}
//-------------------------------------------------------------------------------------||
@@ -93,14 +103,16 @@
@Test
public void shouldInjectCorrectExceptionSorter() throws Throwable
{
+ Connection c = null;
+ Statement st = null;
try
{
assertNotNull(ds);
- Connection c = ds.getConnection();
+ c = ds.getConnection();
assertNotNull(c);
- Statement st = c.createStatement();
+ st = c.createStatement();
st.execute("dssd");
}
catch (SQLException e)
@@ -116,9 +128,29 @@
assertThat(TestExceptionSorter.getStringInjected(), hasItems("MyTest", "MyTest2"));
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (SQLException se)
+ {
+ // Ignore
+ }
+ }
+
+ if (c != null)
+ {
+ try
+ {
+ c.close();
+ }
+ catch (SQLException se)
+ {
+ // Ignore
+ }
+ }
}
-
}
-
-
}
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/StaleConnectionCheckerTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -21,9 +21,9 @@
*/
package org.jboss.jca.adapters.jdbc.spi;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
import org.jboss.jca.adapters.jdbc.spi.testimpl.TestStaleConnectionChecker;
-import org.jboss.jca.embedded.Embedded;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import java.sql.SQLException;
@@ -32,10 +32,10 @@
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,21 +58,31 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-local.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcLocal(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-stale-connection-checker-ds.xml", "datasources-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcLocal();
+ }
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd =
+ new InputStreamDescriptor("h2-stale-connection-checker-ds.xml",
+ cl.getResourceAsStream("h2-stale-connection-checker-ds.xml"));
+ return isd;
}
//-------------------------------------------------------------------------------------||
@@ -93,21 +103,17 @@
@Test
public void shouldInjectCorrectStaleConnectionChecker() throws Throwable
{
- /*
- * Embedded
- */
- Embedded embedded = null;
-
+ Connection c = null;
+ Statement st = null;
try
{
assertNotNull(ds);
- Connection c = ds.getConnection();
+ c = ds.getConnection();
assertNotNull(c);
- Statement st = c.createStatement();
+ st = c.createStatement();
st.execute("dssd");
-
}
catch (SQLException e)
{
@@ -122,8 +128,29 @@
assertThat(TestStaleConnectionChecker.getInjectedInteger(), is(100));
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (SQLException se)
+ {
+ // Ignore
+ }
+ }
+
+ if (c != null)
+ {
+ try
+ {
+ c.close();
+ }
+ catch (SQLException se)
+ {
+ // Ignore
+ }
+ }
}
-
}
-
}
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/spi/ValidConnectionCheckerTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -21,8 +21,9 @@
*/
package org.jboss.jca.adapters.jdbc.spi;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
import org.jboss.jca.adapters.jdbc.spi.testimpl.TestValidConnectionChecker;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import java.sql.SQLException;
@@ -31,10 +32,10 @@
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -57,21 +58,31 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-local.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcLocal(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-valid-connection-checker-ds.xml", "datasources-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcLocal();
+ }
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd =
+ new InputStreamDescriptor("h2-valid-connection-checker-ds.xml",
+ cl.getResourceAsStream("h2-valid-connection-checker-ds.xml"));
+ return isd;
}
//-------------------------------------------------------------------------------------||
@@ -93,18 +104,18 @@
public void shouldInjectCorrectStaleConnectionChecker() throws Throwable
{
+ Connection c = null;
+ Statement st = null;
try
{
assertNotNull(ds);
-
- Connection c = ds.getConnection();
+ c = ds.getConnection();
assertNotNull(c);
c.close();
c = ds.getConnection();
-
- Statement st = c.createStatement();
+ assertNotNull(c);
+ st = c.createStatement();
st.execute("dssd");
-
}
catch (SQLException e)
{
@@ -119,8 +130,29 @@
//assertThat(TestValidConnectionChecker.getInjectedInteger(), is(100));
+ if (st != null)
+ {
+ try
+ {
+ st.close();
+ }
+ catch (SQLException se)
+ {
+ // Ignore
+ }
+ }
+
+ if (c != null)
+ {
+ try
+ {
+ c.close();
+ }
+ catch (SQLException se)
+ {
+ // Ignore
+ }
+ }
}
-
}
-
}
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2DriverTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2DriverTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2DriverTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,17 +22,18 @@
package org.jboss.jca.adapters.jdbc.unit;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,21 +53,30 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-local.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcLocal(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-driver-ds.xml", "datasources-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcLocal();
+ }
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd = new InputStreamDescriptor("h2-driver-ds.xml",
+ cl.getResourceAsStream("h2-driver-ds.xml"));
+ return isd;
}
//-------------------------------------------------------------------------------------||
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2SecurityDomainTestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2SecurityDomainTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2SecurityDomainTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,17 +22,18 @@
package org.jboss.jca.adapters.jdbc.unit;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,22 +53,32 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-local.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcLocal(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-sd-ds.xml", "datasources-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcLocal();
}
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd = new InputStreamDescriptor("h2-sd-ds.xml",
+ cl.getResourceAsStream("h2-sd-ds.xml"));
+ return isd;
+ }
+
//-------------------------------------------------------------------------------------||
//---------------------- WHEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
@@ -89,5 +100,6 @@
assertNotNull(ds);
Connection c = ds.getConnection();
assertNotNull(c);
+ c.close();
}
}
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2TestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,17 +22,18 @@
package org.jboss.jca.adapters.jdbc.unit;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,21 +53,29 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-local.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcLocal(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-ds.xml", "datasources-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcLocal();
+ }
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd = new InputStreamDescriptor("h2-ds.xml", cl.getResourceAsStream("h2-ds.xml"));
+ return isd;
}
//-------------------------------------------------------------------------------------||
@@ -90,5 +99,6 @@
assertNotNull(ds);
Connection c = ds.getConnection();
assertNotNull(c);
+ c.close();
}
}
Modified: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/jdbc/unit/H2XATestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,17 +22,18 @@
package org.jboss.jca.adapters.jdbc.unit;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.adapters.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import java.sql.Connection;
import javax.annotation.Resource;
import javax.sql.DataSource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,21 +53,30 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
- String archiveName = "jdbc-xa.rar";
- ResourceAdapterArchive raa = ArquillianJCATestUtils.buildShrinkwrapJdbcXa(archiveName);
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("h2-xa-ds.xml", "datasources-xa-ds.xml");
- return external;
+ return ArquillianJCATestUtils.buildShrinkwrapJdbcXa();
+ }
+ /**
+ * Define the -ds.xml
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd = new InputStreamDescriptor("h2-xa-ds.xml",
+ cl.getResourceAsStream("h2-xa-ds.xml"));
+ return isd;
}
//-------------------------------------------------------------------------------------||
@@ -90,6 +100,7 @@
assertNotNull(ds);
Connection c = ds.getConnection();
assertNotNull(c);
+ c.close();
}
}
Added: projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/package.html
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/package.html (rev 0)
+++ projects/jboss-jca/trunk/adapters/src/test/java/org/jboss/jca/adapters/package.html 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,3 @@
+<body>
+Utility classes for the adapters test suite
+</body>
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/build.xml 2011-05-19 14:38:33 UTC (rev 111405)
@@ -110,7 +110,7 @@
<property name="version.apache-log4j" value="1.2.16"/>
<property name="version.apache-logging" value="1.1.0.jboss"/>
<property name="version.apiviz" value="1.3.1.GA"/>
- <property name="version.arquillian" value="1.0.0.Alpha4"/>
+ <property name="version.arquillian" value="1.0.0.Beta1"/>
<property name="version.dom4j" value="1.6.1"/>
<property name="version.mockito" value="1.8.5"/>
<property name="version.eclipse.ecj" value="3.5.1"/>
@@ -130,7 +130,8 @@
<property name="version.jboss.papaki" value="1.0.0.Beta3"/>
<property name="version.jboss.picketbox" value="4.0.0.Alpha8"/>
<property name="version.jboss.security" value="2.1.0.20090318"/>
- <property name="version.jboss.shrinkwrap" value="1.0.0-alpha-11"/>
+ <property name="version.jboss.shrinkwrap" value="1.0.0-beta-2"/>
+ <property name="version.jboss.shrinkwrap.descriptors" value="1.0.0-beta-1"/>
<property name="version.jboss.slf4j" value="1.0.2.GA"/>
<property name="version.jboss.slf4j.logmanager" value="1.0.0.CR3"/>
<property name="version.jboss.stdio" value="1.0.0.CR3"/>
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -191,13 +191,13 @@
out.write(");");
writeEol(out);
writeIndent(out, indent + 1);
- out.write("raa.addLibrary(ja);");
+ out.write("raa.addAsLibrary(ja);");
writeEol(out);
writeEol(out);
if (!def.isUseAnnotation())
{
writeIndent(out, indent + 1);
- out.write("raa.addManifestResource(\"META-INF/ra.xml\", \"ra.xml\");");
+ out.write("raa.addAsManifestResource(\"META-INF/ra.xml\", \"ra.xml\");");
writeEol(out);
writeEol(out);
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -294,7 +294,7 @@
if (md == null)
throw new NotFoundException("Unable to lookup resource adapter in MDR: " + uniqueId);
- if (md != null && md.getResourceadapter() != null && md.getResourceadapter() instanceof ResourceAdapter1516)
+ if (md.getResourceadapter() != null && md.getResourceadapter() instanceof ResourceAdapter1516)
{
ResourceAdapter1516 ra1516 = (ResourceAdapter1516)md.getResourceadapter();
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -58,8 +58,8 @@
try
{
Method method = c.getClass().getMethod("isValid", new Class[] {int.class});
- method.setAccessible(true);
- Boolean b = (Boolean)method.invoke(c, new Object[] {new Integer(5)});
+ SecurityActions.setAccessible(method, true);
+ Boolean b = (Boolean)method.invoke(c, new Object[] {Integer.valueOf(5)});
return b.booleanValue();
}
catch (Throwable t)
@@ -97,7 +97,7 @@
try
{
Method method = c.getClass().getMethod("close", (Class<?>)null);
- method.setAccessible(true);
+ SecurityActions.setAccessible(method, true);
method.invoke(c, (Object)null);
}
catch (Throwable t)
Added: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/SecurityActions.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/SecurityActions.java (rev 0)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/SecurityActions.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.core.recovery;
+
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Privileged Blocks
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+class SecurityActions
+{
+ /**
+ * Constructor
+ */
+ private SecurityActions()
+ {
+ }
+
+ /**
+ * Invoke setAccessible on a method
+ * @param m The method
+ * @param value The value
+ */
+ static void setAccessible(final Method m, final boolean value)
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ m.setAccessible(value);
+ return null;
+ }
+ });
+ }
+}
Copied: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ArquillianJCATestUtils.java (from rev 111252, projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/ArquillianJCATestUtils.java)
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ArquillianJCATestUtils.java (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/ArquillianJCATestUtils.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.test.deployers.spec;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.UUID;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+
+/**
+ *
+ * A ArquillianJCATestUtils.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public final class ArquillianJCATestUtils
+{
+
+ /**
+ * Build a shrinkwrap rar adding all necessary classes
+ *
+ * @param archiveName the archhive name
+ * @param packageName the package name
+ * @return the shrinkwrapped rar
+ * @throws Exception in case of error creating the archive
+ */
+ public static ResourceAdapterArchive buidShrinkwrapRa(String archiveName, String packageName) throws Exception
+ {
+ ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, archiveName);
+
+ JavaArchive ja = ShrinkWrap.create(JavaArchive.class, UUID.randomUUID().toString() + ".jar");
+ ja.addClasses(getClasses(packageName));
+
+ raa.addAsLibrary(ja);
+
+ return raa;
+ }
+
+ /**
+ * Scans all classes accessible from the context class loader which belong to the given package and subpackages.
+ *
+ * @param packageName The base package
+ * @return The classes
+ * @throws ClassNotFoundException
+ * @throws IOException
+ */
+ private static Class[] getClasses(String packageName) throws ClassNotFoundException, IOException
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ String path = packageName.replace('.', '/');
+ Enumeration<URL> resources = classLoader.getResources(path);
+ List<File> dirs = new ArrayList<File>();
+ while (resources.hasMoreElements())
+ {
+ URL resource = resources.nextElement();
+ dirs.add(new File(resource.getFile()));
+ }
+ ArrayList<Class> classes = new ArrayList<Class>();
+ for (File directory : dirs)
+ {
+ classes.addAll(findClasses(directory, packageName));
+ }
+ return classes.toArray(new Class[classes.size()]);
+ }
+
+ /**
+ * Recursive method used to find all classes in a given directory and subdirs.
+ *
+ * @param directory The base directory
+ * @param packageName The package name for classes found inside the base directory
+ * @return The classes
+ * @throws ClassNotFoundException
+ */
+ private static List<Class> findClasses(File directory, String packageName) throws ClassNotFoundException
+ {
+ List<Class> classes = new ArrayList<Class>();
+ if (!directory.exists())
+ {
+ return classes;
+ }
+ File[] files = directory.listFiles();
+ for (File file : files)
+ {
+ if (file.isDirectory())
+ {
+ assert !file.getName().contains(".");
+ classes.addAll(findClasses(file, packageName + "." + file.getName()));
+ }
+ else if (file.getName().endsWith(".class"))
+ {
+ classes.add(Class.forName(packageName + '.' + file.getName().substring(0, file.getName().length() - 6)));
+ }
+ }
+ return classes;
+ }
+}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/IronJacamarTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,10 @@
package org.jboss.jca.test.deployers.spec;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
-
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -60,8 +58,8 @@
String archiveName = "ra15outironjacamar.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15out";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/RaXmlTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,15 +22,15 @@
package org.jboss.jca.test.deployers.spec;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,26 +51,38 @@
//-------------------------------------------------------------------------------------||
//---------------------- GIVEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
+
/**
* Define the deployment
* @return The deployment archive
* @throws Exception in case of errors
*/
- @Deployment
- public static ResourceAdapterArchive createDeployment() throws Exception
+ @Deployment(order = 1)
+ public static ResourceAdapterArchive createArchive() throws Exception
{
String archiveName = "ra16out.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16out";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource("ra16out-ra.xml", "ra16out-ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource("ra16out-ra.xml", "ra16out-ra.xml");
- ResourceAdapterArchive external = ShrinkWrap.create(ResourceAdapterArchive.class, "complex_" + archiveName);
- external.add(raa, "/");
- external.addResource("ra16out-ra.xml", "resource-adapters-ra.xml");
- return external;
+ return raa;
}
+ /**
+ * Define the deployment
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment(order = 2)
+ public static Descriptor createDescriptor() throws Exception
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ InputStreamDescriptor isd = new InputStreamDescriptor("ra16out-ra.xml",
+ cl.getResourceAsStream("ra16out-ra.xml"));
+ return isd;
+ }
+
//-------------------------------------------------------------------------------------||
//---------------------- WHEN --------------------------------------------------------||
//-------------------------------------------------------------------------------------||
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra15out/TestAdminObject.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra15out/TestAdminObject.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra15out/TestAdminObject.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -38,6 +38,7 @@
*/
public class TestAdminObject implements Serializable, Referenceable
{
+ private static final long serialVersionUID = 1L;
private String myStringProperty;
/**
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -37,8 +37,10 @@
@AdministeredObject
public class TestAdminObject implements Serializable, Referenceable
{
+ private static final long serialVersionUID = 1L;
+
/** reference */
- Reference reference;
+ private Reference reference;
@ConfigProperty(type = String.class, defaultValue = "InAO")
private String myStringProperty;
@@ -69,6 +71,5 @@
public void setReference(Reference reference)
{
this.reference = reference;
-
}
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra10dtdoutTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra10dtdoutTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra10dtdoutTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra10dtdout.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra10dtdout";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15dtdinoutTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15dtdinoutTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15dtdinoutTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra15dtdinout.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15dtdinout";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15inoutTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15inoutTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15inoutTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra15inout.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15inout";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarAdminObjectTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarAdminObjectTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarAdminObjectTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import org.jboss.jca.test.deployers.spec.rars.ra15out.TestAdminObject;
import javax.annotation.Resource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -64,8 +64,8 @@
String archiveName = "ra15outironjacamaradminobject.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15out";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarDefaultnsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarDefaultnsTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outIronJacamarDefaultnsTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -60,8 +60,8 @@
String archiveName = "ra15outironjacamardefaultns.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15outironjacamardefaultns";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra15outTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra15out.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra15out";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303IronJacamarTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16standard303ironjacamar.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16standard303ironjacamar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303TestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303TestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16Standard303TestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16standard303.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16standard303";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303IronJacamarTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16user303ironjacamar.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16user303ironjacamar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303TestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303TestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16User303TestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16user303.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16user303";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import org.jboss.jca.test.deployers.spec.rars.ra16annoadminobj.TestAdminObject;
import javax.annotation.Resource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -64,8 +64,8 @@
String archiveName = "ra16annoadminobj.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16annoadminobj";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoconfpropTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoconfpropTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoconfpropTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16annoconfprop.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16annoconfprop";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16assoTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16assoTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16assoTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16asso.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16asso";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16dtdinoutTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16dtdinoutTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16dtdinoutTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16dtdinout.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16dtdinout";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutIronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutIronJacamarTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutIronJacamarTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -60,8 +60,8 @@
String archiveName = "ra16inoutironjacamar.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16inoutironjacamar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16inout.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16inout";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutannoTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutannoTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutannoTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16inoutanno.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16inoutanno";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutjarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutjarTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutjarTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16inoutjar.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16inoutjar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutmultiannoTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutmultiannoTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutmultiannoTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16inoutmultianno.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16inoutmultianno";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutnoraTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutnoraTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutnoraTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutoverwriteTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutoverwriteTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16inoutoverwriteTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16inoutoverwrite.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16inoutoverwrite";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarDefaultnsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarDefaultnsTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarDefaultnsTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -60,8 +60,8 @@
String archiveName = "ra16outironjacamardefaultns.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16outironjacamardefaultns";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outIronJacamarTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -60,8 +60,8 @@
String archiveName = "ra16outironjacamar.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16outironjacamar";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
- raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
@@ -61,7 +61,7 @@
String archiveName = "ra16out.rar";
String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16out";
ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
- raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outnoraTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outnoraTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16outnoraTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,12 +22,12 @@
package org.jboss.jca.test.deployers.spec.rars.testcases;
-import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.ArquillianJCATestUtils;
import javax.annotation.Resource;
import javax.resource.cci.ConnectionFactory;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -70,7 +70,7 @@
HelloWorldConnectionFactoryImpl.class,
HelloWorldConnection.class,
HelloWorldConnectionImpl.class);
- raa.addLibrary(ja);
+ raa.addAsLibrary(ja);
return raa;
}
Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/embedded.xml 2011-05-19 14:38:33 UTC (rev 111405)
@@ -265,10 +265,10 @@
<orderedlist>
<listitem>
- <ulink url="http://www.jboss.org/community/wiki/ShrinkWrap">ShrinkWrap</ulink>
+ <ulink url="http://www.jboss.org/shrinkwrap">ShrinkWrap</ulink>
</listitem>
<listitem>
- <ulink url="http://community.jboss.org/en/arquillian">Arquillian</ulink>
+ <ulink url="http://www.jboss.org/arquillian">Arquillian</ulink>
</listitem>
</orderedlist>
@@ -286,136 +286,14 @@
into the IronJacamar Embedded environment.</para>
<programlisting language="java">
-<![CDATA[
-import org.jboss.jca.embedded.Embedded;
-import org.jboss.jca.embedded.EmbeddedFactory;
-import org.jboss.jca.embedded.rars.simple.MessageListener;
-import org.jboss.jca.embedded.rars.simple.TestActivationSpec;
-import org.jboss.jca.embedded.rars.simple.TestConnection;
-import org.jboss.jca.embedded.rars.simple.TestConnectionInterface;
-import org.jboss.jca.embedded.rars.simple.TestManagedConnection;
-import org.jboss.jca.embedded.rars.simple.TestManagedConnectionFactory;
-import org.jboss.jca.embedded.rars.simple.TestResourceAdapter;
-
-import java.util.UUID;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ShrinkWrapTestCase
-{
- private static Logger log = Logger.getLogger(ShrinkWrapTestCase.class);
-
- /** Embedded */
- private static Embedded embedded;
-
- /** JNDI prefix */
- private static final String JNDI_PREFIX = "java:/eis/";
-
- /**
- * Basic ShrinkWrap ResourceAdapterArchive test case
- * @exception Throwable Thrown if case of an error
- */
- @Test
- public void testBasic() throws Throwable
- {
- String deploymentName = UUID.randomUUID().toString();
-
- ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class,
- deploymentName + ".rar");
-
- JavaArchive ja =
- ShrinkWrap.create(JavaArchive.class, UUID.randomUUID().toString() + ".jar");
-
- ja.addClasses(MessageListener.class, TestActivationSpec.class,
- TestConnection.class, TestConnectionInterface.class,
- TestManagedConnection.class, TestManagedConnectionFactory.class,
- TestResourceAdapter.class);
-
- raa.addLibrary(ja);
- raa.addManifestResource("simple.rar/META-INF/ra.xml", "ra.xml");
-
- Context context = null;
-
- try
- {
- embedded.deploy(raa);
-
- context = new InitialContext();
- Object o = context.lookup(JNDI_PREFIX + deploymentName);
- assertNotNull(o);
- }
- catch (Throwable t)
- {
- log.error(t.getMessage(), t);
- fail(t.getMessage());
- }
- finally
- {
- embedded.undeploy(raa);
-
- if (context != null)
- {
- try
- {
- context.close();
- }
- catch (NamingException ne)
- {
- // Ignore
- }
- }
- }
- }
-
- /**
- * Lifecycle start, before the suite is executed
- * @exception Throwable Thrown if case of an error
- */
- @BeforeClass
- public static void beforeClass() throws Throwable
- {
- // Create and set an embedded JCA instance
- embedded = EmbeddedFactory.create();
-
- // Startup
- embedded.startup();
- }
-
- /**
- * Lifecycle stop, after the suite is executed
- * @exception Throwable Thrown if case of an error
- */
- @AfterClass
- public static void afterClass() throws Throwable
- {
- // Shutdown embedded
- embedded.shutdown();
-
- // Set embedded to null
- embedded = null;
- }
-}
-]]>
+<xi:include parse="text" href="../../../embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</programlisting>
- <note>Note that, the name for the <code>ResourceAdapterArchive</code> must end with the
- <code>.rar</code> extension.</note>
+ <note>Note that, the name for the <code>ResourceAdapterArchive</code> must end with the
+ <code>.rar</code> extension.</note>
-
- <para>See the <ulink url="http://www.jboss.org/community/wiki/ShrinkWrap">
+ <para>See the <ulink url="http://www.jboss.org/shrinkwrap">
ShrinkWrap</ulink> web site for a full description of the project and additional documentation.</para>
</section>
@@ -430,100 +308,13 @@
lifecycle methods.</para>
<programlisting language="java">
-<![CDATA[
-package org.jboss.jca.embedded.unit;
-
-import org.jboss.jca.embedded.rars.simple.MessageListener;
-import org.jboss.jca.embedded.rars.simple.TestActivationSpec;
-import org.jboss.jca.embedded.rars.simple.TestConnection;
-import org.jboss.jca.embedded.rars.simple.TestConnectionFactory;
-import org.jboss.jca.embedded.rars.simple.TestConnectionInterface;
-import org.jboss.jca.embedded.rars.simple.TestConnectionManager;
-import org.jboss.jca.embedded.rars.simple.TestManagedConnection;
-import org.jboss.jca.embedded.rars.simple.TestManagedConnectionFactory;
-import org.jboss.jca.embedded.rars.simple.TestResourceAdapter;
-
-import java.util.UUID;
-
-import javax.annotation.Resource;
-
-import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.logging.Logger;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import static org.junit.Assert.*;
-
-/**
- * Unit test for Arquillian integration
- *
- * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
- */
- at RunWith(Arquillian.class)
-public class ArquillianTestCase
-{
- // --------------------------------------------------------------------------------||
- // Class Members ------------------------------------------------------------------||
- // --------------------------------------------------------------------------------||
-
- private static Logger log = Logger.getLogger(ArquillianTestCase.class);
-
- private static String deploymentName = "ArquillianRA";
-
- /** The resource adapter */
- @Resource
- private TestConnectionFactory cf;
-
- /**
- * Define the deployment
- * @return The deployment archive
- */
- @Deployment
- public static ResourceAdapterArchive createDeployment()
- {
- ResourceAdapterArchive raa =
- ShrinkWrap.create(ResourceAdapterArchive.class, deploymentName + ".rar");
-
- JavaArchive ja = ShrinkWrap.create(JavaArchive.class,
- UUID.randomUUID().toString() + ".jar");
- ja.addClasses(MessageListener.class, TestActivationSpec.class, TestConnection.class,
- TestConnectionFactory.class, TestConnectionManager.class,
- TestConnectionInterface.class, TestManagedConnection.class,
- TestManagedConnectionFactory.class, TestResourceAdapter.class);
-
- raa.addLibrary(ja);
- raa.addManifestResource("simple.rar/META-INF/ra.xml", "ra.xml");
-
- return raa;
- }
-
- //-------------------------------------------------------------------------------------||
- // Tests ------------------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Basic
- * @exception Throwable Thrown if case of an error
- */
- @Test
- public void testBasic() throws Throwable
- {
- assertNotNull(cf);
- }
-}
-]]>
+<xi:include parse="text" href="../../../embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</programlisting>
-
- <note>Note that, the name for the <code>ResourceAdapterArchive</code> must end with the
- <code>.rar</code> extension.</note>
+ <note>Note that, the name for the <code>ResourceAdapterArchive</code> must end with the
+ <code>.rar</code> extension.</note>
-
- <para>See the <ulink url="http://community.jboss.org/en/arquillian">
+ <para>See the <ulink url="http://www.jboss.org/arquillian">
Arquillian</ulink> web site for a full description of the project and additional documentation.</para>
</section>
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/Embedded.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -25,6 +25,7 @@
import java.net.URL;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
/**
* The embedded IronJacamar container
@@ -53,6 +54,13 @@
/**
* Deploy
+ * @param descriptor The descriptor
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(Descriptor descriptor) throws Throwable;
+
+ /**
+ * Deploy
* @param raa The resource adapter archive
* @exception Throwable If an error occurs
*/
@@ -67,6 +75,13 @@
/**
* Undeploy
+ * @param descriptor The descriptor
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(Descriptor descriptor) throws Throwable;
+
+ /**
+ * Undeploy
* @param raa The resource adapter archive
* @exception Throwable If an error occurs
*/
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -22,18 +22,20 @@
package org.jboss.jca.embedded;
-import java.io.BufferedInputStream;
+import org.jboss.jca.embedded.dsl.InputStreamDescriptor;
+
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import org.jboss.logging.Logger;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import com.github.fungal.api.Kernel;
import com.github.fungal.api.KernelFactory;
@@ -50,6 +52,9 @@
/** Buffer size */
private static final int BUFFER_SIZE = 4096;
+ /** The logger */
+ private static Logger log = Logger.getLogger(EmbeddedJCA.class);
+
/** Enable full profile */
private final boolean fullProfile;
@@ -88,6 +93,7 @@
List<String> order = new ArrayList<String>(3);
order.add(".xml");
order.add(".rar");
+ order.add("-ra.xml");
order.add("-ds.xml");
KernelConfiguration kernelConfiguration = new KernelConfiguration();
@@ -183,49 +189,39 @@
if (!started)
throw new IllegalStateException("Container not started");
+ log.debugf("Deploying: %s", url);
+
kernel.getMainDeployer().deploy(url);
}
/**
- * Deploy
- * @param raa The resource adapter archive
- * @exception Throwable If an error occurs
+ * {@inheritDoc}
*/
- public void deploy(ResourceAdapterArchive raa) throws Throwable
+ public void deploy(Descriptor descriptor) throws Throwable
{
- if (raa == null)
- throw new IllegalArgumentException("Url is null");
+ if (descriptor == null)
+ throw new IllegalArgumentException("Descriptor is null");
- if (!raa.getName().endsWith(".rar"))
- throw new IllegalArgumentException(raa.getName() + " doesn't end with .rar");
+ if (descriptor.getDescriptorName() == null)
+ throw new IllegalArgumentException("Descriptor name is null");
+ if (!(descriptor instanceof InputStreamDescriptor))
+ throw new IllegalArgumentException("Only InputStreamDescriptor is supported");
+
if (!started)
throw new IllegalStateException("Container not started");
- InputStream is = raa.as(ZipExporter.class).exportZip();
- BufferedInputStream bis = new BufferedInputStream(is, BUFFER_SIZE);
-
File parentDirectory = new File(SecurityActions.getSystemProperty("java.io.tmpdir"));
- File raaFile = new File(parentDirectory, raa.getName());
+ File descriptorFile = new File(parentDirectory, descriptor.getDescriptorName());
- if (shrinkwrapDeployments != null && shrinkwrapDeployments.contains(raaFile))
- throw new IOException(raa.getName() + " already deployed");
+ if (descriptorFile.exists())
+ recursiveDelete(descriptorFile);
- if (raaFile.exists())
- recursiveDelete(raaFile);
-
- FileOutputStream os = new FileOutputStream(raaFile);
+ FileOutputStream os = new FileOutputStream(descriptorFile);
BufferedOutputStream bos = new BufferedOutputStream(os, BUFFER_SIZE);
-
- byte[] buffer = new byte[BUFFER_SIZE];
- int read = 0;
try
{
- while ((read = bis.read(buffer)) != -1)
- {
- bos.write(buffer, 0, read);
- }
-
+ descriptor.exportTo(bos);
bos.flush();
}
finally
@@ -241,25 +237,47 @@
// Ignore
}
}
-
- if (bis != null)
- {
- try
- {
- bis.close();
- }
- catch (IOException ignore)
- {
- // Ignore
- }
- }
}
+ log.debugf("Deploying: %s", descriptorFile);
+
+ kernel.getMainDeployer().deploy(descriptorFile.toURI().toURL());
+ }
+
+ /**
+ * Deploy
+ * @param raa The resource adapter archive
+ * @exception Throwable If an error occurs
+ */
+ public void deploy(ResourceAdapterArchive raa) throws Throwable
+ {
+ if (raa == null)
+ throw new IllegalArgumentException("Url is null");
+
+ if (!raa.getName().endsWith(".rar"))
+ throw new IllegalArgumentException(raa.getName() + " doesn't end with .rar");
+
+ if (!started)
+ throw new IllegalStateException("Container not started");
+
+ File parentDirectory = new File(SecurityActions.getSystemProperty("java.io.tmpdir"));
+ File raaFile = new File(parentDirectory, raa.getName());
+
+ if (shrinkwrapDeployments != null && shrinkwrapDeployments.contains(raaFile))
+ throw new IOException(raa.getName() + " already deployed");
+
+ if (raaFile.exists())
+ recursiveDelete(raaFile);
+
+ raa.as(ZipExporter.class).exportTo(raaFile, true);
+
if (shrinkwrapDeployments == null)
shrinkwrapDeployments = new ArrayList<File>(1);
shrinkwrapDeployments.add(raaFile);
+ log.debugf("Deploying: %s", raaFile);
+
kernel.getMainDeployer().deploy(raaFile.toURI().toURL());
}
@@ -282,6 +300,8 @@
if (url == null)
throw new IllegalArgumentException("Resource is null");
+ log.debugf("Deploying: %s", url);
+
kernel.getMainDeployer().deploy(url);
}
@@ -298,10 +318,39 @@
if (!started)
throw new IllegalStateException("Container not started");
+ log.debugf("Undeploying: %s", url);
+
kernel.getMainDeployer().undeploy(url);
}
/**
+ * {@inheritDoc}
+ */
+ public void undeploy(Descriptor descriptor) throws Throwable
+ {
+ if (descriptor == null)
+ throw new IllegalArgumentException("Descriptor is null");
+
+ if (descriptor.getDescriptorName() == null)
+ throw new IllegalArgumentException("Descriptor name is null");
+
+ if (!(descriptor instanceof InputStreamDescriptor))
+ throw new IllegalArgumentException("Only InputStreamDescriptor is supported");
+
+ if (!started)
+ throw new IllegalStateException("Container not started");
+
+ File parentDirectory = new File(SecurityActions.getSystemProperty("java.io.tmpdir"));
+ File descriptorFile = new File(parentDirectory, descriptor.getDescriptorName());
+
+ log.debugf("Undeploying: %s", descriptorFile);
+
+ kernel.getMainDeployer().undeploy(descriptorFile.toURI().toURL());
+
+ recursiveDelete(descriptorFile);
+ }
+
+ /**
* Undeploy
* @param raa The resource adapter archive
* @exception Throwable If an error occurs
@@ -317,7 +366,9 @@
File parentDirectory = new File(SecurityActions.getSystemProperty("java.io.tmpdir"));
File raaFile = new File(parentDirectory, raa.getName());
- if (!shrinkwrapDeployments.contains(raaFile))
+ log.debugf("Undeploying: %s", raaFile);
+
+ if (shrinkwrapDeployments == null || !shrinkwrapDeployments.contains(raaFile))
throw new IOException(raa.getName() + " not deployed");
kernel.getMainDeployer().undeploy(raaFile.toURI().toURL());
@@ -340,6 +391,9 @@
throw new IllegalArgumentException("Name is null");
URL url = cl.getResource(name);
+
+ log.debugf("Undeploying: %s", url);
+
kernel.getMainDeployer().undeploy(url);
}
Deleted: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/ArquillianJCATestUtils.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/ArquillianJCATestUtils.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/ArquillianJCATestUtils.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -1,181 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.embedded.arquillian;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.UUID;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
-
-/**
- *
- * A ArquillianJCATestUtils.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public final class ArquillianJCATestUtils
-{
-
- /**
- * Build a shrinkwrap rar adding all necessary classes
- *
- * @param archiveName the archhive name
- * @param packageName the package name
- * @return the shrinkwrapped rar
- * @throws Exception in case of error creating the archive
- */
- public static ResourceAdapterArchive buidShrinkwrapRa(String archiveName, String packageName) throws Exception
- {
- ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, archiveName);
-
- JavaArchive ja = ShrinkWrap.create(JavaArchive.class, UUID.randomUUID().toString() + ".jar");
- ja.addClasses(getClasses(packageName));
-
- raa.addLibrary(ja);
-
-
- return raa;
- }
-
- /**
- * Build a shrinkwrap rar for jdbc local
- *
- * @param archiveName the archhive name
- * @return the shrinkwrapped rar
- * @throws Exception in case of error creating the archive
- */
- public static ResourceAdapterArchive buildShrinkwrapJdbcLocal(String archiveName)
- throws Exception
- {
- ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, archiveName);
- JavaArchive ja = buildShrinkwrapJdbcJar();
- raa.addLibrary(ja);
-
- raa.addManifestResource("jdbc/local/META-INF/ra.xml", "ra.xml");
-
- return raa;
- }
-
- /**
- * Build a shrinkwrap rar for jdbc xa
- *
- * @param archiveName the archhive name
- * @return the shrinkwrapped rar
- * @throws Exception in case of error creating the archive
- */
- public static ResourceAdapterArchive buildShrinkwrapJdbcXa(String archiveName) throws Exception
- {
- ResourceAdapterArchive raa = ShrinkWrap.create(ResourceAdapterArchive.class, archiveName);
- JavaArchive ja = buildShrinkwrapJdbcJar();
- raa.addLibrary(ja);
-
- raa.addManifestResource("jdbc/xa/META-INF/ra.xml", "ra.xml");
-
- return raa;
- }
-
- /**
- * FIXME Comment this
- *
- * @return
- * @throws ClassNotFoundException
- * @throws IOException
- */
- private static JavaArchive buildShrinkwrapJdbcJar() throws ClassNotFoundException, IOException
- {
- String packageName = "org.jboss.jca.adapters";
-
- JavaArchive ja = ShrinkWrap.create(JavaArchive.class, "ironjacamar-jdbc.jar");
- ja.addClasses(getClasses(packageName));
- //ja.setManifest("jdbc/jar/META-INF/MANIFEST.MF");
- return ja;
- }
-
-
- /**
- * Scans all classes accessible from the context class loader which belong to the given package and subpackages.
- *
- * @param packageName The base package
- * @return The classes
- * @throws ClassNotFoundException
- * @throws IOException
- */
- private static Class[] getClasses(String packageName) throws ClassNotFoundException, IOException
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- String path = packageName.replace('.', '/');
- Enumeration<URL> resources = classLoader.getResources(path);
- List<File> dirs = new ArrayList<File>();
- while (resources.hasMoreElements())
- {
- URL resource = resources.nextElement();
- dirs.add(new File(resource.getFile()));
- }
- ArrayList<Class> classes = new ArrayList<Class>();
- for (File directory : dirs)
- {
- classes.addAll(findClasses(directory, packageName));
- }
- return classes.toArray(new Class[classes.size()]);
- }
-
- /**
- * Recursive method used to find all classes in a given directory and subdirs.
- *
- * @param directory The base directory
- * @param packageName The package name for classes found inside the base directory
- * @return The classes
- * @throws ClassNotFoundException
- */
- private static List<Class> findClasses(File directory, String packageName) throws ClassNotFoundException
- {
- List<Class> classes = new ArrayList<Class>();
- if (!directory.exists())
- {
- return classes;
- }
- File[] files = directory.listFiles();
- for (File file : files)
- {
- if (file.isDirectory())
- {
- assert !file.getName().contains(".");
- classes.addAll(findClasses(file, packageName + "." + file.getName()));
- }
- else if (file.getName().endsWith(".class"))
- {
- classes.add(Class.forName(packageName + '.' + file.getName().substring(0, file.getName().length() - 6)));
- }
- }
- return classes;
- }
-
-
-}
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainer.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -24,37 +24,38 @@
import org.jboss.jca.embedded.Embedded;
import org.jboss.jca.embedded.EmbeddedFactory;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+import java.util.Properties;
-import org.jboss.arquillian.protocol.local.LocalMethodExecutor;
-import org.jboss.arquillian.spi.Configuration;
-import org.jboss.arquillian.spi.ContainerMethodExecutor;
-import org.jboss.arquillian.spi.Context;
-import org.jboss.arquillian.spi.DeployableContainer;
-import org.jboss.arquillian.spi.DeploymentException;
-import org.jboss.arquillian.spi.LifecycleException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
+import org.jboss.arquillian.container.spi.client.container.DeploymentException;
+import org.jboss.arquillian.container.spi.client.container.LifecycleException;
+import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription;
+import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
+import org.jboss.arquillian.container.spi.context.annotation.ContainerScoped;
+import org.jboss.arquillian.core.api.InstanceProducer;
+import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
/**
- * Arquillian {@link DeployableContainer} adaptor for EmbeddedJCA
+ * Arquillian {@link DeployableContainer} adaptor for Embedded JCA
*
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
* @version $Revision: $
*/
-public class EmbeddedJCAContainer implements DeployableContainer
+public class EmbeddedJCAContainer implements DeployableContainer<EmbeddedJCAContainerConfiguration>
{
/** EmbeddedJCA */
private Embedded embedded;
+ /** Instance producer */
+ @Inject @ContainerScoped
+ private InstanceProducer<Context> instanceProducer;
+
/**
* Constructor
*/
@@ -65,140 +66,96 @@
/**
* {@inheritDoc}
- * @see org.jboss.arquillian.spi.DeployableContainer#deploy
+ * @see DeployableContainer#getDefaultProtocol()
*/
@Override
- public ContainerMethodExecutor deploy(final Context context, final Archive<?> archive) throws DeploymentException
+ public ProtocolDescription getDefaultProtocol()
{
- if (archive == null)
- throw new DeploymentException("Could not deploy a null application");
+ return new ProtocolDescription("Local");
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see DeployableContainer#getConfigurationClass()
+ */
+ @Override
+ public Class<EmbeddedJCAContainerConfiguration> getConfigurationClass()
+ {
+ return EmbeddedJCAContainerConfiguration.class;
+ }
- if (!(ResourceAdapterArchive.class.isInstance(archive)))
- throw new DeploymentException("Could not deploy a non resource adapter application");
+ /**
+ * {@inheritDoc}
+ * @see DeployableContainer#deploy(Descriptor)
+ */
+ @Override
+ public void deploy(Descriptor descriptor) throws DeploymentException
+ {
+ if (descriptor == null)
+ throw new DeploymentException("Could not deploy a null descriptor");
try
{
- ResourceAdapterArchive raa = ResourceAdapterArchive.class.cast(archive);
- if (raa.getName() != null && raa.getName().startsWith("complex_"))
- {
- if (raa.get(raa.getName().substring(8)) != null)
- {
- Asset asset = raa.get(raa.getName().substring(8)).getAsset();
- String name = raa.getName().substring(raa.getName().indexOf("complex_"));
- deployinternalAsset(asset, name);
-
- }
- if (raa.get("resource-adapters-ra.xml") != null)
- {
-
- Asset asset = raa.get("resource-adapters-ra.xml").getAsset();
- String name = "resource-adapters-ra.xml";
- deployinternalAsset(asset, name);
- }
- if (raa.get("datasources-ds.xml") != null)
- {
-
- Asset asset = raa.get("datasources-ds.xml").getAsset();
- String name = "datasources-ds.xml";
- deployinternalAsset(asset, name);
- }
- if (raa.get("datasources-xa-ds.xml") != null)
- {
-
- Asset asset = raa.get("datasources-xa-ds.xml").getAsset();
- String name = "datasources-xa-ds.xml";
- deployinternalAsset(asset, name);
- }
-
- }
- else
- {
- embedded.deploy(ResourceAdapterArchive.class.cast(archive));
- }
-
+ embedded.deploy(descriptor);
}
catch (Throwable t)
{
- t.printStackTrace();
- throw new DeploymentException("Could not deploy the application: " + t.getMessage());
- }
+ throw new DeploymentException("Could not undeploy the application: " + t.getMessage(), t);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see DeployableContainer#undeploy(Descriptor)
+ */
+ @Override
+ public void undeploy(Descriptor descriptor) throws DeploymentException
+ {
+ if (descriptor == null)
+ throw new DeploymentException("Could not undeploy a null application");
- // Invoke locally
- return new LocalMethodExecutor();
+ try
+ {
+ embedded.undeploy(descriptor);
+ }
+ catch (Throwable t)
+ {
+ throw new DeploymentException("Could not undeploy the application: " + t.getMessage(), t);
+ }
}
/**
- * deploy an internal asset
- *
- * @param asset asset
- * @param name asset
- *
- * @throws IOException IOException
- * @throws FileNotFoundException FileNotFoundException
- * @throws MalformedURLException MalformedURLException
- * @throws Throwable Throwable
- *
+ * {@inheritDoc}
+ * @see DeployableContainer#deploy(Archive)
*/
- protected void deployinternalAsset(Asset asset, String name) throws IOException, FileNotFoundException, Throwable,
- MalformedURLException
+ @Override
+ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentException
{
- File parentDirectory = new File(SecurityActions.getSystemProperty("java.io.tmpdir"));
- File raaFile = new File(parentDirectory, name);
+ if (archive == null)
+ throw new DeploymentException("Could not deploy a null application");
- if (raaFile.exists())
- recursiveDelete(raaFile);
- InputStream is = null;
- FileOutputStream os = null;
+ if (!(ResourceAdapterArchive.class.isInstance(archive)))
+ throw new DeploymentException("Could not deploy a non resource adapter application");
- byte[] buffer = new byte[4096];
- int read = 0;
try
{
- is = asset.openStream();
- os = new FileOutputStream(raaFile);
- while ((read = is.read(buffer)) != -1)
- {
- os.write(buffer, 0, read);
- }
-
- os.flush();
+ embedded.deploy(ResourceAdapterArchive.class.cast(archive));
}
- finally
+ catch (Throwable t)
{
- if (os != null)
- {
- try
- {
- os.close();
- }
- catch (IOException ignore)
- {
- // Ignore
- }
- }
-
- if (is != null)
- {
- try
- {
- is.close();
- }
- catch (IOException ignore)
- {
- // Ignore
- }
- }
+ throw new DeploymentException("Could not deploy the application: " + t.getMessage(), t);
}
- embedded.deploy(raaFile.toURI().toURL());
+ // Invoke locally
+ return new ProtocolMetaData();
}
/**
* {@inheritDoc}
- * @see org.jboss.arquillian.spi.DeployableContainer#undeploy
+ * @see DeployableContainer#undeploy(Archive)
*/
@Override
- public void undeploy(final Context context, final Archive<?> archive) throws DeploymentException
+ public void undeploy(final Archive<?> archive) throws DeploymentException
{
if (archive == null)
throw new DeploymentException("Could not undeploy a null application");
@@ -210,13 +167,9 @@
{
embedded.undeploy(ResourceAdapterArchive.class.cast(archive));
}
- catch (Exception e)
- {
- //throw new DeploymentException("Could not undeploy the application", e);
- }
catch (Throwable t)
{
- //throw new DeploymentException("Could not undeploy the application: " + t.getMessage());
+ throw new DeploymentException("Could not undeploy the application: " + t.getMessage(), t);
}
}
@@ -225,9 +178,8 @@
* @see org.jboss.arquillian.spi.DeployableContainer#start
*/
@Override
- public void setup(final Context context, final Configuration configuration)
+ public void setup(final EmbeddedJCAContainerConfiguration configuration)
{
-
}
/**
@@ -235,20 +187,18 @@
* @see org.jboss.arquillian.spi.DeployableContainer#start
*/
@Override
- public void start(final Context context) throws LifecycleException
+ public void start() throws LifecycleException
{
- embedded = EmbeddedFactory.create();
+ embedded = EmbeddedFactory.create(true);
try
{
embedded.startup();
+
+ instanceProducer.set(createContext());
}
- catch (Exception e)
- {
- throw new LifecycleException("Could not start the EmbeddedJCA container", e);
- }
catch (Throwable t)
{
- throw new LifecycleException("Could not start the EmbeddedJCA container: " + t.getMessage());
+ throw new LifecycleException("Could not start the EmbeddedJCA container: " + t.getMessage(), t);
}
}
@@ -257,101 +207,29 @@
* @see org.jboss.arquillian.spi.DeployableContainer#stop
*/
@Override
- public void stop(final Context context) throws LifecycleException
+ public void stop() throws LifecycleException
{
try
{
embedded.shutdown();
}
- catch (Exception e)
- {
- throw new LifecycleException("Could not stop the EmbeddedJCA container", e);
- }
catch (Throwable t)
{
- throw new LifecycleException("Could not stop the EmbeddedJCA container: " + t.getMessage());
+ throw new LifecycleException("Could not stop the EmbeddedJCA container: " + t.getMessage(), t);
}
embedded = null;
}
/**
- * Recursive delete
- * @param f The file handler
- * @exception IOException Thrown if a file could not be deleted
+ * Create a context
+ * @return The context
+ * @exception Exception Thrown if an error occurs
*/
- private void recursiveDelete(File f) throws IOException
+ protected InitialContext createContext() throws Exception
{
- if (f != null && f.exists())
- {
- File[] files = f.listFiles();
- if (files != null)
- {
- for (int i = 0; i < files.length; i++)
- {
- if (files[i].isDirectory())
- {
- recursiveDelete(files[i]);
- }
- else
- {
- if (!files[i].delete())
- throw new IOException("Could not delete " + files[i]);
- }
- }
- }
- if (!f.delete())
- throw new IOException("Could not delete " + f);
- }
+ Properties properties = new Properties();
+ properties.setProperty("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
+ properties.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
+ return new InitialContext(properties);
}
-
- /**
- *
- * A SecurityActions.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public static class SecurityActions
- {
- /**
- * Constructor
- */
- private SecurityActions()
- {
- }
-
- /**
- * Get a system property
- * @param name The property name
- * @return The property value
- */
- @SuppressWarnings("unchecked")
- static String getSystemProperty(final String name)
- {
- return (String) AccessController.doPrivileged(new PrivilegedAction()
- {
- public Object run()
- {
- return System.getProperty(name);
- }
- });
- }
-
- /**
- * Set a system property
- * @param name The property name
- * @param value The property value
- */
- static void setSystemProperty(final String name, final String value)
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>()
- {
- public Object run()
- {
- System.setProperty(name, value);
- return null;
- }
- });
- }
- }
}
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainerConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainerConfiguration.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCAContainerConfiguration.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -21,8 +21,8 @@
*/
package org.jboss.jca.embedded.arquillian;
-import org.jboss.arquillian.spi.ContainerConfiguration;
-import org.jboss.arquillian.spi.ContainerProfile;
+import org.jboss.arquillian.container.spi.ConfigurationException;
+import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
/**
* {@link ContainerConfiguration} implementation specific to the EmbeddedJCA container
@@ -40,9 +40,9 @@
/**
* {@inheritDoc}
+ *
*/
- public ContainerProfile getContainerProfile()
+ public void validate() throws ConfigurationException
{
- return ContainerProfile.STANDALONE;
}
}
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCALoadableExtension.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCALoadableExtension.java (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCALoadableExtension.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.embedded.arquillian;
+
+import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+
+/**
+ * Arquillian {@link LoadableExtension} adaptor for Embedded JCA
+ *
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ * @version $Revision: $
+ */
+public class EmbeddedJCALoadableExtension implements LoadableExtension
+{
+ /**
+ * Constructor
+ */
+ public EmbeddedJCALoadableExtension()
+ {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void register(ExtensionBuilder builder)
+ {
+ builder.service(DeployableContainer.class, EmbeddedJCAContainer.class);
+ }
+}
Deleted: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/arquillian/EmbeddedJCATestEnricher.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.embedded.arquillian;
-
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-
-import org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher;
-
-/**
- * TestEnricher implementation specific to the EmbeddedJCA container
- *
- * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
- */
-public class EmbeddedJCATestEnricher extends ResourceInjectionEnricher
-{
- /**
- * Constructor
- */
- public EmbeddedJCATestEnricher()
- {
- }
-
- /**
- * Lookup an object in JNDI
- * @param jndiName The JNDI name
- * @return The object
- * @see org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher#lookup(java.lang.String)
- * @exception Exception Thrown if the lookup can't be performed
- */
- @Override
- protected Object lookup(String jndiName) throws Exception
- {
- return createContext().lookup(jndiName);
- }
-
- /**
- * Create a context
- * @return The context
- * @exception Exception Thrown if an error occurs
- */
- protected InitialContext createContext() throws Exception
- {
- Properties properties = new Properties();
- properties.setProperty("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- properties.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- return new InitialContext(properties);
- }
-}
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/InputStreamDescriptor.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/InputStreamDescriptor.java (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/InputStreamDescriptor.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.embedded.dsl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.jboss.shrinkwrap.descriptor.api.Descriptor;
+import org.jboss.shrinkwrap.descriptor.api.DescriptorExportException;
+
+/**
+ * An InputStream descriptor.
+ *
+ * Note, that this class will close the passed InputStream once one of the export methods
+ * have been called.
+ *
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ * @version $Revision: $
+ */
+public class InputStreamDescriptor implements Descriptor
+{
+ private final String name;
+ private final InputStream is;
+
+ /**
+ * Create an InputStream Descriptor.
+ * @param name The descriptor name
+ * @param is The input stream
+ */
+ public InputStreamDescriptor(final String name, final InputStream is)
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Name is null");
+
+ if (is == null)
+ throw new IllegalArgumentException("InputStream is null");
+
+ this.name = name;
+ this.is = is;
+ }
+
+ /**
+ * Get the name
+ * @return The value
+ */
+ public String getDescriptorName()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String exportAsString() throws DescriptorExportException
+ {
+ try
+ {
+ StringBuilder sb = new StringBuilder();
+
+ int read = 0;
+ while ((read = is.read()) != -1)
+ {
+ sb = sb.append((char)read);
+ }
+
+ return sb.toString();
+ }
+ catch (IOException ioe)
+ {
+ throw new DescriptorExportException("Error during exportAsString: " + ioe.getMessage(), ioe);
+ }
+ finally
+ {
+ try
+ {
+ is.close();
+ }
+ catch (IOException ioe)
+ {
+ // Ignore
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void exportTo(OutputStream output) throws DescriptorExportException, IllegalArgumentException
+ {
+ if (output == null)
+ throw new IllegalArgumentException("Output is null");
+
+ try
+ {
+ int read = 0;
+ while ((read = is.read()) != -1)
+ {
+ output.write(read);
+ }
+
+ output.flush();
+ }
+ catch (IOException ioe)
+ {
+ throw new DescriptorExportException("Error during exportTo: " + ioe.getMessage(), ioe);
+ }
+ finally
+ {
+ try
+ {
+ is.close();
+ }
+ catch (IOException ioe)
+ {
+ // Ignore
+ }
+ }
+ }
+}
Added: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/package.html
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/package.html (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/dsl/package.html 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1,3 @@
+<body>
+This package contains DSL implementations.
+</body>
Added: projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension 2011-05-19 14:38:33 UTC (rev 111405)
@@ -0,0 +1 @@
+org.jboss.jca.embedded.arquillian.EmbeddedJCALoadableExtension
Deleted: projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.ContainerConfiguration 2011-05-19 14:38:33 UTC (rev 111405)
@@ -1 +0,0 @@
-org.jboss.jca.embedded.arquillian.EmbeddedJCAContainerConfiguration
Deleted: projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.DeployableContainer 2011-05-19 14:38:33 UTC (rev 111405)
@@ -1 +0,0 @@
-org.jboss.jca.embedded.arquillian.EmbeddedJCAContainer
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/META-INF/services/org.jboss.arquillian.spi.TestEnricher 2011-05-19 14:38:33 UTC (rev 111405)
@@ -1 +0,0 @@
-org.jboss.jca.embedded.arquillian.EmbeddedJCATestEnricher
\ No newline at end of file
Modified: projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ArquillianTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -36,7 +36,7 @@
import javax.annotation.Resource;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.logging.Logger;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -80,8 +80,8 @@
TestConnectionInterface.class, TestManagedConnection.class,
TestManagedConnectionFactory.class, TestResourceAdapter.class);
- raa.addLibrary(ja);
- raa.addManifestResource("simple.rar/META-INF/ra.xml", "ra.xml");
+ raa.addAsLibrary(ja);
+ raa.addAsManifestResource("simple.rar/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/embedded/src/test/java/org/jboss/jca/embedded/unit/ShrinkWrapTestCase.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -129,8 +129,8 @@
TestConnectionInterface.class, TestManagedConnection.class,
TestManagedConnectionFactory.class, TestResourceAdapter.class);
- raa.addLibrary(ja);
- raa.addManifestResource("simple.rar/META-INF/ra.xml", "ra.xml");
+ raa.addAsLibrary(ja);
+ raa.addAsManifestResource("simple.rar/META-INF/ra.xml", "ra.xml");
try
{
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/ivy.xml 2011-05-19 14:38:33 UTC (rev 111405)
@@ -141,11 +141,22 @@
<dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common,ironjacamar-common-impl,ironjacamar-core-impl,ironjacamar-depchain"/>
<dependency org="org.jboss" name="jboss-transaction-spi" rev="${version.jboss.ts.spi}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
<dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="tools"/>
- <dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
- <dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
- <dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
- <dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
- <dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.config" name="arquillian-config-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.config" name="arquillian-config-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.config" name="arquillian-config-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.container" name="arquillian-container-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.container" name="arquillian-container-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.container" name="arquillian-container-test-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.container" name="arquillian-container-test-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.container" name="arquillian-container-test-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.core" name="arquillian-core-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.core" name="arquillian-core-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.core" name="arquillian-core-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.junit" name="arquillian-junit-container" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.junit" name="arquillian-junit-core" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.test" name="arquillian-test-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.test" name="arquillian-test-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.arquillian.test" name="arquillian-test-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.jbossts" name="jbossjta" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.jbossts" name="jbossjta-integration" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
@@ -153,6 +164,8 @@
<dependency org="org.jboss.netty" name="netty" rev="${version.jboss.netty}" conf="hornetq,ironjacamar-depchain"/>
<dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common,ironjacamar-common-impl-papaki,ironjacamar-depchain"/>
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain,ironjacamar-embedded,ironjacamar-embedded-arquillian"/>
+ <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-api" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
+ <dependency org="org.jboss.shrinkwrap.descriptors" name="shrinkwrap-descriptors-impl" rev="${version.jboss.shrinkwrap.descriptors}" conf="embedded,ironjacamar-depchain"/>
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common,ironjacamar-depchain"/>
Modified: projects/jboss-jca/trunk/tools/findbugs/filter.xml
===================================================================
--- projects/jboss-jca/trunk/tools/findbugs/filter.xml 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/tools/findbugs/filter.xml 2011-05-19 14:38:33 UTC (rev 111405)
@@ -56,6 +56,18 @@
<Bug code="Nm"/>
</Match>
<Match>
+ <Class name="org.jboss.jca.core.connectionmanager.listener.ConnectionListener"/>
+ <Bug code="Nm"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.connectionmanager.listener.AbstractConnectionListener"/>
+ <Bug code="Eq"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.core.connectionmanager.pool.api.Pool"/>
+ <Bug code="Nm"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.core.mdr.SimpleMetadataRepository"/>
<Bug code="Dm"/>
</Match>
@@ -67,6 +79,10 @@
<Class name="org.jboss.jca.core.spi.mdr.MetadataRepository"/>
<Bug code="Dm"/>
</Match>
+ <Match>
+ <Class name="org.jboss.jca.core.spi.transaction.xa.XATerminator"/>
+ <Bug code="Nm"/>
+ </Match>
<!-- org.jboss.jca.deployers filter -->
<Match>
@@ -74,6 +90,14 @@
<Bug code="IP"/>
</Match>
<Match>
+ <Class name="org.jboss.jca.deployers.common.CommonDeployment"/>
+ <Bug code="EI,EI2"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.deployers.fungal.AbstractDsDeployer"/>
+ <Bug code="IP,DLS"/>
+ </Match>
+ <Match>
<Class name="org.jboss.jca.deployers.fungal.AbstractFungalDeployment"/>
<Bug code="EI2"/>
</Match>
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/TestCaseAbstract.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -67,8 +67,8 @@
ja.addClasses(TestActivationSpec.class, TestManagedConnection.class, TestResourceAdapterRight.class,
TestResourceAdapterWrong.class);
- raa.addLibrary(ja);
- raa.addManifestResource("validator/" + archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addAsLibrary(ja);
+ raa.addAsManifestResource("validator/" + archiveName + "/META-INF/ra.xml", "ra.xml");
return raa;
}
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/cf/ConnectionFactoryWithWrongConstructor.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/cf/ConnectionFactoryWithWrongConstructor.java 2011-05-19 11:21:13 UTC (rev 111404)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/cf/ConnectionFactoryWithWrongConstructor.java 2011-05-19 14:38:33 UTC (rev 111405)
@@ -31,6 +31,7 @@
*/
public class ConnectionFactoryWithWrongConstructor extends BaseCciConnectionFactory
{
+ private static final long serialVersionUID = 1L;
/**
* Constructor just to hide default constructor
More information about the jboss-cvs-commits
mailing list