You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2008/12/13 18:12:43 UTC
svn commit: r726235 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model:
Tmodel.java TmodelDocDescr.java TmodelOverview.java
Author: tcunning
Date: Sat Dec 13 09:12:42 2008
New Revision: 726235
URL: http://svn.apache.org/viewvc?rev=726235&view=rev
Log:
JUDDI-145
Added relationships between Tmodel/TmodelOverview/TmodelDocDescr.
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=726235&r1=726234&r2=726235&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Sat Dec 13 09:12:42 2008
@@ -27,11 +27,15 @@
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
import javax.persistence.Table;
+import org.uddi.api_v3.OverviewDoc;
+
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@Entity
@Table(name = "tmodel")
@@ -42,6 +46,7 @@
private String name;
private String langCode;
private boolean deleted;
+ private Set<TmodelOverview> overviewDocs = new HashSet<TmodelOverview>(0);
private Set<TmodelDescr> tmodelDescrs = new HashSet<TmodelDescr>(0);
private Set<TmodelDocDescr> tmodelDocDescrs = new HashSet<TmodelDocDescr>(0);
private Set<TmodelIdentifier> tmodelIdentifiers = new HashSet<TmodelIdentifier>(0);
@@ -57,6 +62,7 @@
}
public Tmodel(String entityKey, String authorizedName, UddiEntityPublisher publisher, String operator,
String name, String langCode, boolean deleted, Date lastUpdate,
+ Set<TmodelOverview> overviewDocs,
Set<TmodelDescr> tmodelDescrs, Set<TmodelDocDescr> tmodelDocDescrs,
Set<TmodelIdentifier> tmodelIdentifiers,
TmodelCategoryBag categoryBag) {
@@ -66,6 +72,7 @@
this.langCode = langCode;
this.deleted = deleted;
this.lastUpdate = lastUpdate;
+ this.overviewDocs = overviewDocs;
this.tmodelDescrs = tmodelDescrs;
this.tmodelDocDescrs = tmodelDocDescrs;
this.tmodelIdentifiers = tmodelIdentifiers;
@@ -104,6 +111,16 @@
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
+ @OrderBy
+ public Set<TmodelOverview> getOverviewDocs() {
+ return this.overviewDocs;
+ }
+
+ public void setOverviewDocs(Set<TmodelOverview> overviewDocs) {
+ this.overviewDocs = overviewDocs;
+ }
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
public Set<TmodelDescr> getTmodelDescrs() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java?rev=726235&r1=726234&r2=726235&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java Sat Dec 13 09:12:42 2008
@@ -28,6 +28,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@Entity
@Table(name = "tmodel_doc_descr")
@@ -36,20 +37,23 @@
private static final long serialVersionUID = 1L;
private Long id;
private Tmodel tmodel;
+ private TmodelOverview tmodeloverview;
private String langCode;
private String descr;
public TmodelDocDescr() {
}
- public TmodelDocDescr(Tmodel tmodel, String descr) {
+ public TmodelDocDescr(Tmodel tmodel, TmodelOverview tmodeloverview, String descr) {
this.tmodel = tmodel;
+ this.tmodeloverview = tmodeloverview;
this.descr = descr;
}
- public TmodelDocDescr(Tmodel tmodel, String langCode,
+ public TmodelDocDescr(Tmodel tmodel, TmodelOverview tmodeloverview, String langCode,
String descr) {
this.tmodel = tmodel;
+ this.tmodeloverview = tmodeloverview;
this.langCode = langCode;
this.descr = descr;
}
@@ -72,6 +76,15 @@
this.tmodel = tmodel;
}
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "tmodel_doc_descr", nullable = false, insertable = false, updatable = false)
+ public TmodelOverview getTmodeloverview() {
+ return this.tmodeloverview;
+ }
+ public void setTmodeloverview(TmodelOverview tmodeloverview) {
+ this.tmodeloverview = tmodeloverview;
+ }
+
@Column(name = "lang_code", length = 5)
public String getLangCode() {
return this.langCode;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java?rev=726235&r1=726234&r2=726235&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelOverview.java Sat Dec 13 09:12:42 2008
@@ -15,13 +15,21 @@
* limitations under the License.
*/
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
import javax.persistence.Table;
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
@Entity
@Table(name = "tmodel_overview")
@@ -29,21 +37,24 @@
private static final long serialVersionUID = 1L;
private int tmodelOverviewId;
- private String tmodelKey;
+ private Tmodel tmodel;
private String overviewUrl;
+ private Set<TmodelDocDescr> docDescrs = new HashSet<TmodelDocDescr>(0);
public TmodelOverview() {
}
- public TmodelOverview(int tmodelOverviewId, String tmodelKey) {
+ public TmodelOverview(int tmodelOverviewId, Tmodel tmodel) {
this.tmodelOverviewId = tmodelOverviewId;
- this.tmodelKey = tmodelKey;
+ this.tmodel = tmodel;
}
- public TmodelOverview(int tmodelOverviewId, String tmodelKey,
- String overviewUrl) {
+
+ public TmodelOverview(int tmodelOverviewId, Tmodel tmodel,
+ String overviewUrl, Set<TmodelDocDescr> docDescrs) {
this.tmodelOverviewId = tmodelOverviewId;
- this.tmodelKey = tmodelKey;
+ this.tmodel = tmodel;
this.overviewUrl = overviewUrl;
+ this.docDescrs = docDescrs;
}
@Id
@@ -57,13 +68,13 @@
this.tmodelOverviewId = tmodelOverviewId;
}
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
+ @Column(name = "tmodel", nullable = false, length = 255)
+ public Tmodel getTmodel() {
+ return this.tmodel;
}
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
+ public void setTmodel(Tmodel tmodel) {
+ this.tmodel = tmodel;
}
@Column(name = "overview_url")
@@ -75,4 +86,13 @@
this.overviewUrl = overviewUrl;
}
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodeloverview")
+ @OrderBy
+ public Set<TmodelDocDescr> getDocDescriptions() {
+ return this.docDescrs;
+ }
+
+ public void setDocDescriptions(Set<TmodelDocDescr> docDescrs) {
+ this.docDescrs = docDescrs;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org