You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2008/09/17 23:56:22 UTC

svn commit: r696477 - in /webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model: BindingTemplate.java BusinessEntity.java BusinessService.java Tmodel.java UddiEntity.java

Author: jfaath
Date: Wed Sep 17 14:56:22 2008
New Revision: 696477

URL: http://svn.apache.org/viewvc?rev=696477&view=rev
Log:
Removed old UddiEntity class as an entity parent and turned it into a super-class.  Adjusted the relevant classes to use the new UddiEntity as a superclass.

Added:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java   (with props)
Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=696477&r1=696476&r2=696477&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Wed Sep 17 14:56:22 2008
@@ -28,48 +28,38 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
  */
 @Entity
 @Table(name = "binding_template")
-public class BindingTemplate implements java.io.Serializable {
+public class BindingTemplate extends UddiEntity implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private String bindingKey;
-	private UddiEntity uddiEntity;
 	private BusinessService businessService;
 	private String accessPointType;
 	private String accessPointUrl;
 	private String hostingRedirector;
-	private Date lastUpdate;
-	private Set<BindingCategory> bindingCategories = new HashSet<BindingCategory>(
-			0);
-	private Set<TmodelInstanceInfo> tmodelInstanceInfos = new HashSet<TmodelInstanceInfo>(
-			0);
+	private Set<BindingCategory> bindingCategories = new HashSet<BindingCategory>(0);
+	private Set<TmodelInstanceInfo> tmodelInstanceInfos = new HashSet<TmodelInstanceInfo>(0);
 	private Set<BindingDescr> bindingDescrs = new HashSet<BindingDescr>(0);
 
 	public BindingTemplate() {
 	}
 
-	public BindingTemplate(String bindingKey, UddiEntity uddiEntity,
-			BusinessService businessService, Date lastUpdate) {
+	public BindingTemplate(String bindingKey, BusinessService businessService, Date lastUpdate) {
 		this.bindingKey = bindingKey;
-		this.uddiEntity = uddiEntity;
 		this.businessService = businessService;
 		this.lastUpdate = lastUpdate;
 	}
-	public BindingTemplate(String bindingKey, UddiEntity uddiEntity,
-			BusinessService businessService, String accessPointType,
+	public BindingTemplate(String bindingKey, BusinessService businessService, String accessPointType,
 			String accessPointUrl, String hostingRedirector, Date lastUpdate,
 			Set<BindingCategory> bindingCategories,
 			Set<TmodelInstanceInfo> tmodelInstanceInfos,
 			Set<BindingDescr> bindingDescrs) {
 		this.bindingKey = bindingKey;
-		this.uddiEntity = uddiEntity;
 		this.businessService = businessService;
 		this.accessPointType = accessPointType;
 		this.accessPointUrl = accessPointUrl;
@@ -85,27 +75,15 @@
 	public String getBindingKey() {
 		return this.bindingKey;
 	}
-
 	public void setBindingKey(String bindingKey) {
 		this.bindingKey = bindingKey;
 	}
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "binding_key", unique = true, nullable = false, insertable = false, updatable = false)
 
-	public UddiEntity getUddiEntity() {
-		return this.uddiEntity;
-	}
-
-	public void setUddiEntity(UddiEntity uddiEntity) {
-		this.uddiEntity = uddiEntity;
-	}
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "service_key", nullable = false)
-
 	public BusinessService getBusinessService() {
 		return this.businessService;
 	}
-
 	public void setBusinessService(BusinessService businessService) {
 		this.businessService = businessService;
 	}
@@ -114,7 +92,6 @@
 	public String getAccessPointType() {
 		return this.accessPointType;
 	}
-
 	public void setAccessPointType(String accessPointType) {
 		this.accessPointType = accessPointType;
 	}
@@ -123,7 +100,6 @@
 	public String getAccessPointUrl() {
 		return this.accessPointUrl;
 	}
-
 	public void setAccessPointUrl(String accessPointUrl) {
 		this.accessPointUrl = accessPointUrl;
 	}
@@ -132,42 +108,31 @@
 	public String getHostingRedirector() {
 		return this.hostingRedirector;
 	}
-
 	public void setHostingRedirector(String hostingRedirector) {
 		this.hostingRedirector = hostingRedirector;
 	}
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "last_update", nullable = false, length = 29)
 
-	public Date getLastUpdate() {
-		return this.lastUpdate;
-	}
-
-	public void setLastUpdate(Date lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bindingTemplate")
 	public Set<BindingCategory> getBindingCategories() {
 		return this.bindingCategories;
 	}
-
 	public void setBindingCategories(Set<BindingCategory> bindingCategories) {
 		this.bindingCategories = bindingCategories;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bindingTemplate")
 	public Set<TmodelInstanceInfo> getTmodelInstanceInfos() {
 		return this.tmodelInstanceInfos;
 	}
-
 	public void setTmodelInstanceInfos(
 			Set<TmodelInstanceInfo> tmodelInstanceInfos) {
 		this.tmodelInstanceInfos = tmodelInstanceInfos;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bindingTemplate")
 	public Set<BindingDescr> getBindingDescrs() {
 		return this.bindingDescrs;
 	}
-
 	public void setBindingDescrs(Set<BindingDescr> bindingDescrs) {
 		this.bindingDescrs = bindingDescrs;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=696477&r1=696476&r2=696477&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Wed Sep 17 14:56:22 2008
@@ -24,27 +24,21 @@
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
  */
 @Entity
 @Table(name = "business_entity")
-public class BusinessEntity implements java.io.Serializable {
+public class BusinessEntity extends UddiEntity implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private String businessKey;
-	private UddiEntity uddiEntity;
 	private String authorizedName;
 	private String publisherId;
 	private String operator;
-	private Date lastUpdate;
 	private Set<Contact> contacts = new HashSet<Contact>(0);
 	private Set<BusinessIdentifier> businessIdentifiers = new HashSet<BusinessIdentifier>(0);
 	private Set<PublisherAssertion> publisherAssertionsForFromKey = new HashSet<PublisherAssertion>(0);
@@ -58,16 +52,14 @@
 	public BusinessEntity() {
 	}
 
-	public BusinessEntity(String businessKey, UddiEntity uddiEntity,
-			String authorizedName, String operator, Date lastUpdate) {
+	public BusinessEntity(String businessKey, String authorizedName, String operator, Date lastUpdate) {
 		this.businessKey = businessKey;
-		this.uddiEntity = uddiEntity;
 		this.authorizedName = authorizedName;
 		this.operator = operator;
 		this.lastUpdate = lastUpdate;
 	}
-	public BusinessEntity(String businessKey, UddiEntity uddiEntity,
-			String authorizedName, String publisherId, String operator,
+	public BusinessEntity(String businessKey, String authorizedName, 
+			String publisherId, String operator,
 			Date lastUpdate, Set<Contact> contacts,
 			Set<BusinessIdentifier> businessIdentifiers,
 			Set<PublisherAssertion> publisherAssertionsForFromKey,
@@ -77,7 +69,6 @@
 			Set<BusinessService> businessServices,
 			Set<BusinessDescr> businessDescrs) {
 		this.businessKey = businessKey;
-		this.uddiEntity = uddiEntity;
 		this.authorizedName = authorizedName;
 		this.publisherId = publisherId;
 		this.operator = operator;
@@ -98,27 +89,15 @@
 	public String getBusinessKey() {
 		return this.businessKey;
 	}
-
 	public void setBusinessKey(String businessKey) {
 		this.businessKey = businessKey;
 	}
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "business_key", unique = true, nullable = false, insertable = false, updatable = false)
-
-	public UddiEntity getUddiEntity() {
-		return this.uddiEntity;
-	}
-
-	public void setUddiEntity(UddiEntity uddiEntity) {
-		this.uddiEntity = uddiEntity;
-	}
+	
 
 	@Column(name = "authorized_name", nullable = false)
-
 	public String getAuthorizedName() {
 		return this.authorizedName;
 	}
-
 	public void setAuthorizedName(String authorizedName) {
 		this.authorizedName = authorizedName;
 	}
@@ -127,102 +106,89 @@
 	public String getPublisherId() {
 		return this.publisherId;
 	}
-
 	public void setPublisherId(String publisherId) {
 		this.publisherId = publisherId;
 	}
 
 	@Column(name = "operator", nullable = false)
-
 	public String getOperator() {
 		return this.operator;
 	}
-
 	public void setOperator(String operator) {
 		this.operator = operator;
 	}
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "last_update", nullable = false, length = 29)
-
-	public Date getLastUpdate() {
-		return this.lastUpdate;
-	}
 
-	public void setLastUpdate(Date lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<Contact> getContacts() {
 		return this.contacts;
 	}
-
 	public void setContacts(Set<Contact> contacts) {
 		this.contacts = contacts;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<BusinessIdentifier> getBusinessIdentifiers() {
 		return this.businessIdentifiers;
 	}
-
 	public void setBusinessIdentifiers(
 			Set<BusinessIdentifier> businessIdentifiers) {
 		this.businessIdentifiers = businessIdentifiers;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntityByFromKey")
 	public Set<PublisherAssertion> getPublisherAssertionsForFromKey() {
 		return this.publisherAssertionsForFromKey;
 	}
-
 	public void setPublisherAssertionsForFromKey(
 			Set<PublisherAssertion> publisherAssertionsForFromKey) {
 		this.publisherAssertionsForFromKey = publisherAssertionsForFromKey;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<DiscoveryUrl> getDiscoveryUrls() {
 		return this.discoveryUrls;
 	}
-
 	public void setDiscoveryUrls(Set<DiscoveryUrl> discoveryUrls) {
 		this.discoveryUrls = discoveryUrls;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<BusinessName> getBusinessNames() {
 		return this.businessNames;
 	}
-
 	public void setBusinessNames(Set<BusinessName> businessNames) {
 		this.businessNames = businessNames;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntityByToKey")
 	public Set<PublisherAssertion> getPublisherAssertionsForToKey() {
 		return this.publisherAssertionsForToKey;
 	}
-
 	public void setPublisherAssertionsForToKey(
 			Set<PublisherAssertion> publisherAssertionsForToKey) {
 		this.publisherAssertionsForToKey = publisherAssertionsForToKey;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<BusinessCategory> getBusinessCategories() {
 		return this.businessCategories;
 	}
-
 	public void setBusinessCategories(Set<BusinessCategory> businessCategories) {
 		this.businessCategories = businessCategories;
 	}
+	
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<BusinessService> getBusinessServices() {
 		return this.businessServices;
 	}
-
 	public void setBusinessServices(Set<BusinessService> businessServices) {
 		this.businessServices = businessServices;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
 	public Set<BusinessDescr> getBusinessDescrs() {
 		return this.businessDescrs;
 	}
-
 	public void setBusinessDescrs(Set<BusinessDescr> businessDescrs) {
 		this.businessDescrs = businessDescrs;
 	}

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java?rev=696477&r1=696476&r2=696477&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java Wed Sep 17 14:56:22 2008
@@ -28,21 +28,17 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
  */
 @Entity
 @Table(name = "business_service")
-public class BusinessService implements java.io.Serializable {
+public class BusinessService extends UddiEntity implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private String serviceKey;
 	private BusinessEntity businessEntity;
-	private UddiEntity uddiEntity;
-	private Date lastUpdate;
 	private Set<ServiceName> serviceNames = new HashSet<ServiceName>(0);
 	private Set<ServiceDescr> serviceDescrs = new HashSet<ServiceDescr>(0);
 	private Set<BindingTemplate> bindingTemplates = new HashSet<BindingTemplate>(0);
@@ -51,21 +47,17 @@
 	public BusinessService() {
 	}
 
-	public BusinessService(String serviceKey, BusinessEntity businessEntity,
-			UddiEntity uddiEntity, Date lastUpdate) {
+	public BusinessService(String serviceKey, BusinessEntity businessEntity, Date lastUpdate) {
 		this.serviceKey = serviceKey;
 		this.businessEntity = businessEntity;
-		this.uddiEntity = uddiEntity;
 		this.lastUpdate = lastUpdate;
 	}
-	public BusinessService(String serviceKey, BusinessEntity businessEntity,
-			UddiEntity uddiEntity, Date lastUpdate,
+	public BusinessService(String serviceKey, BusinessEntity businessEntity, Date lastUpdate,
 			Set<ServiceName> serviceNames, Set<ServiceDescr> serviceDescrs,
 			Set<BindingTemplate> bindingTemplates,
 			Set<ServiceCategory> serviceCategories) {
 		this.serviceKey = serviceKey;
 		this.businessEntity = businessEntity;
-		this.uddiEntity = uddiEntity;
 		this.lastUpdate = lastUpdate;
 		this.serviceNames = serviceNames;
 		this.serviceDescrs = serviceDescrs;
@@ -78,69 +70,47 @@
 	public String getServiceKey() {
 		return this.serviceKey;
 	}
-
 	public void setServiceKey(String serviceKey) {
 		this.serviceKey = serviceKey;
 	}
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "business_key", nullable = false)
-
 	public BusinessEntity getBusinessEntity() {
 		return this.businessEntity;
 	}
-
 	public void setBusinessEntity(BusinessEntity businessEntity) {
 		this.businessEntity = businessEntity;
 	}
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "business_key", nullable = false, insertable = false, updatable = false)
-
-	public UddiEntity getUddiEntity() {
-		return this.uddiEntity;
-	}
-
-	public void setUddiEntity(UddiEntity uddiEntity) {
-		this.uddiEntity = uddiEntity;
-	}
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "last_update", nullable = false, length = 29)
-
-	public Date getLastUpdate() {
-		return this.lastUpdate;
-	}
 
-	public void setLastUpdate(Date lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessService")
 	public Set<ServiceName> getServiceNames() {
 		return this.serviceNames;
 	}
-
 	public void setServiceNames(Set<ServiceName> serviceNames) {
 		this.serviceNames = serviceNames;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessService")
 	public Set<ServiceDescr> getServiceDescrs() {
 		return this.serviceDescrs;
 	}
-
 	public void setServiceDescrs(Set<ServiceDescr> serviceDescrs) {
 		this.serviceDescrs = serviceDescrs;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessService")
 	public Set<BindingTemplate> getBindingTemplates() {
 		return this.bindingTemplates;
 	}
-
 	public void setBindingTemplates(Set<BindingTemplate> bindingTemplates) {
 		this.bindingTemplates = bindingTemplates;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessService")
 	public Set<ServiceCategory> getServiceCategories() {
 		return this.serviceCategories;
 	}
-
 	public void setServiceCategories(Set<ServiceCategory> serviceCategories) {
 		this.serviceCategories = serviceCategories;
 	}

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=696477&r1=696476&r2=696477&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 Wed Sep 17 14:56:22 2008
@@ -24,57 +24,45 @@
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
  */
 @Entity
 @Table(name = "tmodel")
-public class Tmodel implements java.io.Serializable {
+public class Tmodel extends UddiEntity implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private String tmodelKey;
-	private UddiEntity uddiEntity;
 	private String authorizedName;
 	private String publisherId;
 	private String operator;
 	private String name;
 	private String langCode;
-	private String deleted;
-	private Date lastUpdate;
+	private boolean deleted;
 	private Set<TmodelDescr> tmodelDescrs = new HashSet<TmodelDescr>(0);
 	private Set<TmodelDocDescr> tmodelDocDescrs = new HashSet<TmodelDocDescr>(0);
-	private Set<TmodelIdentifier> tmodelIdentifiers = new HashSet<TmodelIdentifier>(
-			0);
-	private Set<TmodelCategory> tmodelCategories = new HashSet<TmodelCategory>(
-			0);
+	private Set<TmodelIdentifier> tmodelIdentifiers = new HashSet<TmodelIdentifier>(0);
+	private Set<TmodelCategory> tmodelCategories = new HashSet<TmodelCategory>(0);
 
 	public Tmodel() {
 	}
 
-	public Tmodel(String tmodelKey, UddiEntity uddiEntity,
-			String authorizedName, String operator, String name, Date lastUpdate) {
+	public Tmodel(String tmodelKey, String authorizedName, String operator, String name, Date lastUpdate) {
 		this.tmodelKey = tmodelKey;
-		this.uddiEntity = uddiEntity;
 		this.authorizedName = authorizedName;
 		this.operator = operator;
 		this.name = name;
 		this.lastUpdate = lastUpdate;
 	}
-	public Tmodel(String tmodelKey, UddiEntity uddiEntity,
-			String authorizedName, String publisherId, String operator,
-			String name, String langCode, String deleted, Date lastUpdate,
+	public Tmodel(String tmodelKey, String authorizedName, String publisherId, String operator,
+			String name, String langCode, boolean deleted, Date lastUpdate,
 			Set<TmodelDescr> tmodelDescrs, Set<TmodelDocDescr> tmodelDocDescrs,
 			Set<TmodelIdentifier> tmodelIdentifiers,
 			Set<TmodelCategory> tmodelCategories) {
 		this.tmodelKey = tmodelKey;
-		this.uddiEntity = uddiEntity;
 		this.authorizedName = authorizedName;
 		this.publisherId = publisherId;
 		this.operator = operator;
@@ -93,27 +81,14 @@
 	public String getTmodelKey() {
 		return this.tmodelKey;
 	}
-
 	public void setTmodelKey(String tmodelKey) {
 		this.tmodelKey = tmodelKey;
 	}
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "tmodel_key", unique = true, nullable = false, insertable = false, updatable = false)
-
-	public UddiEntity getUddiEntity() {
-		return this.uddiEntity;
-	}
-
-	public void setUddiEntity(UddiEntity uddiEntity) {
-		this.uddiEntity = uddiEntity;
-	}
 
 	@Column(name = "authorized_name", nullable = false)
-
 	public String getAuthorizedName() {
 		return this.authorizedName;
 	}
-
 	public void setAuthorizedName(String authorizedName) {
 		this.authorizedName = authorizedName;
 	}
@@ -122,27 +97,22 @@
 	public String getPublisherId() {
 		return this.publisherId;
 	}
-
 	public void setPublisherId(String publisherId) {
 		this.publisherId = publisherId;
 	}
 
 	@Column(name = "operator", nullable = false)
-
 	public String getOperator() {
 		return this.operator;
 	}
-
 	public void setOperator(String operator) {
 		this.operator = operator;
 	}
 
 	@Column(name = "name", nullable = false)
-
 	public String getName() {
 		return this.name;
 	}
-
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -151,58 +121,46 @@
 	public String getLangCode() {
 		return this.langCode;
 	}
-
 	public void setLangCode(String langCode) {
 		this.langCode = langCode;
 	}
 
-	@Column(name = "deleted", length = 5)
-	public String getDeleted() {
-		return this.deleted;
+	@Column(name = "deleted")
+	public boolean isDeleted() {
+		return deleted;
 	}
-
-	public void setDeleted(String deleted) {
+	public void setDeleted(boolean deleted) {
 		this.deleted = deleted;
 	}
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "last_update", nullable = false, length = 29)
-
-	public Date getLastUpdate() {
-		return this.lastUpdate;
-	}
 
-	public void setLastUpdate(Date lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
 	public Set<TmodelDescr> getTmodelDescrs() {
 		return this.tmodelDescrs;
 	}
-
 	public void setTmodelDescrs(Set<TmodelDescr> tmodelDescrs) {
 		this.tmodelDescrs = tmodelDescrs;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
 	public Set<TmodelDocDescr> getTmodelDocDescrs() {
 		return this.tmodelDocDescrs;
 	}
-
 	public void setTmodelDocDescrs(Set<TmodelDocDescr> tmodelDocDescrs) {
 		this.tmodelDocDescrs = tmodelDocDescrs;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
 	public Set<TmodelIdentifier> getTmodelIdentifiers() {
 		return this.tmodelIdentifiers;
 	}
-
 	public void setTmodelIdentifiers(Set<TmodelIdentifier> tmodelIdentifiers) {
 		this.tmodelIdentifiers = tmodelIdentifiers;
 	}
+
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
 	public Set<TmodelCategory> getTmodelCategories() {
 		return this.tmodelCategories;
 	}
-
 	public void setTmodelCategories(Set<TmodelCategory> tmodelCategories) {
 		this.tmodelCategories = tmodelCategories;
 	}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java?rev=696477&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java Wed Sep 17 14:56:22 2008
@@ -0,0 +1,43 @@
+package org.apache.juddi.model;
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+@MappedSuperclass
+public abstract class UddiEntity {
+
+	protected Date lastUpdate;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "last_update", nullable = false, length = 29)
+	public Date getLastUpdate() {
+		return this.lastUpdate;
+	}
+	public void setLastUpdate(Date lastUpdate) {
+		this.lastUpdate = lastUpdate;
+	}
+
+
+}

Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org