From cf3b80082a38ecc72ce8632e63c82858c5dac4b6 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Wed, 12 May 2010 17:03:00 +0000 Subject: [PATCH] Separating the test code for the JPA projects in a separate directory so the eclipselink and toplink support libs can be deployed on maven central. --- security/jpatest/pom.xml | 16 +++++ test/eclipselink/pom.xml | 32 ---------- .../eclipselink/DatabaseUtilsTest.java | 27 -------- .../eclipselink/MyEntityExampleTest.java | 25 -------- test/hibernate/pom.xml | 18 ------ .../hibernate/DatabaseUtilsTest.java | 27 -------- .../hibernate/MyEntityExampleTest.java | 25 -------- .../TransactionProxyFactoryTest.java | 8 --- test/jpatest-eclipselink/pom.xml | 9 +-- .../eclipselink/EclipselinkJpaCustomizer.java | 59 ------------------ .../eclipselink/EclipselinkTables.java | 34 ----------- ....wamblee.support.persistence.JpaCustomizer | 1 - test/jpatest-hibernate/pom.xml | 9 +-- .../hibernate/HibernateJpaCustomizer.java | 61 ------------------- .../hibernate/HibernateTables.java | 34 ----------- ....wamblee.support.persistence.JpaCustomizer | 1 - test/jpatest-toplink-essentials/pom.xml | 9 +-- .../toplink/ToplinkJpaCustomizer.java | 61 ------------------- .../persistence/toplink/ToplinkTables.java | 34 ----------- ....wamblee.support.persistence.JpaCustomizer | 1 - test/pom.xml | 7 ++- test/toplink-essentials/pom.xml | 28 --------- .../toplink/DatabaseUtilsTest.java | 27 -------- .../toplink/MyEntityExampleTest.java | 25 -------- 24 files changed, 27 insertions(+), 551 deletions(-) delete mode 100644 test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java delete mode 100644 test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java delete mode 100644 test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java delete mode 100644 test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java delete mode 100644 test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java delete mode 100644 test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java delete mode 100644 test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java delete mode 100644 test/jpatest-eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer delete mode 100644 test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java delete mode 100644 test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java delete mode 100644 test/jpatest-hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer delete mode 100644 test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java delete mode 100644 test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java delete mode 100644 test/jpatest-toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer delete mode 100644 test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java delete mode 100644 test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java diff --git a/security/jpatest/pom.xml b/security/jpatest/pom.xml index 5d43ea0d..cc2f1ef8 100644 --- a/security/jpatest/pom.xml +++ b/security/jpatest/pom.xml @@ -48,6 +48,22 @@ 0.2.4-SNAPSHOT test + + org.eclipse.persistence + javax.persistence + 2.0.0 + + + + javax.persistence + persistence-api + + + + org.eclipse.persistence + eclipselink + + diff --git a/test/eclipselink/pom.xml b/test/eclipselink/pom.xml index ce12dcb6..347f53b4 100644 --- a/test/eclipselink/pom.xml +++ b/test/eclipselink/pom.xml @@ -20,43 +20,11 @@ 0.2.4-SNAPSHOT - - org.wamblee - wamblee-test-enterprise - 0.2.4-SNAPSHOT - test-jar - - org.dbunit dbunit - - org.eclipse.persistence - javax.persistence - 2.0.0 - - - - javax.persistence - persistence-api - - - - org.eclipse.persistence - eclipselink - - - - - EclipseLink Repo - http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo - - - - - diff --git a/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java b/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java deleted file mode 100644 index 3fbf2f20..00000000 --- a/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/DatabaseUtilsTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.eclipselink; - -import org.wamblee.support.persistence.DatabaseUtilsTestBase; - -/** - * - * @author $author$ - * @version $Revision$ - */ -public class DatabaseUtilsTest extends DatabaseUtilsTestBase { - // Empty, all tests inherited -} diff --git a/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java b/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java deleted file mode 100644 index e95afb8f..00000000 --- a/test/eclipselink/src/test/java/org/wamblee/support/persistence/eclipselink/MyEntityExampleTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.eclipselink; - -import org.wamblee.support.persistence.MyEntityExampleTestBase; - -/** - * This class shows an example of how to test an entity using jpa. - */ -public class MyEntityExampleTest extends MyEntityExampleTestBase { - // Empty, all tests are inherited -} diff --git a/test/hibernate/pom.xml b/test/hibernate/pom.xml index fa7273bd..e9d9060a 100644 --- a/test/hibernate/pom.xml +++ b/test/hibernate/pom.xml @@ -20,29 +20,11 @@ 0.2.4-SNAPSHOT - - org.wamblee - wamblee-test-enterprise - 0.2.4-SNAPSHOT - test-jar - - org.dbunit dbunit - - javax.persistence - persistence-api - - - - org.wamblee - wamblee-hibernate-jpa - 0.2.4-SNAPSHOT - - diff --git a/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java b/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java deleted file mode 100644 index 6059c956..00000000 --- a/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/DatabaseUtilsTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.hibernate; - -import org.wamblee.support.persistence.DatabaseUtilsTestBase; - -/** - * - * @author $author$ - * @version $Revision$ - */ -public class DatabaseUtilsTest extends DatabaseUtilsTestBase { - // Empty, all tests inherited -} diff --git a/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java b/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java deleted file mode 100644 index 3ac32a5d..00000000 --- a/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/MyEntityExampleTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.hibernate; - -import org.wamblee.support.persistence.MyEntityExampleTestBase; - -/** - * This class shows an example of how to test an entity using jpa. - */ -public class MyEntityExampleTest extends MyEntityExampleTestBase { - // Empty, all tests are inherited -} diff --git a/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java b/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java deleted file mode 100644 index df057b5a..00000000 --- a/test/hibernate/src/test/java/org/wamblee/support/persistence/hibernate/TransactionProxyFactoryTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.wamblee.support.persistence.hibernate; - -import org.wamblee.support.persistence.TransactionProxyFactoryTestBase; - -public class TransactionProxyFactoryTest extends - TransactionProxyFactoryTestBase { - -} diff --git a/test/jpatest-eclipselink/pom.xml b/test/jpatest-eclipselink/pom.xml index d7de88ff..e3461b88 100644 --- a/test/jpatest-eclipselink/pom.xml +++ b/test/jpatest-eclipselink/pom.xml @@ -10,13 +10,13 @@ org.wamblee wamblee-test-jpatest-eclipselink jar - /test/eclipselink + /test/jpatest-eclipselink http://wamblee.org org.wamblee - wamblee-test-enterprise + wamblee-test-eclipselink 0.2.4-SNAPSHOT @@ -27,11 +27,6 @@ test-jar - - org.dbunit - dbunit - - org.eclipse.persistence javax.persistence diff --git a/test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java b/test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java deleted file mode 100644 index 1679942b..00000000 --- a/test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkJpaCustomizer.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.eclipselink; - -import org.dbunit.dataset.filter.ITableFilterSimple; - -import org.wamblee.io.FileSystemUtils; -import org.wamblee.support.persistence.JpaCustomizer; -import org.wamblee.support.persistence.PersistenceUnitDescription; - -import java.io.File; -import java.util.Map; - -/** - * - * @author $author$ - * @version $Revision$ - */ -public class EclipselinkJpaCustomizer implements JpaCustomizer { - /** - * Creates a new EclipselinkJpaCustomizer object. - */ - public EclipselinkJpaCustomizer() { - // Empty - } - - @Override - public void customize(PersistenceUnitDescription aPersistenceUnit, - Map aJpaProperties) { - - // DDL generation - aJpaProperties.put("eclipselink.ddl-generation", "create-tables"); - - // DDL generation - FileSystemUtils.createDir(new File("target/sql")); - aJpaProperties.put("eclipselink.application-location", "target/sql"); - aJpaProperties.put("eclipselink.create-ddl-jdbc-file-name", "create-schema.sql"); - aJpaProperties.put("eclipselink.drop-ddl-jdbc-file-name", "drop-schema.sql"); - aJpaProperties.put("eclipselink.ddl-generation.output-mode", "both"); - } - - @Override - public ITableFilterSimple getJpaTables() { - return new EclipselinkTables(); - } -} diff --git a/test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java b/test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java deleted file mode 100644 index 29872d01..00000000 --- a/test/jpatest-eclipselink/src/main/java/org/wamblee/support/persistence/eclipselink/EclipselinkTables.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.eclipselink; - -import org.dbunit.dataset.DataSetException; -import org.dbunit.dataset.filter.ITableFilterSimple; - -import java.util.Arrays; -import java.util.List; - -/** - * Toplink-specific tables. - */ -public class EclipselinkTables implements ITableFilterSimple { - private static final List TABLES = Arrays - .asList(new String[] { "SEQUENCE" }); - - public boolean accept(String aTableName) throws DataSetException { - return TABLES.contains(aTableName); - } -} diff --git a/test/jpatest-eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/jpatest-eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer deleted file mode 100644 index 35638de1..00000000 --- a/test/jpatest-eclipselink/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.wamblee.support.persistence.eclipselink.EclipselinkJpaCustomizer diff --git a/test/jpatest-hibernate/pom.xml b/test/jpatest-hibernate/pom.xml index a13fe256..3df0051b 100644 --- a/test/jpatest-hibernate/pom.xml +++ b/test/jpatest-hibernate/pom.xml @@ -10,13 +10,13 @@ org.wamblee wamblee-test-jpatest-hibernate jar - /test/hibernate + /test/jpatest-hibernate http://wamblee.org org.wamblee - wamblee-test-enterprise + wamblee-test-hibernate 0.2.4-SNAPSHOT @@ -27,11 +27,6 @@ test-jar - - org.dbunit - dbunit - - javax.persistence persistence-api diff --git a/test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java b/test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java deleted file mode 100644 index 71bbb18c..00000000 --- a/test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateJpaCustomizer.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.hibernate; - -import org.dbunit.dataset.filter.ITableFilterSimple; - -import org.wamblee.support.persistence.JpaCustomizer; -import org.wamblee.support.persistence.PersistenceUnitDescription; - -import java.util.Map; - -/** - * - * @author $author$ - * @version $Revision$ - */ -public class HibernateJpaCustomizer implements JpaCustomizer { - /** - * Creates a new HibernateJpaCustomizer object. - */ - public HibernateJpaCustomizer() { - // Empty - } - - @Override - public void customize(PersistenceUnitDescription aPersistenceUnit, - Map aJpaProperties) { - - System.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "true"); - - // Set non-JPA connection properties for older versions of hibernate - System.getProperties().remove("hibernate.connection.datasource"); - if (System.getProperty("hibernate.connection.datasource") != null ) { - throw new RuntimeException("ERROR"); - } - System.setProperty("hibernate.connection.url", aJpaProperties.get("javax.persistence.jdbc.url")); - System.setProperty("hibernate.connection.username", aJpaProperties.get("javax.persistence.jdbc.user")); - System.setProperty("hibernate.connection.password", aJpaProperties.get("javax.persistence.jdbc.password")); - - // Hibernate schema generation - aJpaProperties.put("hibernate.hbm2ddl.auto", "create"); - } - - @Override - public ITableFilterSimple getJpaTables() { - return new HibernateTables(); - } -} diff --git a/test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java b/test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java deleted file mode 100644 index f58ea8e9..00000000 --- a/test/jpatest-hibernate/src/main/java/org/wamblee/support/persistence/hibernate/HibernateTables.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.hibernate; - -import org.dbunit.dataset.DataSetException; -import org.dbunit.dataset.filter.ITableFilterSimple; - -import java.util.Arrays; -import java.util.List; - -/** - * Toplink-specific tables. - */ -public class HibernateTables implements ITableFilterSimple { - private static final List TABLES = Arrays - .asList(new String[] { "" }); - - public boolean accept(String aTableName) throws DataSetException { - return TABLES.contains(aTableName); - } -} diff --git a/test/jpatest-hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/jpatest-hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer deleted file mode 100644 index d057634d..00000000 --- a/test/jpatest-hibernate/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.wamblee.support.persistence.hibernate.HibernateJpaCustomizer diff --git a/test/jpatest-toplink-essentials/pom.xml b/test/jpatest-toplink-essentials/pom.xml index df6c33a9..03f2f213 100644 --- a/test/jpatest-toplink-essentials/pom.xml +++ b/test/jpatest-toplink-essentials/pom.xml @@ -10,13 +10,13 @@ org.wamblee wamblee-test-jpatest-toplink-essentials jar - /test/toplinkessentials + /test/jpatest-toplinkessentials http://wamblee.org org.wamblee - wamblee-test-enterprise + wamblee-test-toplink-essentials 0.2.4-SNAPSHOT @@ -27,11 +27,6 @@ test-jar - - org.dbunit - dbunit - - javax.persistence persistence-api diff --git a/test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java b/test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java deleted file mode 100644 index 1b3808f0..00000000 --- a/test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkJpaCustomizer.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.toplink; - -import java.io.File; -import java.util.Map; - -import org.dbunit.dataset.filter.ITableFilterSimple; -import org.wamblee.io.FileSystemUtils; -import org.wamblee.support.persistence.JpaCustomizer; -import org.wamblee.support.persistence.PersistenceUnitDescription; - -/** - * - * @author $author$ - * @version $Revision$ - */ -public class ToplinkJpaCustomizer implements JpaCustomizer { - /** - * Creates a new ToplinkJpaCustomizer object. - */ - public ToplinkJpaCustomizer() { - // Empty - } - - @Override - public void customize(PersistenceUnitDescription aPersistenceUnit, - Map aJpaProperties) { - - // Custom datasource properties. - aJpaProperties.put("toplink.jdbc.url", aJpaProperties.get("javax.persistence.jdbc.url")); - aJpaProperties.put("toplink.jdbc.user", aJpaProperties.get("javax.persistence.jdbc.user")); - aJpaProperties.put("toplink.jdbc.password", aJpaProperties.get("javax.persistence.jdbc.password")); - - // DDL generation for toplink - aJpaProperties.put("toplink.ddl-generation", "create-tables"); - - // DDL generation - FileSystemUtils.createDir(new File("target/sql")); - aJpaProperties.put("toplink.create-ddl-jdbc-file-name", "target/sql/create-schema.sql"); - aJpaProperties.put("toplink.drop-ddl-jdbc-file-name", "target/sql/drop-schema.sql"); - } - - @Override - public ITableFilterSimple getJpaTables() { - return new ToplinkTables(); - } -} diff --git a/test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java b/test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java deleted file mode 100644 index 4a99d7de..00000000 --- a/test/jpatest-toplink-essentials/src/main/java/org/wamblee/support/persistence/toplink/ToplinkTables.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.toplink; - -import org.dbunit.dataset.DataSetException; -import org.dbunit.dataset.filter.ITableFilterSimple; - -import java.util.Arrays; -import java.util.List; - -/** - * Toplink-specific tables. - */ -public class ToplinkTables implements ITableFilterSimple { - private static final List TABLES = Arrays - .asList(new String[] { "SEQUENCE" }); - - public boolean accept(String aTableName) throws DataSetException { - return TABLES.contains(aTableName); - } -} diff --git a/test/jpatest-toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer b/test/jpatest-toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer deleted file mode 100644 index 82d1265a..00000000 --- a/test/jpatest-toplink-essentials/src/main/resources/META-INF/services/org.wamblee.support.persistence.JpaCustomizer +++ /dev/null @@ -1 +0,0 @@ -org.wamblee.support.persistence.toplink.ToplinkJpaCustomizer diff --git a/test/pom.xml b/test/pom.xml index 74ebfe59..341bb272 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -16,6 +16,8 @@ enterprise hibernate + eclipselink + toplink-essentials @@ -27,8 +29,9 @@ - eclipselink - toplink-essentials + jpatest-hibernate + jpatest-eclipselink + jpatest-toplink-essentials diff --git a/test/toplink-essentials/pom.xml b/test/toplink-essentials/pom.xml index 85d29f95..52e043c7 100644 --- a/test/toplink-essentials/pom.xml +++ b/test/toplink-essentials/pom.xml @@ -20,39 +20,11 @@ 0.2.4-SNAPSHOT - - org.wamblee - wamblee-test-enterprise - 0.2.4-SNAPSHOT - test-jar - - org.dbunit dbunit - - javax.persistence - persistence-api - - - - toplink.essentials - toplink-essentials - - - - - - javaee - Java EE repo at SUN - http://download.java.net/maven/1 - legacy - - - - diff --git a/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java b/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java deleted file mode 100644 index c45ea93c..00000000 --- a/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/DatabaseUtilsTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.toplink; - -import org.wamblee.support.persistence.DatabaseUtilsTestBase; - -/** - * - * @author $author$ - * @version $Revision$ - */ -public class DatabaseUtilsTest extends DatabaseUtilsTestBase { - // Empty, all tests inherited -} diff --git a/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java b/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java deleted file mode 100644 index 8d60e75e..00000000 --- a/test/toplink-essentials/src/test/java/org/wamblee/support/persistence/toplink/MyEntityExampleTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2005-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.wamblee.support.persistence.toplink; - -import org.wamblee.support.persistence.MyEntityExampleTestBase; - -/** - * This class shows an example of how to test an entity using jpa. - */ -public class MyEntityExampleTest extends MyEntityExampleTestBase { - // Empty, all tests are inherited -} -- 2.31.1