Author: cmueller
Date: Tue May 29 21:34:41 2012
New Revision: 1344006
URL: http://svn.apache.org/viewvc?rev=1344006&view=rev
Log:
CAMEL-4734: Consolidate the database vendors in our unit tests
Removed:
camel/trunk/components/camel-bam/src/test/profiles/derby/META-INF/persistence.xml
camel/trunk/components/camel-bam/src/test/profiles/derby/META-INF/spring/spring.xml
camel/trunk/components/camel-bam/src/test/profiles/derby/log4j.properties
camel/trunk/components/camel-bam/src/test/profiles/mysql/META-INF/persistence.xml
camel/trunk/components/camel-bam/src/test/profiles/mysql/META-INF/spring/spring.xml
camel/trunk/components/camel-bam/src/test/profiles/mysql/log4j.properties
Modified:
camel/trunk/components/camel-bam/pom.xml
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml
Modified: camel/trunk/components/camel-bam/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Tue May 29 21:34:41 2012
@@ -14,9 +14,8 @@
the specific language governing permissions and limitations under the
License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -24,7 +23,7 @@
<artifactId>camel-parent</artifactId>
<version>2.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
- </parent>
+ </parent>
<artifactId>camel-bam</artifactId>
<packaging>bundle</packaging>
@@ -65,6 +64,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-juel</artifactId>
<scope>test</scope>
@@ -100,16 +104,16 @@
</build>
<profiles>
- <!-- Hibernate Derby profile -->
+ <!-- Hibernate Derby profile -->
<profile>
- <id>hibernate-derby</id>
+ <id>hibernate</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<testResources>
<testResource>
- <directory>${basedir}/src/test/profiles/derby</directory>
+ <directory>${basedir}/src/test/profiles/hibernate</directory>
</testResource>
</testResources>
</build>
@@ -125,21 +129,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-jta-spec-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
- <!-- EclipseLink HSQLDB profile -->
- <!-- TODO fix the issue of CAMEL-2277 -->
+ <!-- EclipseLink Derby profile -->
<profile>
<id>eclipselink</id>
<build>
@@ -156,11 +153,6 @@
<version>${eclipselink-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<repositories>
<repository>
@@ -170,8 +162,7 @@
</repositories>
</profile>
- <!-- OpenJPA HSQLDB profile -->
- <!-- TODO fix the issue of CAMEL-2277 -->
+ <!-- OpenJPA Derby profile -->
<profile>
<id>openjpa</id>
<build>
@@ -180,15 +171,8 @@
<directory>${basedir}/src/test/profiles/openjpa</directory>
</testResource>
</testResources>
- <resources>
- <resource>
- <directory>${basedir}/src/test/profiles/openjpa</directory>
- </resource>
- </resources>
<plugins>
<plugin>
-
- <!-- Will enhance classes as we run in a non J2EE 5 env <plugin>
-->
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>${openjpa-version}</version>
@@ -202,6 +186,7 @@
</execution>
</executions>
<configuration>
+
<persistenceXmlFile>${project.basedir}/src/test/profiles/openjpa/META-INF/persistence.xml</persistenceXmlFile>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
</configuration>
@@ -228,16 +213,6 @@
<version>${openjpa-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.derby</groupId>-->
- <!--<artifactId>derby</artifactId>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
</dependencies>
</profile>
</profiles>
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
Tue May 29 21:34:41 2012
@@ -40,6 +40,6 @@ public class EntitySupport {
}
public String toString() {
- return getClass().getName() + "[" + id + "]";
+ return getClass().getName() + "[" + getId() + "]";
}
}
Modified:
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml
(original)
+++
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/persistence.xml
Tue May 29 21:34:41 2012
@@ -20,19 +20,15 @@
<class>org.apache.camel.bam.model.ProcessInstance</class>
<properties>
- <property name="javax.persistence.jdbc.driver"
value="org.hsqldb.jdbcDriver" />
- <property name="javax.persistence.jdbc.user" value="sa"
/>
- <property name="javax.persistence.jdbc.password"
value="" />
- <property name="javax.persistence.jdbc.url"
value="jdbc:hsqldb:mem:camel_bam" />
+ <property name="javax.persistence.jdbc.driver"
value="org.apache.derby.jdbc.EmbeddedDriver" />
+ <property name="javax.persistence.jdbc.url"
value="jdbc:derby:target/test/database;create=true" />
<property name="eclipselink.logging.level" value="FINE"
/>
<property name="eclipselink.logging.file"
value="target/camel-eclipselink.log" />
<property name="eclipselink.ddl-generation"
value="drop-and-create-tables" />
- <property name="eclipselink.ddl-generation.output-mode"
- value="database" />
+ <property name="eclipselink.ddl-generation.output-mode"
value="database" />
<!-- <property name="eclipselink.logging.thread"
value="false" />-->
<!-- <property name="eclipselink.logging.session"
value="false" />-->
<!-- <property name="eclipselink.logging.exceptions"
value="false" />-->
</properties>
-
</persistence-unit>
-</persistence>
+</persistence>
\ No newline at end of file
Modified:
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml
(original)
+++
camel/trunk/components/camel-bam/src/test/profiles/eclipselink/META-INF/spring/spring.xml
Tue May 29 21:34:41 2012
@@ -18,8 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean id="transactionTemplate"
-
class="org.springframework.transaction.support.TransactionTemplate">
+ <bean id="transactionTemplate"
class="org.springframework.transaction.support.TransactionTemplate">
<property name="transactionManager">
<bean
class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory"
ref="entityManagerFactory" />
@@ -36,23 +35,9 @@
<property name="jpaVendorAdapter" ref="jpaAdapter"/>
</bean>
- <!-- Hibernate addapter
- <bean id="jpaAdapter"
class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
- <property name="databasePlatform"
value="org.hibernate.dialect.HSQLDialect" />
- </bean>
- -->
-
- <!-- OpenJPA addapter
- <bean id="jpaAdapter"
class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
- <property name="databasePlatform"
value="org.apache.openjpa.jdbc.sql.HSQLDictionary"/>
- <property name="database" value="HSQL"/>
- </bean>
- -->
-
- <!-- EclipseLink adapter -->
<bean id="jpaAdapter"
class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
- <property name="databasePlatform"
value="org.eclipse.persistence.platform.database.HSQLPlatform" />
+ <property name="databasePlatform"
value="org.eclipse.persistence.platform.database.DerbyPlatform" />
+ <property name="database" value="DERBY"/>
<property name="showSql" value="true" />
</bean>
-
-</beans>
+</beans>
\ No newline at end of file
Modified:
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml
(original)
+++
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/persistence.xml
Tue May 29 21:34:41 2012
@@ -25,11 +25,9 @@
<class>org.apache.camel.bam.model.ProcessInstance</class>
<properties>
- <property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
- <property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.connection.password" value=""/>
- <property name="hibernate.connection.url"
value="jdbc:hsqldb:mem:camel_bam"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.DerbyDialect"/>
+ <property name="hibernate.connection.driver_class"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="hibernate.connection.url"
value="jdbc:derby:target/test/database;create=true"/>
<property name="hibernate.hbm2ddl.auto" value="create"/>
</properties>
Modified:
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml
(original)
+++
camel/trunk/components/camel-bam/src/test/profiles/hibernate/META-INF/spring/spring.xml
Tue May 29 21:34:41 2012
@@ -38,7 +38,7 @@
<!-- Hibernate addapter -->
<bean id="jpaAdapter"
class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
- <property name="databasePlatform"
value="org.hibernate.dialect.HSQLDialect" />
+ <property name="databasePlatform"
value="org.hibernate.dialect.DerbyDialect" />
</bean>
</beans>
Modified:
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml
(original)
+++
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/persistence.xml
Tue May 29 21:34:41 2012
@@ -16,7 +16,7 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- version="2.0">
+ version="1.0">
<persistence-unit name="bam" transaction-type="RESOURCE_LOCAL">
<class>org.apache.camel.bam.model.ActivityDefinition</class>
@@ -25,21 +25,10 @@
<class>org.apache.camel.bam.model.ProcessInstance</class>
<properties>
-
- <!-- Derby DB -->
- <!--<property name="openjpa.ConnectionURL"
value="jdbc:derby:target/bamTest;create=true"/>-->
- <!--<property name="openjpa.ConnectionDriverName"
value="org.apache.derby.jdbc.EmbeddedDriver"/>-->
- <!--<property name="openjpa.Log" value="DefaultLevel=INFO, Tool=INFO,
Runtime=TRACE, SQL=TRACE"/>-->
- <!--<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema" />-->
-
- <!-- HSQL DB -->
- <property name="openjpa.ConnectionDriverName"
value="org.hsqldb.jdbcDriver"/>
- <property name="openjpa.ConnectionURL"
value="jdbc:hsqldb:target/bamTest"/>
- <property name="openjpa.Log" value="commons"/>
- <property name="openjpa.ConnectionUserName" value="sa"/>
- <property name="openjpa.ConnectionPassword" value=""/>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
-
+ <property name="openjpa.ConnectionURL"
value="jdbc:derby:target/bamTest;create=true"/>
+ <property name="openjpa.ConnectionDriverName"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="openjpa.Log" value="DefaultLevel=INFO, Tool=INFO,
Runtime=TRACE, SQL=TRACE"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
</properties>
</persistence-unit>
</persistence>
Modified:
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml?rev=1344006&r1=1344005&r2=1344006&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml
(original)
+++
camel/trunk/components/camel-bam/src/test/profiles/openjpa/META-INF/spring/spring.xml
Tue May 29 21:34:41 2012
@@ -18,8 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <bean id="transactionTemplate"
-
class="org.springframework.transaction.support.TransactionTemplate">
+ <bean id="transactionTemplate"
class="org.springframework.transaction.support.TransactionTemplate">
<property name="transactionManager">
<bean
class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory"
ref="entityManagerFactory" />
@@ -36,9 +35,8 @@
<property name="jpaVendorAdapter" ref="jpaAdapter"/>
</bean>
- <!-- OpenJPA adapter -->
<bean id="jpaAdapter"
class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
- <property name="databasePlatform"
value="org.apache.openjpa.jdbc.sql.HSQLDictionary"/>
- <property name="database" value="HSQL"/>
+ <property name="databasePlatform"
value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+ <property name="database" value="DERBY"/>
</bean>
</beans>
