[jboss-cvs] JBossAS SVN: r79918 - in projects/jpa/trunk/deployers/src: test/java/org/jboss/jpa/deployers/test/common and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 22 07:27:49 EDT 2008
Author: wolfc
Date: 2008-10-22 07:27:49 -0400 (Wed, 22 Oct 2008)
New Revision: 79918
Added:
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/derby-beans.xml
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/jpa-deployers-beans.xml
Removed:
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.xml
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/derby-beans.xml
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.xml
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/derby-beans.xml
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.xml
projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/derby-beans.xml
Modified:
projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/PersistenceTestCase.java
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.java
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.java
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.java
Log:
Fixed input/output on PersistenceDeployer and refactored tests
Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java 2008-10-22 11:27:49 UTC (rev 79918)
@@ -45,6 +45,10 @@
public PersistenceDeployer()
{
//setComponentVisitor(new PersistenceUnitDeploymentVisitor());
+ // Since we don't set component visitor
+ addInput(PersistenceMetaData.class);
+ setOutput(PersistenceUnitMetaData.class);
+
setDeploymentVisitor(new PersistenceDeploymentVisitor());
}
Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/PersistenceTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/PersistenceTestCase.java 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/PersistenceTestCase.java 2008-10-22 11:27:49 UTC (rev 79918)
@@ -27,7 +27,6 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.jpa.deployers.test.deployment.DeploymentTestCase;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.junit.AfterClass;
@@ -41,7 +40,7 @@
*/
public abstract class PersistenceTestCase
{
- private static MainDeployerTestDelegate delegate;
+ protected static MainDeployerTestDelegate delegate;
@AfterClass
public static void afterClass() throws Exception
@@ -52,13 +51,13 @@
@BeforeClass
public static void beforeClass() throws Exception
{
- delegate = new MainDeployerTestDelegate(DeploymentTestCase.class);
+ delegate = new MainDeployerTestDelegate(PersistenceTestCase.class);
delegate.setUp();
delegate.deploy("/org/jboss/jpa/deployers/test/common/jndi-beans.xml");
delegate.deploy("/org/jboss/jpa/deployers/test/common/jbossts-beans.xml");
- delegate.deploy("/org/jboss/jpa/deployers/test/deployment/derby-beans.xml");
- //delegate.deploy("/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.xml");
+ delegate.deploy("/org/jboss/jpa/deployers/test/common/derby-beans.xml");
+ delegate.deploy("/org/jboss/jpa/deployers/test/common/jpa-deployers-beans.xml");
}
protected void deploy(String spec) throws DeploymentException, IOException
Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.java 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.java 2008-10-22 11:27:49 UTC (rev 79918)
@@ -28,40 +28,19 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.jpa.deployers.test.common.MainDeployerTestDelegate;
+import org.jboss.jpa.deployers.test.common.PersistenceTestCase;
import org.jboss.jpa.spi.PersistenceUnit;
import org.jboss.jpa.spi.PersistenceUnitRegistry;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
* @version $Revision: $
*/
-public class DeploymentTestCase
+public class DeploymentTestCase extends PersistenceTestCase
{
- private static MainDeployerTestDelegate delegate;
-
- @AfterClass
- public static void afterClass() throws Exception
- {
- delegate.tearDown();
- }
-
- @BeforeClass
- public static void beforeClass() throws Exception
- {
- delegate = new MainDeployerTestDelegate(DeploymentTestCase.class);
- delegate.setUp();
-
- delegate.deploy("/org/jboss/jpa/deployers/test/common/jndi-beans.xml");
- delegate.deploy("/org/jboss/jpa/deployers/test/common/jbossts-beans.xml");
- delegate.deploy("derby-beans.xml");
- }
-
@Test
public void test1() throws Exception
{
Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.java 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.java 2008-10-22 11:27:49 UTC (rev 79918)
@@ -31,13 +31,11 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.jpa.deployers.test.common.MainDeployerTestDelegate;
import org.jboss.jpa.deployers.test.common.MockRegionFactory;
+import org.jboss.jpa.deployers.test.common.PersistenceTestCase;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -47,27 +45,8 @@
*
* @version $Revision: $
*/
-public class SessionFactoryNameTestCase
+public class SessionFactoryNameTestCase extends PersistenceTestCase
{
- private static MainDeployerTestDelegate delegate;
-
- @AfterClass
- public static void afterClass() throws Exception
- {
- delegate.tearDown();
- }
-
- @BeforeClass
- public static void beforeClass() throws Exception
- {
- delegate = new MainDeployerTestDelegate(SessionFactoryNameTestCase.class);
- delegate.setUp();
-
- delegate.deploy("/org/jboss/jpa/deployers/test/common/jndi-beans.xml");
- delegate.deploy("/org/jboss/jpa/deployers/test/common/jbossts-beans.xml");
- delegate.deploy("derby-beans.xml");
- }
-
@After
public void after() throws Exception
{
Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.java 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.java 2008-10-22 11:27:49 UTC (rev 79918)
@@ -31,13 +31,11 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.jpa.deployers.test.common.MainDeployerTestDelegate;
import org.jboss.jpa.deployers.test.common.MockRegionFactory;
+import org.jboss.jpa.deployers.test.common.PersistenceTestCase;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -47,27 +45,8 @@
*
* @version $Revision: $
*/
-public class SecondLevelCacheRegionPrefixTestCase
+public class SecondLevelCacheRegionPrefixTestCase extends PersistenceTestCase
{
- private static MainDeployerTestDelegate delegate;
-
- @AfterClass
- public static void afterClass() throws Exception
- {
- delegate.tearDown();
- }
-
- @BeforeClass
- public static void beforeClass() throws Exception
- {
- delegate = new MainDeployerTestDelegate(SecondLevelCacheRegionPrefixTestCase.class);
- delegate.setUp();
-
- delegate.deploy("/org/jboss/jpa/deployers/test/common/jndi-beans.xml");
- delegate.deploy("/org/jboss/jpa/deployers/test/common/jbossts-beans.xml");
- delegate.deploy("derby-beans.xml");
- }
-
@After
public void after() throws Exception
{
Copied: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/derby-beans.xml (from rev 79915, projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/derby-beans.xml)
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/derby-beans.xml (rev 0)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/derby-beans.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- As a 'mock' DataSource we use Derby -->
+ <bean name="DerbyService" class="org.jboss.jpa.deployers.test.common.DerbyService"/>
+</deployment>
\ No newline at end of file
Copied: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/jpa-deployers-beans.xml (from rev 79915, projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.xml)
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/jpa-deployers-beans.xml (rev 0)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/common/jpa-deployers-beans.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="DataSourceDependencyResolver" class="org.jboss.jpa.deployers.test.common.SimpleDataSourceDependencyResolver"/>
+
+ <bean name="JavaEEModuleInformer" class="org.jboss.jpa.deployers.test.common.SimpleJavaEEModuleInformer"/>
+
+ <bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
+
+ <bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
+
+ <bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
+ <bean name="PersistenceUnitDeployer" class="org.jboss.jpa.deployers.PersistenceUnitDeployer">
+ <property name="defaultPersistenceProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>hibernate.transaction.manager_lookup_class</key>
+ <value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+</deployment>
Deleted: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.xml 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/DeploymentTestCase.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="DataSourceDependencyResolver" class="org.jboss.jpa.deployers.test.common.SimpleDataSourceDependencyResolver"/>
-
- <bean name="JavaEEModuleInformer" class="org.jboss.jpa.deployers.test.common.SimpleJavaEEModuleInformer"/>
-
- <bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
-
- <bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
-
- <bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
- <bean name="PersistenceUnitDeployer" class="org.jboss.jpa.deployers.PersistenceUnitDeployer">
- <property name="defaultPersistenceProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>hibernate.transaction.manager_lookup_class</key>
- <value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
- </entry>
- </map>
- </property>
- </bean>
-</deployment>
Deleted: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/derby-beans.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/derby-beans.xml 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/derby-beans.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- As a 'mock' DataSource we use Derby -->
- <bean name="DerbyService" class="org.jboss.jpa.deployers.test.common.DerbyService"/>
-</deployment>
\ No newline at end of file
Deleted: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.xml 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/SessionFactoryNameTestCase.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="DataSourceDependencyResolver" class="org.jboss.jpa.deployers.test.common.SimpleDataSourceDependencyResolver"/>
-
- <bean name="JavaEEModuleInformer" class="org.jboss.jpa.deployers.test.common.SimpleJavaEEModuleInformer"/>
-
- <bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
-
- <bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
-
- <bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
- <bean name="PersistenceUnitDeployer" class="org.jboss.jpa.deployers.PersistenceUnitDeployer">
- <property name="defaultPersistenceProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>hibernate.transaction.manager_lookup_class</key>
- <value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
- </entry>
- </map>
- </property>
- </bean>
-</deployment>
Deleted: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/derby-beans.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/derby-beans.xml 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/ejbthree893/derby-beans.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- As a 'mock' DataSource we use Derby -->
- <bean name="DerbyService" class="org.jboss.jpa.deployers.test.common.DerbyService"/>
-</deployment>
\ No newline at end of file
Deleted: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.xml 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/SecondLevelCacheRegionPrefixTestCase.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="DataSourceDependencyResolver" class="org.jboss.jpa.deployers.test.common.SimpleDataSourceDependencyResolver"/>
-
- <bean name="JavaEEModuleInformer" class="org.jboss.jpa.deployers.test.common.SimpleJavaEEModuleInformer"/>
-
- <bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
-
- <bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
-
- <bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
- <bean name="PersistenceUnitDeployer" class="org.jboss.jpa.deployers.PersistenceUnitDeployer">
- <property name="defaultPersistenceProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>hibernate.transaction.manager_lookup_class</key>
- <value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
- </entry>
- </map>
- </property>
- </bean>
-</deployment>
Deleted: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/derby-beans.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/derby-beans.xml 2008-10-22 11:02:20 UTC (rev 79917)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/jbas6111/derby-beans.xml 2008-10-22 11:27:49 UTC (rev 79918)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- As a 'mock' DataSource we use Derby -->
- <bean name="DerbyService" class="org.jboss.jpa.deployers.test.common.DerbyService"/>
-</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list