You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/09/19 18:59:36 UTC
svn commit: r697151 - in /activemq/camel/trunk: ./ components/camel-bam/
components/camel-bam/src/main/java/org/apache/camel/bam/model/
components/camel-jpa/
components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/
Author: hadrian
Date: Fri Sep 19 09:59:36 2008
New Revision: 697151
URL: http://svn.apache.org/viewvc?rev=697151&view=rev
Log:
CAMEL-922. Use dependency on geronimo-jpa spec instead of persistence-api.
Modified:
activemq/camel/trunk/components/camel-bam/pom.xml
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
activemq/camel/trunk/components/camel-jpa/pom.xml
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/pom.xml?rev=697151&r1=697150&r2=697151&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/pom.xml (original)
+++ activemq/camel/trunk/components/camel-bam/pom.xml Fri Sep 19 09:59:36 2008
@@ -56,9 +56,8 @@
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
</dependency>
<!-- testing -->
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java?rev=697151&r1=697150&r2=697151&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java Fri Sep 19 09:59:36 2008
@@ -22,13 +22,17 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
+import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
/**
* @version $Revision$
*/
@Entity
-@UniqueConstraint(columnNames = {"name" })
+@Table(
+ name="ACTIVITYDEFINITION",
+ uniqueConstraints=@UniqueConstraint(columnNames = {"name"})
+)
public class ActivityDefinition extends EntitySupport {
private String name;
private ProcessDefinition processDefinition;
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java?rev=697151&r1=697150&r2=697151&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java Fri Sep 19 09:59:36 2008
@@ -21,6 +21,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import org.apache.camel.util.ObjectHelper;
@@ -33,7 +34,10 @@
* @version $Revision$
*/
@Entity
-@UniqueConstraint(columnNames = {"name" })
+@Table(
+ name="PROCESSDEFINITION",
+ uniqueConstraints=@UniqueConstraint(columnNames = {"name"})
+)
public class ProcessDefinition extends EntitySupport {
private static final transient Log LOG = LogFactory.getLog(ProcessDefinition.class);
private String name;
Modified: activemq/camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/pom.xml?rev=697151&r1=697150&r2=697151&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jpa/pom.xml Fri Sep 19 09:59:36 2008
@@ -49,13 +49,9 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <optional>true</optional>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
@@ -64,20 +60,19 @@
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</dependency>
+ <!-- testing -->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <optional>true</optional>
+ <scope>test</scope>
</dependency>
-
-
- <!-- testing -->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java?rev=697151&r1=697150&r2=697151&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java (original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java Fri Sep 19 09:59:36 2008
@@ -19,13 +19,17 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
/**
* @version $Revision$
*/
@Entity
-@UniqueConstraint(columnNames = {"processorName", "messageId" })
+@Table(
+ name="MESSAGEPROCESSED",
+ uniqueConstraints=@UniqueConstraint(columnNames = {"processorName", "messageId"})
+)
public class MessageProcessed {
private Long id;
private String messageId;
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=697151&r1=697150&r2=697151&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Sep 19 09:59:36 2008
@@ -629,6 +629,12 @@
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
<!-- Optional Spring Support -->
<dependency>
<groupId>org.springframework</groupId>