From d3e937094bda6783099819b90e17815d7def2f26 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 29 Aug 2013 12:00:55 -0300 Subject: [PATCH] Remoção do glassfish-resources.xml. Agora as conexões JNDI utilizam o nome padrão do Glassfish --- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java | 10 ++++++++-- impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java | 10 ++++++++-- impl/extension/jdbc/src/test/resources/arquillian.xml | 6 ------ impl/extension/jdbc/src/test/resources/glassfish-resources.xml | 48 ------------------------------------------------ impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties | 2 +- impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties | 2 +- impl/extension/jpa/src/test/resources/arquillian.xml | 6 ------ impl/extension/jpa/src/test/resources/glassfish-resources.xml | 48 ------------------------------------------------ impl/extension/jpa/src/test/resources/productor/persistence.xml | 4 ++-- impl/extension/jpa/src/test/resources/template/persistence.xml | 2 +- impl/extension/jpa/src/test/resources/transaction/interceptor/persistence.xml | 4 ++-- impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml | 6 +++--- 12 files changed, 26 insertions(+), 122 deletions(-) delete mode 100644 impl/extension/jdbc/src/test/resources/glassfish-resources.xml delete mode 100644 impl/extension/jpa/src/test/resources/glassfish-resources.xml diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java index e39095f..a7403c4 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerMultipleConnectionsTest.java @@ -37,9 +37,12 @@ package connection.producer; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.sql.Connection; import java.sql.SQLException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.inject.Inject; @@ -85,7 +88,10 @@ public class ConnectionProducerMultipleConnectionsTest { assertEquals(conn1.getMetaData().getURL(), "jdbc:hsqldb:mem:hsql1"); assertEquals(conn2.getMetaData().getURL(), "jdbc:hsqldb:mem:hsql2"); assertEquals(conn3.getMetaData().getURL(), "jdbc:hsqldb:mem:hsql3"); - assertEquals(conn4.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); - } + String regexp = "^jdbc:derby:(.*)/databases/embedded_default$"; + Pattern pattern = Pattern.compile(regexp); + Matcher matcher = pattern.matcher(conn4.getMetaData().getURL()); + assertTrue(matcher.matches()); + } } diff --git a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java index e79ad8f..8bb72cd 100644 --- a/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java +++ b/impl/extension/jdbc/src/test/java/connection/producer/ConnectionProducerWithJndiTest.java @@ -36,10 +36,12 @@ */ package connection.producer; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.sql.Connection; import java.sql.SQLException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.inject.Inject; @@ -70,6 +72,10 @@ public class ConnectionProducerWithJndiTest { @Test public void createConnection() throws SQLException { - assertEquals(conn1.getMetaData().getURL(), "jdbc:derby:target/databases/derby"); + String regexp = "^jdbc:derby:(.*)/databases/embedded_default$"; + Pattern pattern = Pattern.compile(regexp); + Matcher matcher = pattern.matcher(conn1.getMetaData().getURL()); + + assertTrue(matcher.matches()); } } diff --git a/impl/extension/jdbc/src/test/resources/arquillian.xml b/impl/extension/jdbc/src/test/resources/arquillian.xml index 775e12e..f0fefde 100644 --- a/impl/extension/jdbc/src/test/resources/arquillian.xml +++ b/impl/extension/jdbc/src/test/resources/arquillian.xml @@ -51,10 +51,4 @@ --> - - - - src/test/resources/glassfish-resources.xml - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml b/impl/extension/jdbc/src/test/resources/glassfish-resources.xml deleted file mode 100644 index ca2bc9d..0000000 --- a/impl/extension/jdbc/src/test/resources/glassfish-resources.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties index ee62e2d..a14fed8 100644 --- a/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties +++ b/impl/extension/jdbc/src/test/resources/producer/multiple-connections/demoiselle.properties @@ -48,6 +48,6 @@ frameworkdemoiselle.persistence.conn3.url=jdbc:hsqldb:mem:hsql3 frameworkdemoiselle.persistence.conn3.username=sa frameworkdemoiselle.persistence.conn3.password= -frameworkdemoiselle.persistence.conn4.jndi.name=jdbc/arquillian +frameworkdemoiselle.persistence.conn4.jndi.name=jdbc/__default frameworkdemoiselle.persistence.default.datasource.name=conn3 diff --git a/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties index b023a52..07257b6 100644 --- a/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties +++ b/impl/extension/jdbc/src/test/resources/producer/with-jndi/demoiselle.properties @@ -33,4 +33,4 @@ # ou escreva para a Fundação do Software Livre (FSF) Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. -frameworkdemoiselle.persistence.conn1.jndi.name=jdbc/arquillian +frameworkdemoiselle.persistence.conn1.jndi.name=jdbc/__default diff --git a/impl/extension/jpa/src/test/resources/arquillian.xml b/impl/extension/jpa/src/test/resources/arquillian.xml index ab3823f..5c654aa 100644 --- a/impl/extension/jpa/src/test/resources/arquillian.xml +++ b/impl/extension/jpa/src/test/resources/arquillian.xml @@ -51,10 +51,4 @@ --> - - - - src/test/resources/glassfish-resources.xml - - diff --git a/impl/extension/jpa/src/test/resources/glassfish-resources.xml b/impl/extension/jpa/src/test/resources/glassfish-resources.xml deleted file mode 100644 index 9b60b35..0000000 --- a/impl/extension/jpa/src/test/resources/glassfish-resources.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/impl/extension/jpa/src/test/resources/productor/persistence.xml b/impl/extension/jpa/src/test/resources/productor/persistence.xml index 0726506..124971e 100644 --- a/impl/extension/jpa/src/test/resources/productor/persistence.xml +++ b/impl/extension/jpa/src/test/resources/productor/persistence.xml @@ -38,7 +38,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - java:jboss/datasources/ExampleDS + jdbc/__default productor.MyEntity @@ -50,7 +50,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default productor.MyEntity diff --git a/impl/extension/jpa/src/test/resources/template/persistence.xml b/impl/extension/jpa/src/test/resources/template/persistence.xml index f049360..9a99fff 100644 --- a/impl/extension/jpa/src/test/resources/template/persistence.xml +++ b/impl/extension/jpa/src/test/resources/template/persistence.xml @@ -54,7 +54,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default template.MyEntity diff --git a/impl/extension/jpa/src/test/resources/transaction/interceptor/persistence.xml b/impl/extension/jpa/src/test/resources/transaction/interceptor/persistence.xml index 0e389f3..0781423 100644 --- a/impl/extension/jpa/src/test/resources/transaction/interceptor/persistence.xml +++ b/impl/extension/jpa/src/test/resources/transaction/interceptor/persistence.xml @@ -68,7 +68,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default transaction.interceptor.MyEntity1 transaction.interceptor.MyEntity2 @@ -81,7 +81,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default transaction.interceptor.MyEntity1 transaction.interceptor.MyEntity2 diff --git a/impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml b/impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml index a3a3014..b1bb951 100644 --- a/impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml +++ b/impl/extension/jpa/src/test/resources/transaction/manual/persistence.xml @@ -68,7 +68,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default transaction.manual.MyEntity1 transaction.manual.MyEntity2 @@ -81,7 +81,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default transaction.manual.MyEntity1 transaction.manual.MyEntity2 @@ -94,7 +94,7 @@ - java:jboss/datasources/ExampleDS + jdbc/__default transaction.manual.MyEntity1 transaction.manual.MyEntity2 -- libgit2 0.21.2