Author: jeff.yuchang Date: 2009-11-27 02:33:08 -0500 (Fri, 27 Nov 2009) New Revision: 344 Modified: branches/ODE/ODE-1.x-jpa/Rakefile-riftsaw branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataProperty.java Log: * update the @Column to @JoinColumn for @ManyToOne, @OneToOne. otherwise, it won't work against Hibernate. * now it is only configured to generate the hsql db's script. (will need to test it under riftsaw env first before producing other db's script) Modified: branches/ODE/ODE-1.x-jpa/Rakefile-riftsaw =================================================================== --- branches/ODE/ODE-1.x-jpa/Rakefile-riftsaw 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/Rakefile-riftsaw 2009-11-27 07:33:08 UTC (rev 344) @@ -189,7 +189,7 @@ libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server", - "utils", "dao-jpa", "agents"), + "utils", "dao-jpa","dao-jpa-ojpa", "dao-jpa-hibernate", "agents"), AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.lang, COMMONS.logging, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail, JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JIBX, @@ -285,6 +285,7 @@ package :jar end + desc "ODE Interface Layers Common" define "bpel-epr" do compile.with projects("utils", "bpel-dao", "bpel-api"), @@ -440,15 +441,31 @@ package(:zip).include(derby_db) end - desc "ODE OpenJPA DAO Implementation" + desc "ODE JPA DAO Implementation" define "dao-jpa" do compile.with projects("bpel-api", "bpel-dao", "utils"), COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, - OPENJPA, XERCES - compile { open_jpa_enhance } + XERCES package :jar end + desc "ODE OpenJPA DAO Implementation" + define "dao-jpa-ojpa" do + compile.with projects("bpel-api", "bpel-dao", "utils", "dao-jpa"), + COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, + OPENJPA, XERCES + compile { open_jpa_enhance } + package :jar + end + + desc "ODE Hibernate DAO Implementation" + define "dao-jpa-hibernate" do + compile.with projects("bpel-api", "bpel-dao", "utils", "dao-jpa"), + COMMONS.collections, COMMONS.logging, JAVAX.connector, JAVAX.persistence, JAVAX.transaction, + XERCES + package :jar + end + desc "ODE OpenJPA Derby Database" define "dao-jpa-ojpa-derby" do %w{ derby mysql oracle }.each do |db| @@ -458,14 +475,14 @@ partial_sql = file("target/partial.#{db}.sql"=>db_xml) do |task| mkpath _("target"), :verbose=>false Buildr::OpenJPA.mapping_tool :properties=>db_xml, :action=>"build", :sql=>task.name, - :classpath=>projects("bpel-store", "dao-jpa", "bpel-api", "bpel-dao", "utils" ) + :classpath=>projects("bpel-store", "dao-jpa","dao-jpa-ojpa", "bpel-api", "bpel-dao", "utils" ) end sql = concat(_("target/#{db}.sql")=>[_("src/main/scripts/license-header.sql"), common_sql, partial_sql, scheduler_sql]) build sql end derby_db = Derby.create(_("target/derby/jpadb")=>_("target/derby.sql")) - test.with projects("bpel-api", "bpel-dao", "bpel-obj", "bpel-epr", "dao-jpa", "utils"), + test.with projects("bpel-api", "bpel-dao", "dao-jpa-ojpa", "bpel-obj", "bpel-epr", "dao-jpa", "utils"), BACKPORT, COMMONS.collections, COMMONS.lang, COMMONS.logging, GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, HSQLDB, JAVAX.connector, JAVAX.ejb, JAVAX.persistence, JAVAX.transaction, LOG4J, OPENJPA, XERCES, WSDL4J @@ -502,7 +519,7 @@ libs = artifacts(package(:jar), projects("bpel-api", "bpel-api-jca", "bpel-compiler", "bpel-connector", "bpel-dao", "bpel-epr", "jca-ra", "jca-server", "bpel-obj", "bpel-ql", "bpel-runtime", - "scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate", "dao-jpa", + "scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate", "dao-jpa", "dao-jpa-ojpa", "dao-jpa-hibernate", "jacob", "jacob-ap", "utils", "agents"), ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.dbcp, COMMONS.lang, COMMONS.pool, COMMONS.primitives, DERBY, GERONIMO.connector, GERONIMO.transaction, JAXEN, JAVAX.connector, Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -31,6 +31,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -77,7 +78,7 @@ // _instances is unused because this is a one-way relationship at the database level @SuppressWarnings("unused") - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="INSTANCE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="INSTANCE_ID") private ProcessInstanceDAOImpl _instance; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java 2009-11-27 07:33:08 UTC (rev 344) @@ -26,6 +26,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -55,7 +56,7 @@ @Basic @Column(name="CORRSET_ID", insertable=false, updatable=false, nullable=true) private Long corrSetId; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="CORRSET_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="CORRSET_ID") private CorrelationSetDAOImpl _corrSet; public CorrSetProperty() { Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -33,6 +33,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -70,7 +71,7 @@ @OneToMany(targetEntity=CorrSetProperty.class,mappedBy="_corrSet",fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) private Collection<CorrSetProperty> _props = new ArrayList<CorrSetProperty>(); - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="SCOPE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="SCOPE_ID") private ScopeDAOImpl _scope; public CorrelationSetDAOImpl() {} Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -23,6 +23,7 @@ import org.apache.ode.bpel.dao.*; import javax.persistence.*; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -47,7 +48,7 @@ private Collection<MessageRouteDAOImpl> _routes = new ArrayList<MessageRouteDAOImpl>(); @OneToMany(targetEntity=MessageExchangeDAOImpl.class,mappedBy="_correlator",fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) private Collection<MessageExchangeDAOImpl> _exchanges = new ArrayList<MessageExchangeDAOImpl>(); - @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROC_ID") + @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROC_ID") private ProcessDAOImpl _process; public CorrelatorDAOImpl(){} Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -29,6 +29,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -65,9 +66,9 @@ @Basic @Column(name="SCOPE_ID") private Long _scopeId; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_ID") private ProcessDAOImpl _process; - @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="INSTANCE_ID") + @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="INSTANCE_ID") private ProcessInstanceDAOImpl _instance; @Lob @Column(name="DATA") private BpelEvent _event; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -33,6 +33,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -63,7 +64,7 @@ private Element _element; @Transient private Element _headerElement; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @Column(name="MESSAGE_EXCHANGE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @JoinColumn(name="MESSAGE_EXCHANGE_ID") private MessageExchangeDAOImpl _messageExchange; public MessageDAOImpl() { Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -34,6 +34,7 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -104,18 +105,18 @@ @OneToMany(targetEntity=MexProperty.class,mappedBy="_mex",fetch=FetchType.EAGER,cascade={CascadeType.ALL}) private Collection<MexProperty> _props = new ArrayList<MexProperty>(); - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_INSTANCE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_INSTANCE_ID") private ProcessInstanceDAOImpl _processInst; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PARTNER_LINK_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PARTNER_LINK_ID") private PartnerLinkDAOImpl _partnerLink; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_ID") private ProcessDAOImpl _process; - @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @Column(name="REQUEST_MESSAGE_ID") + @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @JoinColumn(name="REQUEST_MESSAGE_ID") private MessageDAOImpl _request; - @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @Column(name="RESPONSE_MESSAGE_ID") + @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @JoinColumn(name="RESPONSE_MESSAGE_ID") private MessageDAOImpl _response; - @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="CORR_ID") + @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="CORR_ID") private CorrelatorDAOImpl _correlator; public MessageExchangeDAOImpl() { Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -32,6 +32,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -62,10 +63,10 @@ @SuppressWarnings("unused") @Basic @Column(name="PROCESS_INSTANCE_ID", insertable=false, updatable=false, nullable=true) private int _instanceId; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_INSTANCE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_INSTANCE_ID") private ProcessInstanceDAOImpl _processInst; - @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="CORR_ID") + @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="CORR_ID") @SuppressWarnings("unused") private CorrelatorDAOImpl _correlator; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java 2009-11-27 07:33:08 UTC (rev 344) @@ -27,6 +27,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -56,7 +57,7 @@ @Basic @Column(name="MEX_ID", insertable=false, updatable=false, nullable=true) private String _mexId; @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) - @Column(name="MEX_ID") + @JoinColumn(name="MEX_ID") @SuppressWarnings("unused") private MessageExchangeDAOImpl _mex; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -32,6 +32,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -78,7 +79,7 @@ @SuppressWarnings("unused") @Basic @Column(name="SCOPE_ID", nullable=true, insertable=false, updatable=false) private Long _scopeId; - @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="SCOPE_ID") + @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="SCOPE_ID") @SuppressWarnings("unused") private ScopeDAOImpl _scope; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -45,6 +45,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -99,7 +100,7 @@ @Basic @Column(name="DATE_CREATED") private Date _dateCreated = new Date(); - @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) @Column(name="ROOT_SCOPE_ID") + @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) @JoinColumn(name="ROOT_SCOPE_ID") private ScopeDAOImpl _rootScope; @OneToMany(targetEntity=ScopeDAOImpl.class,mappedBy="_processInstance",fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) private Collection<ScopeDAO> _scopes = new ArrayList<ScopeDAO>(); @@ -109,11 +110,11 @@ @SuppressWarnings("unused") @Basic @Column(name="FAULT_ID", insertable=false, updatable=false, nullable=true) private long _faultId; - @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) @Column(name="FAULT_ID") + @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) @JoinColumn(name="FAULT_ID") private FaultDAOImpl _fault; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_ID") private ProcessDAOImpl _process; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="INSTANTIATING_CORRELATOR_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="INSTANTIATING_CORRELATOR_ID") private CorrelatorDAOImpl _instantiatingCorrelator; @OneToMany(targetEntity=MessageExchangeDAOImpl.class,mappedBy="_processInst",fetch=FetchType.LAZY) Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -35,6 +35,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -70,7 +71,7 @@ private String _scopeState; @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) - @Column(name="PARENT_SCOPE_ID") + @JoinColumn(name="PARENT_SCOPE_ID") private ScopeDAOImpl _parentScope; @OneToMany(targetEntity=ScopeDAOImpl.class,mappedBy="_parentScope",fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @@ -81,7 +82,7 @@ private Collection<PartnerLinkDAO> _partnerLinks = new ArrayList<PartnerLinkDAO>(); @OneToMany(targetEntity=XmlDataDAOImpl.class,mappedBy="_scope",fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.REFRESH, CascadeType.PERSIST}) private Collection<XmlDataDAO> _variables = new ArrayList<XmlDataDAO>(); - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_INSTANCE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_INSTANCE_ID") private ProcessInstanceDAOImpl _processInstance; public ScopeDAOImpl() {} Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java 2009-11-27 07:33:08 UTC (rev 344) @@ -35,6 +35,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; @@ -79,7 +80,7 @@ @SuppressWarnings("unused") @Basic @Column(name="SCOPE_ID", nullable=true, insertable=false, updatable=false) private Long _scopeId; - @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="SCOPE_ID") + @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="SCOPE_ID") private ScopeDAOImpl _scope; public XmlDataDAOImpl() {} Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataProperty.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataProperty.java 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataProperty.java 2009-11-27 07:33:08 UTC (rev 344) @@ -27,6 +27,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -56,7 +57,7 @@ @Basic @Column(name="XML_DATA_ID", insertable=false, updatable=false, nullable=true) private Long _xmlDataId; @ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) - @Column(name="XML_DATA_ID") + @JoinColumn(name="XML_DATA_ID") @SuppressWarnings("unused") private XmlDataDAOImpl _xmlData; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2009-11-27 07:33:08 UTC (rev 344) @@ -41,4 +41,4 @@ </target> -</project> \ No newline at end of file +</project> Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml 2009-11-27 07:33:08 UTC (rev 344) @@ -20,15 +20,15 @@ <dependencies> <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-tools</artifactId> <version>${hibernate-tools-version}</version> - </dependency> + </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.4.2</version> @@ -37,7 +37,12 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.4.2</version> - </dependency> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -51,9 +56,29 @@ <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-jpa</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-dao-jpa-hibernate</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-dao</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-api</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-utils</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <!-- Database Drivers --> <dependency> <groupId>mysql</groupId> Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2009-11-27 06:27:43 UTC (rev 343) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2009-11-27 07:33:08 UTC (rev 344) @@ -21,12 +21,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"> <persistence-unit name="ode-dao"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> + <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class> - <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class> - <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class> - <class>org.apache.ode.dao.jpa.EventDAOImpl</class> + <class>org.apache.ode.dao.jpa.FaultDAOImpl</class> <class>org.apache.ode.dao.jpa.MessageDAOImpl</class> <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class> @@ -39,6 +36,10 @@ <class>org.apache.ode.dao.jpa.CorrSetProperty</class> <class>org.apache.ode.dao.jpa.MexProperty</class> <class>org.apache.ode.dao.jpa.XmlDataProperty</class> + <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class> + <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class> + <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class> + <class>org.apache.ode.dao.jpa.EventDAOImpl</class> <properties> <property name="hibernate.show_sql" value="false" />