This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 1f8fec3 test: "hibernate.hbm2ddl.auto" set to "update" for mem db;
unique persistence name
1f8fec3 is described below
commit 1f8fec397203db2e0b046d8239e31860d0e4b444
Author: amarkevich <[email protected]>
AuthorDate: Wed Apr 10 12:31:32 2019 +0300
test: "hibernate.hbm2ddl.auto" set to "update" for mem db; unique
persistence name
---
.../cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java | 2 +-
rt/rs/extensions/search/src/test/resources/META-INF/persistence.xml | 4 ++--
.../cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java | 2 +-
.../cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 2 +-
.../oauth-parent/oauth2/src/test/resources/META-INF/persistence.xml | 4 ++--
.../cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.xml | 2 +-
.../org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java | 2 +-
rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml | 4 ++--
.../org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.xml | 2 +-
systests/rs-security/src/test/resources/META-INF/persistence.xml | 4 ++--
.../jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml | 2 +-
.../cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml | 2 +-
.../systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml | 2 +-
.../cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml | 2 +-
.../apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml | 2 +-
17 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index 6192df4..35fe5a9 100644
---
a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -68,7 +68,7 @@ public abstract class AbstractJPATypedQueryVisitorTest {
fail("Exception during HSQL database init.");
}
try {
- emFactory =
Persistence.createEntityManagerFactory("testUnitHibernate");
+ emFactory =
Persistence.createEntityManagerFactory("test-hibernate-cxf-rt-rs-extension-search");
em = emFactory.createEntityManager();
em.getTransaction().begin();
diff --git
a/rt/rs/extensions/search/src/test/resources/META-INF/persistence.xml
b/rt/rs/extensions/search/src/test/resources/META-INF/persistence.xml
index 30197cb..44ed5a2 100644
--- a/rt/rs/extensions/search/src/test/resources/META-INF/persistence.xml
+++ b/rt/rs/extensions/search/src/test/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
version="2.0">
- <persistence-unit name="testUnitHibernate"
transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="test-hibernate-cxf-rt-rs-extension-search"
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.cxf.jaxrs.ext.search.jpa.Book</class>
<class>org.apache.cxf.jaxrs.ext.search.jpa.Library</class>
@@ -12,7 +12,7 @@
<property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:books-jpa"/>
<property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
<property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="javax.persistence.validation.mode" value="none"/>
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index 38523ee..1eebf27 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -63,7 +63,7 @@ public class JPACodeDataProviderTest {
}
protected String getPersistenceUnitName() {
- return "testUnitHibernate";
+ return "test-hibernate-cxf-rt-rs-security-oauth2";
}
protected void initializeProvider(JPACodeDataProvider dataProvider) {
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index d391220..0925783 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -44,7 +44,7 @@ public class JPAOAuthDataProviderTest extends
AbstractOAuthDataProviderTest {
}
protected String getPersistenceUnitName() {
- return "testUnitHibernate";
+ return "test-hibernate-cxf-rt-rs-security-oauth2";
}
@After
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/resources/META-INF/persistence.xml
b/rt/rs/security/oauth-parent/oauth2/src/test/resources/META-INF/persistence.xml
index 1b1e147..7e00113 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/resources/META-INF/persistence.xml
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
version="2.0">
- <persistence-unit name="testUnitHibernate"
transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="test-hibernate-cxf-rt-rs-security-oauth2"
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.cxf.rs.security.oauth2.common.Client</class>
<class>org.apache.cxf.rs.security.oauth2.common.UserSubject</class>
@@ -21,7 +21,7 @@
<property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:oauth-jpa"/>
<property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
<property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="javax.persistence.validation.mode" value="none"/>
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/resources/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.xml
b/rt/rs/security/oauth-parent/oauth2/src/test/resources/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.xml
index 52a7ed0..90eaced 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/resources/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.xml
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/resources/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTCodeDataProvider.xml
@@ -74,7 +74,7 @@ under the License.
<!--<property name="generateDdl" value="true"/>-->
<!--</bean>-->
<!--</property>-->
- <property name="persistenceUnitName" value="testUnitHibernate"/>
+ <property name="persistenceUnitName"
value="test-hibernate-cxf-rt-rs-security-oauth2"/>
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size" value="400"/>
diff --git
a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index f987896..0f816d8 100644
---
a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++
b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -63,7 +63,7 @@ public class JPAOidcUserSubjectTest {
}
protected String getPersistenceUnitName() {
- return "testUnitHibernate";
+ return "test-hibernate-cxf-rt-rs-security-sso-oidc";
}
@Test
diff --git
a/rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml
b/rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml
index 5f522c0..38a0948 100644
--- a/rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml
+++ b/rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
version="2.0">
- <persistence-unit name="testUnitHibernate"
transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="test-hibernate-cxf-rt-rs-security-sso-oidc"
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.cxf.rs.security.oidc.idp.OidcUserSubject</class>
<class>org.apache.cxf.rs.security.oauth2.common.Client</class>
@@ -19,7 +19,7 @@
<property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:oauth-jpa"/>
<property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
<property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="javax.persistence.validation.mode" value="none"/>
diff --git
a/rt/rs/security/sso/oidc/src/test/resources/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.xml
b/rt/rs/security/sso/oidc/src/test/resources/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.xml
index 0e52c73..79298e8 100644
---
a/rt/rs/security/sso/oidc/src/test/resources/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.xml
+++
b/rt/rs/security/sso/oidc/src/test/resources/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.xml
@@ -75,7 +75,7 @@ under the License.
<!--<property name="generateDdl" value="true"/>-->
<!--</bean>-->
<!--</property>-->
- <property name="persistenceUnitName" value="testUnitHibernate"/>
+ <property name="persistenceUnitName"
value="test-hibernate-cxf-rt-rs-security-sso-oidc"/>
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size" value="400"/>
diff --git a/systests/rs-security/src/test/resources/META-INF/persistence.xml
b/systests/rs-security/src/test/resources/META-INF/persistence.xml
index b724038..ca34221 100644
--- a/systests/rs-security/src/test/resources/META-INF/persistence.xml
+++ b/systests/rs-security/src/test/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
version="2.0">
- <persistence-unit name="testUnitHibernate"
transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="test-hibernate-cxf-systests-rs-security"
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.apache.cxf.rs.security.oauth2.common.Client</class>
<class>org.apache.cxf.rs.security.oauth2.common.UserSubject</class>
@@ -20,7 +20,7 @@
<property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:oauth-jpa"/>
<property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
<property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="javax.persistence.validation.mode" value="none"/>
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
index b75be09..9a23d78 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server-jpa.xml
@@ -65,7 +65,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
index 13d709a..604b554 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server-jpa.xml
@@ -65,7 +65,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
index 928964c..eea246b 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server-jpa.xml
@@ -65,7 +65,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
index 72636e2..1127162 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server-jpa.xml
@@ -62,7 +62,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
index ada2fc0..0519ad3 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server-jpa.xml
@@ -65,7 +65,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
index 28808aa..135d384 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
@@ -65,7 +65,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
diff --git
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
index b96dce6..fd386fb 100644
---
a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
+++
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server-jpa.xml
@@ -65,7 +65,7 @@ under the License.
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="persistenceUnitName"
- value="testUnitHibernate" />
+ value="test-hibernate-cxf-systests-rs-security" />
<property name="jpaPropertyMap">
<map>
<entry key="hibernate.jdbc.fetch_size"
value="400" />
