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/12/06 01:45:54 UTC
svn commit: r723935 [2/3] - in
/webservices/juddi/branches/v3_trunk/juddi-core/src:
main/java/org/apache/juddi/api/impl/ main/java/org/apache/juddi/mapping/
main/java/org/apache/juddi/model/ main/java/org/apache/juddi/query/
main/java/org/apache/juddi/...
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactId.java Fri Dec 5 16:45:52 2008
@@ -17,40 +17,31 @@
import javax.persistence.Column;
import javax.persistence.Embeddable;
+import javax.persistence.MappedSuperclass;
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class ContactId implements java.io.Serializable {
+@MappedSuperclass
+public class ContactId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
- private int contactId;
+ protected int contactId;
public ContactId() {
}
- public ContactId(String businessKey, int contactId) {
- this.businessKey = businessKey;
+ public ContactId(String entityKey, int contactId) {
+ this.entityKey = entityKey;
this.contactId = contactId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
@Column(name = "contact_id", nullable = false)
-
public int getContactId() {
return this.contactId;
}
-
public void setContactId(int contactId) {
this.contactId = contactId;
}
@@ -64,10 +55,10 @@
return false;
ContactId castOther = (ContactId) other;
- return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
- .getBusinessKey() != null
- && castOther.getBusinessKey() != null && this.getBusinessKey()
- .equals(castOther.getBusinessKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getContactId() == castOther.getContactId());
}
@@ -76,7 +67,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getContactId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "discovery_url")
@@ -50,44 +49,34 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "discoveryUrlId", column = @Column(name = "discovery_url_id", nullable = false))})
-
public DiscoveryUrlId getId() {
return this.id;
}
-
public void setId(DiscoveryUrlId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "business_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public BusinessEntity getBusinessEntity() {
return this.businessEntity;
}
-
public void setBusinessEntity(BusinessEntity businessEntity) {
this.businessEntity = businessEntity;
}
@Column(name = "use_type", nullable = false)
-
public String getUseType() {
return this.useType;
}
-
public void setUseType(String useType) {
this.useType = useType;
}
@Column(name = "url", nullable = false)
-
public String getUrl() {
return this.url;
}
-
public void setUrl(String url) {
this.url = url;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrlId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrlId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrlId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrlId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,27 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class DiscoveryUrlId implements java.io.Serializable {
+public class DiscoveryUrlId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
private int discoveryUrlId;
public DiscoveryUrlId() {
}
- public DiscoveryUrlId(String businessKey, int discoveryUrlId) {
- this.businessKey = businessKey;
+ public DiscoveryUrlId(String entityKey, int discoveryUrlId) {
+ this.entityKey = entityKey;
this.discoveryUrlId = discoveryUrlId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
@Column(name = "discovery_url_id", nullable = false)
-
public int getDiscoveryUrlId() {
return this.discoveryUrlId;
}
-
public void setDiscoveryUrlId(int discoveryUrlId) {
this.discoveryUrlId = discoveryUrlId;
}
@@ -64,10 +54,10 @@
return false;
DiscoveryUrlId castOther = (DiscoveryUrlId) other;
- return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
- .getBusinessKey() != null
- && castOther.getBusinessKey() != null && this.getBusinessKey()
- .equals(castOther.getBusinessKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getDiscoveryUrlId() == castOther.getDiscoveryUrlId());
}
@@ -76,7 +66,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getDiscoveryUrlId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -28,6 +26,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "email")
@@ -56,27 +55,20 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "contactId", column = @Column(name = "contact_id", nullable = false)),
- @AttributeOverride(name = "emailId", column = @Column(name = "email_id", nullable = false))})
-
public EmailId getId() {
return this.id;
}
-
public void setId(EmailId id) {
this.id = id;
}
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({
- @JoinColumn(name = "business_key", referencedColumnName = "business_key", nullable = false, insertable = false, updatable = false),
+ @JoinColumn(name = "entity_key", referencedColumnName = "entity_key", nullable = false, insertable = false, updatable = false),
@JoinColumn(name = "contact_id", referencedColumnName = "contact_id", nullable = false, insertable = false, updatable = false)})
-
public Contact getContact() {
return this.contact;
}
-
public void setContact(Contact contact) {
this.contact = contact;
}
@@ -85,17 +77,14 @@
public String getUseType() {
return this.useType;
}
-
public void setUseType(String useType) {
this.useType = useType;
}
@Column(name = "email_address", nullable = false)
-
public String getEmailAddress() {
return this.emailAddress;
}
-
public void setEmailAddress(String emailAddress) {
this.emailAddress = emailAddress;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/EmailId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/EmailId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/EmailId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/EmailId.java Fri Dec 5 16:45:52 2008
@@ -20,49 +20,27 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class EmailId implements java.io.Serializable {
+public class EmailId extends ContactId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
- private int contactId;
private int emailId;
public EmailId() {
}
- public EmailId(String businessKey, int contactId, int emailId) {
- this.businessKey = businessKey;
+ public EmailId(String entityKey, int contactId, int emailId) {
+ this.entityKey = entityKey;
this.contactId = contactId;
this.emailId = emailId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
- @Column(name = "contact_id", nullable = false)
-
- public int getContactId() {
- return this.contactId;
- }
-
- public void setContactId(int contactId) {
- this.contactId = contactId;
- }
-
@Column(name = "email_id", nullable = false)
-
public int getEmailId() {
return this.emailId;
}
-
public void setEmailId(int emailId) {
this.emailId = emailId;
}
@@ -76,10 +54,10 @@
return false;
EmailId castOther = (EmailId) other;
- return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
- .getBusinessKey() != null
- && castOther.getBusinessKey() != null && this.getBusinessKey()
- .equals(castOther.getBusinessKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getContactId() == castOther.getContactId())
&& (this.getEmailId() == castOther.getEmailId());
}
@@ -89,7 +67,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getContactId();
result = 37 * result + this.getEmailId();
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Id.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Id.java?rev=723935&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Id.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Id.java Fri Dec 5 16:45:52 2008
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.juddi.model;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+@MappedSuperclass
+public class Id {
+
+ protected String entityKey;
+
+ @Column(name = "entity_key", nullable = false, length = 255)
+ public String getEntityKey() {
+ return this.entityKey;
+ }
+ public void setEntityKey(String entityKey) {
+ this.entityKey = entityKey;
+ }
+
+}
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Id.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -28,6 +26,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "instance_details_descr")
@@ -48,6 +47,7 @@
this.tmodelInstanceInfo = tmodelInstanceInfo;
this.descr = descr;
}
+
public InstanceDetailsDescr(InstanceDetailsDescrId id,
TmodelInstanceInfo tmodelInstanceInfo, String langCode, String descr) {
this.id = id;
@@ -57,27 +57,20 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 255)),
- @AttributeOverride(name = "tmodelInstanceInfoId", column = @Column(name = "tmodel_instance_info_id", nullable = false)),
- @AttributeOverride(name = "instanceDetailsDescrId", column = @Column(name = "instance_details_descr_id", nullable = false))})
-
public InstanceDetailsDescrId getId() {
return this.id;
}
-
public void setId(InstanceDetailsDescrId id) {
this.id = id;
}
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({
- @JoinColumn(name = "binding_key", referencedColumnName = "binding_key", nullable = false, insertable = false, updatable = false),
- @JoinColumn(name = "tmodel_instance_info_id", referencedColumnName = "tmodel_instance_info_id", nullable = false, insertable = false, updatable = false)})
-
+ @JoinColumn(name = "entity_key", referencedColumnName = "entity_key", nullable = false, insertable = false, updatable = false),
+ @JoinColumn(name = "instance_info_id", referencedColumnName = "instance_info_id", nullable = false, insertable = false, updatable = false)})
public TmodelInstanceInfo getTmodelInstanceInfo() {
return this.tmodelInstanceInfo;
}
-
public void setTmodelInstanceInfo(TmodelInstanceInfo tmodelInstanceInfo) {
this.tmodelInstanceInfo = tmodelInstanceInfo;
}
@@ -86,17 +79,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "descr", nullable = false)
-
public String getDescr() {
return this.descr;
}
-
public void setDescr(String descr) {
this.descr = descr;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescrId.java Fri Dec 5 16:45:52 2008
@@ -20,50 +20,28 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class InstanceDetailsDescrId implements java.io.Serializable {
+public class InstanceDetailsDescrId extends TmodelInstanceInfoId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
- private int tmodelInstanceInfoId;
private int instanceDetailsDescrId;
public InstanceDetailsDescrId() {
}
- public InstanceDetailsDescrId(String bindingKey, int tmodelInstanceInfoId,
+ public InstanceDetailsDescrId(String entityKey, int tmodelInstanceInfoId,
int instanceDetailsDescrId) {
- this.bindingKey = bindingKey;
+ this.entityKey = entityKey;
this.tmodelInstanceInfoId = tmodelInstanceInfoId;
this.instanceDetailsDescrId = instanceDetailsDescrId;
}
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
-
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
- @Column(name = "tmodel_instance_info_id", nullable = false)
-
- public int getTmodelInstanceInfoId() {
- return this.tmodelInstanceInfoId;
- }
-
- public void setTmodelInstanceInfoId(int tmodelInstanceInfoId) {
- this.tmodelInstanceInfoId = tmodelInstanceInfoId;
- }
-
- @Column(name = "instance_details_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getInstanceDetailsDescrId() {
return this.instanceDetailsDescrId;
}
-
public void setInstanceDetailsDescrId(int instanceDetailsDescrId) {
this.instanceDetailsDescrId = instanceDetailsDescrId;
}
@@ -77,10 +55,10 @@
return false;
InstanceDetailsDescrId castOther = (InstanceDetailsDescrId) other;
- return ((this.getBindingKey() == castOther.getBindingKey()) || (this
- .getBindingKey() != null
- && castOther.getBindingKey() != null && this.getBindingKey()
- .equals(castOther.getBindingKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getTmodelInstanceInfoId() == castOther
.getTmodelInstanceInfoId())
&& (this.getInstanceDetailsDescrId() == castOther
@@ -92,7 +70,7 @@
result = 37
* result
- + (getBindingKey() == null ? 0 : this.getBindingKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getTmodelInstanceInfoId();
result = 37 * result + this.getInstanceDetailsDescrId();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -28,6 +26,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "instance_details_doc_descr")
@@ -48,6 +47,7 @@
this.tmodelInstanceInfo = tmodelInstanceInfo;
this.descr = descr;
}
+
public InstanceDetailsDocDescr(InstanceDetailsDocDescrId id,
TmodelInstanceInfo tmodelInstanceInfo, String langCode, String descr) {
this.id = id;
@@ -57,27 +57,20 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 255)),
- @AttributeOverride(name = "tmodelInstanceInfoId", column = @Column(name = "tmodel_instance_info_id", nullable = false)),
- @AttributeOverride(name = "instanceDetailsDocDescrId", column = @Column(name = "instance_details_doc_descr_id", nullable = false))})
-
public InstanceDetailsDocDescrId getId() {
return this.id;
}
-
public void setId(InstanceDetailsDocDescrId id) {
this.id = id;
}
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({
- @JoinColumn(name = "binding_key", referencedColumnName = "binding_key", nullable = false, insertable = false, updatable = false),
- @JoinColumn(name = "tmodel_instance_info_id", referencedColumnName = "tmodel_instance_info_id", nullable = false, insertable = false, updatable = false)})
-
+ @JoinColumn(name = "entity_key", referencedColumnName = "entity_key", nullable = false, insertable = false, updatable = false),
+ @JoinColumn(name = "instance_info_id", referencedColumnName = "instance_info_id", nullable = false, insertable = false, updatable = false)})
public TmodelInstanceInfo getTmodelInstanceInfo() {
return this.tmodelInstanceInfo;
}
-
public void setTmodelInstanceInfo(TmodelInstanceInfo tmodelInstanceInfo) {
this.tmodelInstanceInfo = tmodelInstanceInfo;
}
@@ -86,17 +79,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "descr", nullable = false)
-
public String getDescr() {
return this.descr;
}
-
public void setDescr(String descr) {
this.descr = descr;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescrId.java Fri Dec 5 16:45:52 2008
@@ -20,50 +20,28 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class InstanceDetailsDocDescrId implements java.io.Serializable {
+public class InstanceDetailsDocDescrId extends TmodelInstanceInfoId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
- private int tmodelInstanceInfoId;
private int instanceDetailsDocDescrId;
public InstanceDetailsDocDescrId() {
}
- public InstanceDetailsDocDescrId(String bindingKey,
+ public InstanceDetailsDocDescrId(String entityKey,
int tmodelInstanceInfoId, int instanceDetailsDocDescrId) {
- this.bindingKey = bindingKey;
+ this.entityKey = entityKey;
this.tmodelInstanceInfoId = tmodelInstanceInfoId;
this.instanceDetailsDocDescrId = instanceDetailsDocDescrId;
}
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
-
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
- @Column(name = "tmodel_instance_info_id", nullable = false)
-
- public int getTmodelInstanceInfoId() {
- return this.tmodelInstanceInfoId;
- }
-
- public void setTmodelInstanceInfoId(int tmodelInstanceInfoId) {
- this.tmodelInstanceInfoId = tmodelInstanceInfoId;
- }
-
- @Column(name = "instance_details_doc_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getInstanceDetailsDocDescrId() {
return this.instanceDetailsDocDescrId;
}
-
public void setInstanceDetailsDocDescrId(int instanceDetailsDocDescrId) {
this.instanceDetailsDocDescrId = instanceDetailsDocDescrId;
}
@@ -77,10 +55,10 @@
return false;
InstanceDetailsDocDescrId castOther = (InstanceDetailsDocDescrId) other;
- return ((this.getBindingKey() == castOther.getBindingKey()) || (this
- .getBindingKey() != null
- && castOther.getBindingKey() != null && this.getBindingKey()
- .equals(castOther.getBindingKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getTmodelInstanceInfoId() == castOther
.getTmodelInstanceInfoId())
&& (this.getInstanceDetailsDocDescrId() == castOther
@@ -92,7 +70,7 @@
result = 37
* result
- + (getBindingKey() == null ? 0 : this.getBindingKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getTmodelInstanceInfoId();
result = 37 * result + this.getInstanceDetailsDocDescrId();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Phone.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Phone.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Phone.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Phone.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -28,6 +26,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "phone")
@@ -55,27 +54,20 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "contactId", column = @Column(name = "contact_id", nullable = false)),
- @AttributeOverride(name = "phoneId", column = @Column(name = "phone_id", nullable = false))})
-
public PhoneId getId() {
return this.id;
}
-
public void setId(PhoneId id) {
this.id = id;
}
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({
- @JoinColumn(name = "business_key", referencedColumnName = "business_key", nullable = false, insertable = false, updatable = false),
+ @JoinColumn(name = "entity_key", referencedColumnName = "entity_key", nullable = false, insertable = false, updatable = false),
@JoinColumn(name = "contact_id", referencedColumnName = "contact_id", nullable = false, insertable = false, updatable = false)})
-
public Contact getContact() {
return this.contact;
}
-
public void setContact(Contact contact) {
this.contact = contact;
}
@@ -84,7 +76,6 @@
public String getUseType() {
return this.useType;
}
-
public void setUseType(String useType) {
this.useType = useType;
}
@@ -93,7 +84,6 @@
public String getPhoneNumber() {
return this.phoneNumber;
}
-
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/PhoneId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/PhoneId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/PhoneId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/PhoneId.java Fri Dec 5 16:45:52 2008
@@ -20,49 +20,27 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class PhoneId implements java.io.Serializable {
+public class PhoneId extends ContactId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
- private int contactId;
private int phoneId;
public PhoneId() {
}
- public PhoneId(String businessKey, int contactId, int phoneId) {
- this.businessKey = businessKey;
+ public PhoneId(String entityKey, int contactId, int phoneId) {
+ this.entityKey = entityKey;
this.contactId = contactId;
this.phoneId = phoneId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
- @Column(name = "contact_id", nullable = false)
-
- public int getContactId() {
- return this.contactId;
- }
-
- public void setContactId(int contactId) {
- this.contactId = contactId;
- }
-
@Column(name = "phone_id", nullable = false)
-
public int getPhoneId() {
return this.phoneId;
}
-
public void setPhoneId(int phoneId) {
this.phoneId = phoneId;
}
@@ -76,10 +54,10 @@
return false;
PhoneId castOther = (PhoneId) other;
- return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
- .getBusinessKey() != null
- && castOther.getBusinessKey() != null && this.getBusinessKey()
- .equals(castOther.getBusinessKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getContactId() == castOther.getContactId())
&& (this.getPhoneId() == castOther.getPhoneId());
}
@@ -89,7 +67,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getContactId();
result = 37 * result + this.getPhoneId();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategory.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategory.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategory.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategory.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "service_category")
@@ -59,24 +58,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "serviceKey", column = @Column(name = "service_key", nullable = false, length = 255)),
- @AttributeOverride(name = "categoryId", column = @Column(name = "category_id", nullable = false))})
-
public ServiceCategoryId getId() {
return this.id;
}
-
public void setId(ServiceCategoryId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "service_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public BusinessService getBusinessService() {
return this.businessService;
}
-
public void setBusinessService(BusinessService businessService) {
this.businessService = businessService;
}
@@ -85,7 +78,6 @@
public String getTmodelKeyRef() {
return this.tmodelKeyRef;
}
-
public void setTmodelKeyRef(String tmodelKeyRef) {
this.tmodelKeyRef = tmodelKeyRef;
}
@@ -94,17 +86,14 @@
public String getKeyName() {
return this.keyName;
}
-
public void setKeyName(String keyName) {
this.keyName = keyName;
}
@Column(name = "key_value", nullable = false)
-
public String getKeyValue() {
return this.keyValue;
}
-
public void setKeyValue(String keyValue) {
this.keyValue = keyValue;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class ServiceCategoryId implements java.io.Serializable {
+public class ServiceCategoryId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String serviceKey;
private int categoryId;
public ServiceCategoryId() {
}
- public ServiceCategoryId(String serviceKey, int categoryId) {
- this.serviceKey = serviceKey;
+ public ServiceCategoryId(String entityKey, int categoryId) {
+ this.entityKey = entityKey;
this.categoryId = categoryId;
}
- @Column(name = "service_key", nullable = false, length = 255)
- public String getServiceKey() {
- return this.serviceKey;
- }
-
- public void setServiceKey(String serviceKey) {
- this.serviceKey = serviceKey;
- }
-
@Column(name = "category_id", nullable = false)
-
public int getCategoryId() {
return this.categoryId;
}
-
public void setCategoryId(int categoryId) {
this.categoryId = categoryId;
}
@@ -64,10 +53,10 @@
return false;
ServiceCategoryId castOther = (ServiceCategoryId) other;
- return ((this.getServiceKey() == castOther.getServiceKey()) || (this
- .getServiceKey() != null
- && castOther.getServiceKey() != null && this.getServiceKey()
- .equals(castOther.getServiceKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getCategoryId() == castOther.getCategoryId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getServiceKey() == null ? 0 : this.getServiceKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getCategoryId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "service_descr")
@@ -56,24 +55,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "serviceKey", column = @Column(name = "service_key", nullable = false, length = 255)),
- @AttributeOverride(name = "serviceDescrId", column = @Column(name = "service_descr_id", nullable = false))})
-
public ServiceDescrId getId() {
return this.id;
}
-
public void setId(ServiceDescrId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "service_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public BusinessService getBusinessService() {
return this.businessService;
}
-
public void setBusinessService(BusinessService businessService) {
this.businessService = businessService;
}
@@ -82,17 +75,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "descr", nullable = false)
-
public String getDescr() {
return this.descr;
}
-
public void setDescr(String descr) {
this.descr = descr;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescrId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class ServiceDescrId implements java.io.Serializable {
+public class ServiceDescrId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String serviceKey;
private int serviceDescrId;
public ServiceDescrId() {
}
- public ServiceDescrId(String serviceKey, int serviceDescrId) {
- this.serviceKey = serviceKey;
+ public ServiceDescrId(String entityKey, int serviceDescrId) {
+ this.entityKey = entityKey;
this.serviceDescrId = serviceDescrId;
}
- @Column(name = "service_key", nullable = false, length = 255)
- public String getServiceKey() {
- return this.serviceKey;
- }
-
- public void setServiceKey(String serviceKey) {
- this.serviceKey = serviceKey;
- }
-
- @Column(name = "service_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getServiceDescrId() {
return this.serviceDescrId;
}
-
public void setServiceDescrId(int serviceDescrId) {
this.serviceDescrId = serviceDescrId;
}
@@ -64,10 +53,10 @@
return false;
ServiceDescrId castOther = (ServiceDescrId) other;
- return ((this.getServiceKey() == castOther.getServiceKey()) || (this
- .getServiceKey() != null
- && castOther.getServiceKey() != null && this.getServiceKey()
- .equals(castOther.getServiceKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getServiceDescrId() == castOther.getServiceDescrId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getServiceKey() == null ? 0 : this.getServiceKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getServiceDescrId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "service_name")
@@ -56,24 +55,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "serviceKey", column = @Column(name = "service_key", nullable = false, length = 255)),
- @AttributeOverride(name = "serviceNameId", column = @Column(name = "service_name_id", nullable = false))})
-
public ServiceNameId getId() {
return this.id;
}
-
public void setId(ServiceNameId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "service_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public BusinessService getBusinessService() {
return this.businessService;
}
-
public void setBusinessService(BusinessService businessService) {
this.businessService = businessService;
}
@@ -82,17 +75,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "name", nullable = false)
-
public String getName() {
return this.name;
}
-
public void setName(String name) {
this.name = name;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceNameId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceNameId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceNameId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceNameId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class ServiceNameId implements java.io.Serializable {
+public class ServiceNameId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String serviceKey;
private int serviceNameId;
public ServiceNameId() {
}
- public ServiceNameId(String serviceKey, int serviceNameId) {
- this.serviceKey = serviceKey;
+ public ServiceNameId(String entityKey, int serviceNameId) {
+ this.entityKey = entityKey;
this.serviceNameId = serviceNameId;
}
- @Column(name = "service_key", nullable = false, length = 255)
- public String getServiceKey() {
- return this.serviceKey;
- }
-
- public void setServiceKey(String serviceKey) {
- this.serviceKey = serviceKey;
- }
-
- @Column(name = "service_name_id", nullable = false)
-
+ @Column(name = "name_id", nullable = false)
public int getServiceNameId() {
return this.serviceNameId;
}
-
public void setServiceNameId(int serviceNameId) {
this.serviceNameId = serviceNameId;
}
@@ -64,10 +53,10 @@
return false;
ServiceNameId castOther = (ServiceNameId) other;
- return ((this.getServiceKey() == castOther.getServiceKey()) || (this
- .getServiceKey() != null
- && castOther.getServiceKey() != null && this.getServiceKey()
- .equals(castOther.getServiceKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getServiceNameId() == castOther.getServiceNameId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getServiceKey() == null ? 0 : this.getServiceKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getServiceNameId();
return result;
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=723935&r1=723934&r2=723935&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 Fri Dec 5 16:45:52 2008
@@ -23,7 +23,6 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
-import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -38,7 +37,6 @@
public class Tmodel extends UddiEntity implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String tmodelKey;
private UddiEntityPublisher publisher;
private String name;
private String langCode;
@@ -51,17 +49,17 @@
public Tmodel() {
}
- public Tmodel(String tmodelKey, String name, Date lastUpdate) {
- this.tmodelKey = tmodelKey;
+ public Tmodel(String entityKey, String name, Date lastUpdate) {
+ this.entityKey = entityKey;
this.name = name;
this.lastUpdate = lastUpdate;
}
- public Tmodel(String tmodelKey, String authorizedName, UddiEntityPublisher publisher, String operator,
+ public Tmodel(String entityKey, String authorizedName, UddiEntityPublisher publisher, 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.entityKey = entityKey;
this.publisher = publisher;
this.name = name;
this.langCode = langCode;
@@ -73,15 +71,6 @@
this.tmodelCategories = tmodelCategories;
}
- @Id
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
- }
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
- }
-
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "publisher_id", nullable = false)
public UddiEntityPublisher getPublisher() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategory.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategory.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategory.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategory.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "tmodel_category")
@@ -47,6 +46,7 @@
this.tmodel = tmodel;
this.keyValue = keyValue;
}
+
public TmodelCategory(TmodelCategoryId id, Tmodel tmodel,
String tmodelKeyRef, String keyName, String keyValue) {
this.id = id;
@@ -57,24 +57,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "tmodelKey", column = @Column(name = "tmodel_key", nullable = false, length = 255)),
- @AttributeOverride(name = "categoryId", column = @Column(name = "category_id", nullable = false))})
-
public TmodelCategoryId getId() {
return this.id;
}
-
public void setId(TmodelCategoryId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "tmodel_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public Tmodel getTmodel() {
return this.tmodel;
}
-
public void setTmodel(Tmodel tmodel) {
this.tmodel = tmodel;
}
@@ -83,7 +77,6 @@
public String getTmodelKeyRef() {
return this.tmodelKeyRef;
}
-
public void setTmodelKeyRef(String tmodelKeyRef) {
this.tmodelKeyRef = tmodelKeyRef;
}
@@ -92,17 +85,14 @@
public String getKeyName() {
return this.keyName;
}
-
public void setKeyName(String keyName) {
this.keyName = keyName;
}
@Column(name = "key_value", nullable = false)
-
public String getKeyValue() {
return this.keyValue;
}
-
public void setKeyValue(String keyValue) {
this.keyValue = keyValue;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class TmodelCategoryId implements java.io.Serializable {
+public class TmodelCategoryId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String tmodelKey;
private int categoryId;
public TmodelCategoryId() {
}
- public TmodelCategoryId(String tmodelKey, int categoryId) {
- this.tmodelKey = tmodelKey;
+ public TmodelCategoryId(String entityKey, int categoryId) {
+ this.entityKey = entityKey;
this.categoryId = categoryId;
}
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
- }
-
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
- }
-
@Column(name = "category_id", nullable = false)
-
public int getCategoryId() {
return this.categoryId;
}
-
public void setCategoryId(int categoryId) {
this.categoryId = categoryId;
}
@@ -64,10 +53,10 @@
return false;
TmodelCategoryId castOther = (TmodelCategoryId) other;
- return ((this.getTmodelKey() == castOther.getTmodelKey()) || (this
- .getTmodelKey() != null
- && castOther.getTmodelKey() != null && this.getTmodelKey()
- .equals(castOther.getTmodelKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getCategoryId() == castOther.getCategoryId());
}
@@ -75,7 +64,7 @@
int result = 17;
result = 37 * result
- + (getTmodelKey() == null ? 0 : this.getTmodelKey().hashCode());
+ + (getEntityKey() == null ? 0 : this.getEntityKey().hashCode());
result = 37 * result + this.getCategoryId();
return result;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "tmodel_descr")
@@ -55,24 +54,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "tmodelKey", column = @Column(name = "tmodel_key", nullable = false, length = 255)),
- @AttributeOverride(name = "tmodelDescrId", column = @Column(name = "tmodel_descr_id", nullable = false))})
-
public TmodelDescrId getId() {
return this.id;
}
-
public void setId(TmodelDescrId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "tmodel_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public Tmodel getTmodel() {
return this.tmodel;
}
-
public void setTmodel(Tmodel tmodel) {
this.tmodel = tmodel;
}
@@ -81,17 +74,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "descr", nullable = false)
-
public String getDescr() {
return this.descr;
}
-
public void setDescr(String descr) {
this.descr = descr;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescrId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class TmodelDescrId implements java.io.Serializable {
+public class TmodelDescrId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String tmodelKey;
private int tmodelDescrId;
public TmodelDescrId() {
}
- public TmodelDescrId(String tmodelKey, int tmodelDescrId) {
- this.tmodelKey = tmodelKey;
+ public TmodelDescrId(String entityKey, int tmodelDescrId) {
+ this.entityKey = entityKey;
this.tmodelDescrId = tmodelDescrId;
}
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
- }
-
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
- }
-
- @Column(name = "tmodel_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getTmodelDescrId() {
return this.tmodelDescrId;
}
-
public void setTmodelDescrId(int tmodelDescrId) {
this.tmodelDescrId = tmodelDescrId;
}
@@ -64,10 +53,10 @@
return false;
TmodelDescrId castOther = (TmodelDescrId) other;
- return ((this.getTmodelKey() == castOther.getTmodelKey()) || (this
- .getTmodelKey() != null
- && castOther.getTmodelKey() != null && this.getTmodelKey()
- .equals(castOther.getTmodelKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getTmodelDescrId() == castOther.getTmodelDescrId());
}
@@ -75,7 +64,7 @@
int result = 17;
result = 37 * result
- + (getTmodelKey() == null ? 0 : this.getTmodelKey().hashCode());
+ + (getEntityKey() == null ? 0 : this.getEntityKey().hashCode());
result = 37 * result + this.getTmodelDescrId();
return result;
}
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=723935&r1=723934&r2=723935&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 Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "tmodel_doc_descr")
@@ -46,6 +45,7 @@
this.tmodel = tmodel;
this.descr = descr;
}
+
public TmodelDocDescr(TmodelDocDescrId id, Tmodel tmodel, String langCode,
String descr) {
this.id = id;
@@ -55,24 +55,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "tmodelKey", column = @Column(name = "tmodel_key", nullable = false, length = 255)),
- @AttributeOverride(name = "tmodelDocDescrId", column = @Column(name = "tmodel_doc_descr_id", nullable = false))})
-
public TmodelDocDescrId getId() {
return this.id;
}
-
public void setId(TmodelDocDescrId id) {
this.id = id;
}
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "tmodel_key", nullable = false, insertable = false, updatable = false)
-
public Tmodel getTmodel() {
return this.tmodel;
}
-
public void setTmodel(Tmodel tmodel) {
this.tmodel = tmodel;
}
@@ -81,17 +75,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "descr", nullable = false)
-
public String getDescr() {
return this.descr;
}
-
public void setDescr(String descr) {
this.descr = descr;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescrId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class TmodelDocDescrId implements java.io.Serializable {
+public class TmodelDocDescrId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String tmodelKey;
private int tmodelDocDescrId;
public TmodelDocDescrId() {
}
- public TmodelDocDescrId(String tmodelKey, int tmodelDocDescrId) {
- this.tmodelKey = tmodelKey;
+ public TmodelDocDescrId(String entityKey, int tmodelDocDescrId) {
+ this.entityKey = entityKey;
this.tmodelDocDescrId = tmodelDocDescrId;
}
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
- }
-
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
- }
-
- @Column(name = "tmodel_doc_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getTmodelDocDescrId() {
return this.tmodelDocDescrId;
}
-
public void setTmodelDocDescrId(int tmodelDocDescrId) {
this.tmodelDocDescrId = tmodelDocDescrId;
}
@@ -64,10 +53,10 @@
return false;
TmodelDocDescrId castOther = (TmodelDocDescrId) other;
- return ((this.getTmodelKey() == castOther.getTmodelKey()) || (this
- .getTmodelKey() != null
- && castOther.getTmodelKey() != null && this.getTmodelKey()
- .equals(castOther.getTmodelKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getTmodelDocDescrId() == castOther
.getTmodelDocDescrId());
}
@@ -76,7 +65,7 @@
int result = 17;
result = 37 * result
- + (getTmodelKey() == null ? 0 : this.getTmodelKey().hashCode());
+ + (getEntityKey() == null ? 0 : this.getEntityKey().hashCode());
result = 37 * result + this.getTmodelDocDescrId();
return result;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -27,6 +25,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "tmodel_identifier")
@@ -48,6 +47,7 @@
this.tmodel = tmodel;
this.keyValue = keyValue;
}
+
public TmodelIdentifier(TmodelIdentifierId id, Tmodel tmodel,
String tmodelKeyRef, String keyName, String keyValue) {
this.id = id;
@@ -58,24 +58,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "tmodelKey", column = @Column(name = "tmodel_key", nullable = false, length = 255)),
- @AttributeOverride(name = "identifierId", column = @Column(name = "identifier_id", nullable = false))})
-
public TmodelIdentifierId getId() {
return this.id;
}
-
public void setId(TmodelIdentifierId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "tmodel_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public Tmodel getTmodel() {
return this.tmodel;
}
-
public void setTmodel(Tmodel tmodel) {
this.tmodel = tmodel;
}
@@ -84,7 +78,6 @@
public String getTmodelKeyRef() {
return this.tmodelKeyRef;
}
-
public void setTmodelKeyRef(String tmodelKeyRef) {
this.tmodelKeyRef = tmodelKeyRef;
}
@@ -93,17 +86,14 @@
public String getKeyName() {
return this.keyName;
}
-
public void setKeyName(String keyName) {
this.keyName = keyName;
}
@Column(name = "key_value", nullable = false)
-
public String getKeyValue() {
return this.keyValue;
}
-
public void setKeyValue(String keyValue) {
this.keyValue = keyValue;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifierId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifierId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifierId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifierId.java Fri Dec 5 16:45:52 2008
@@ -20,37 +20,26 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class TmodelIdentifierId implements java.io.Serializable {
+public class TmodelIdentifierId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String tmodelKey;
private int identifierId;
public TmodelIdentifierId() {
}
- public TmodelIdentifierId(String tmodelKey, int identifierId) {
- this.tmodelKey = tmodelKey;
+ public TmodelIdentifierId(String entityKey, int identifierId) {
+ this.entityKey = entityKey;
this.identifierId = identifierId;
}
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
- }
-
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
- }
-
@Column(name = "identifier_id", nullable = false)
-
public int getIdentifierId() {
return this.identifierId;
}
-
public void setIdentifierId(int identifierId) {
this.identifierId = identifierId;
}
@@ -64,10 +53,10 @@
return false;
TmodelIdentifierId castOther = (TmodelIdentifierId) other;
- return ((this.getTmodelKey() == castOther.getTmodelKey()) || (this
- .getTmodelKey() != null
- && castOther.getTmodelKey() != null && this.getTmodelKey()
- .equals(castOther.getTmodelKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getIdentifierId() == castOther.getIdentifierId());
}
@@ -75,7 +64,7 @@
int result = 17;
result = 37 * result
- + (getTmodelKey() == null ? 0 : this.getTmodelKey().hashCode());
+ + (getEntityKey() == null ? 0 : this.getEntityKey().hashCode());
result = 37 * result + this.getIdentifierId();
return result;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java Fri Dec 5 16:45:52 2008
@@ -18,8 +18,6 @@
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
@@ -32,6 +30,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "tmodel_instance_info")
@@ -71,24 +70,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 255)),
- @AttributeOverride(name = "tmodelInstanceInfoId", column = @Column(name = "tmodel_instance_info_id", nullable = false))})
-
public TmodelInstanceInfoId getId() {
return this.id;
}
-
public void setId(TmodelInstanceInfoId id) {
this.id = id;
}
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "binding_key", nullable = false, insertable = false, updatable = false)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public BindingTemplate getBindingTemplate() {
return this.bindingTemplate;
}
-
public void setBindingTemplate(BindingTemplate bindingTemplate) {
this.bindingTemplate = bindingTemplate;
}
@@ -97,7 +90,6 @@
public String getTmodelKey() {
return this.tmodelKey;
}
-
public void setTmodelKey(String tmodelKey) {
this.tmodelKey = tmodelKey;
}
@@ -106,33 +98,32 @@
public String getInstanceParms() {
return this.instanceParms;
}
-
public void setInstanceParms(String instanceParms) {
this.instanceParms = instanceParms;
}
+
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodelInstanceInfo")
public Set<InstanceDetailsDocDescr> getInstanceDetailsDocDescrs() {
return this.instanceDetailsDocDescrs;
}
-
public void setInstanceDetailsDocDescrs(
Set<InstanceDetailsDocDescr> instanceDetailsDocDescrs) {
this.instanceDetailsDocDescrs = instanceDetailsDocDescrs;
}
+
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodelInstanceInfo")
public Set<InstanceDetailsDescr> getInstanceDetailsDescrs() {
return this.instanceDetailsDescrs;
}
-
public void setInstanceDetailsDescrs(
Set<InstanceDetailsDescr> instanceDetailsDescrs) {
this.instanceDetailsDescrs = instanceDetailsDescrs;
}
+
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodelInstanceInfo")
public Set<TmodelInstanceInfoDescr> getTmodelInstanceInfoDescrs() {
return this.tmodelInstanceInfoDescrs;
}
-
public void setTmodelInstanceInfoDescrs(
Set<TmodelInstanceInfoDescr> tmodelInstanceInfoDescrs) {
this.tmodelInstanceInfoDescrs = tmodelInstanceInfoDescrs;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java Fri Dec 5 16:45:52 2008
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
@@ -28,6 +26,7 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Entity
@Table(name = "tmodel_instance_info_descr")
@@ -57,27 +56,20 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 255)),
- @AttributeOverride(name = "tmodelInstanceInfoId", column = @Column(name = "tmodel_instance_info_id", nullable = false)),
- @AttributeOverride(name = "tmodelInstanceInfoDescrId", column = @Column(name = "tmodel_instance_info_descr_id", nullable = false))})
-
public TmodelInstanceInfoDescrId getId() {
return this.id;
}
-
public void setId(TmodelInstanceInfoDescrId id) {
this.id = id;
}
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({
- @JoinColumn(name = "binding_key", referencedColumnName = "binding_key", nullable = false, insertable = false, updatable = false),
- @JoinColumn(name = "tmodel_instance_info_id", referencedColumnName = "tmodel_instance_info_id", nullable = false, insertable = false, updatable = false)})
-
+ @JoinColumn(name = "entity_key", referencedColumnName = "entity_key", nullable = false, insertable = false, updatable = false),
+ @JoinColumn(name = "instance_info_id", referencedColumnName = "instance_info_id", nullable = false, insertable = false, updatable = false)})
public TmodelInstanceInfo getTmodelInstanceInfo() {
return this.tmodelInstanceInfo;
}
-
public void setTmodelInstanceInfo(TmodelInstanceInfo tmodelInstanceInfo) {
this.tmodelInstanceInfo = tmodelInstanceInfo;
}
@@ -86,17 +78,14 @@
public String getLangCode() {
return this.langCode;
}
-
public void setLangCode(String langCode) {
this.langCode = langCode;
}
@Column(name = "descr", nullable = false)
-
public String getDescr() {
return this.descr;
}
-
public void setDescr(String descr) {
this.descr = descr;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescrId.java Fri Dec 5 16:45:52 2008
@@ -20,50 +20,28 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class TmodelInstanceInfoDescrId implements java.io.Serializable {
+public class TmodelInstanceInfoDescrId extends TmodelInstanceInfoId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
- private int tmodelInstanceInfoId;
private int tmodelInstanceInfoDescrId;
public TmodelInstanceInfoDescrId() {
}
- public TmodelInstanceInfoDescrId(String bindingKey,
+ public TmodelInstanceInfoDescrId(String entityKey,
int tmodelInstanceInfoId, int tmodelInstanceInfoDescrId) {
- this.bindingKey = bindingKey;
+ this.entityKey = entityKey;
this.tmodelInstanceInfoId = tmodelInstanceInfoId;
this.tmodelInstanceInfoDescrId = tmodelInstanceInfoDescrId;
}
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
-
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
- @Column(name = "tmodel_instance_info_id", nullable = false)
-
- public int getTmodelInstanceInfoId() {
- return this.tmodelInstanceInfoId;
- }
-
- public void setTmodelInstanceInfoId(int tmodelInstanceInfoId) {
- this.tmodelInstanceInfoId = tmodelInstanceInfoId;
- }
-
- @Column(name = "tmodel_instance_info_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getTmodelInstanceInfoDescrId() {
return this.tmodelInstanceInfoDescrId;
}
-
public void setTmodelInstanceInfoDescrId(int tmodelInstanceInfoDescrId) {
this.tmodelInstanceInfoDescrId = tmodelInstanceInfoDescrId;
}
@@ -77,10 +55,10 @@
return false;
TmodelInstanceInfoDescrId castOther = (TmodelInstanceInfoDescrId) other;
- return ((this.getBindingKey() == castOther.getBindingKey()) || (this
- .getBindingKey() != null
- && castOther.getBindingKey() != null && this.getBindingKey()
- .equals(castOther.getBindingKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getTmodelInstanceInfoId() == castOther
.getTmodelInstanceInfoId())
&& (this.getTmodelInstanceInfoDescrId() == castOther
@@ -92,7 +70,7 @@
result = 37
* result
- + (getBindingKey() == null ? 0 : this.getBindingKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getTmodelInstanceInfoId();
result = 37 * result + this.getTmodelInstanceInfoDescrId();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoId.java Fri Dec 5 16:45:52 2008
@@ -17,40 +17,31 @@
import javax.persistence.Column;
import javax.persistence.Embeddable;
+import javax.persistence.MappedSuperclass;
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class TmodelInstanceInfoId implements java.io.Serializable {
+@MappedSuperclass
+public class TmodelInstanceInfoId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
- private int tmodelInstanceInfoId;
+ protected int tmodelInstanceInfoId;
public TmodelInstanceInfoId() {
}
- public TmodelInstanceInfoId(String bindingKey, int tmodelInstanceInfoId) {
- this.bindingKey = bindingKey;
+ public TmodelInstanceInfoId(String entityKey, int tmodelInstanceInfoId) {
+ this.entityKey = entityKey;
this.tmodelInstanceInfoId = tmodelInstanceInfoId;
}
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
-
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
- @Column(name = "tmodel_instance_info_id", nullable = false)
-
+ @Column(name = "instance_info_id", nullable = false)
public int getTmodelInstanceInfoId() {
return this.tmodelInstanceInfoId;
}
-
public void setTmodelInstanceInfoId(int tmodelInstanceInfoId) {
this.tmodelInstanceInfoId = tmodelInstanceInfoId;
}
@@ -64,10 +55,10 @@
return false;
TmodelInstanceInfoId castOther = (TmodelInstanceInfoId) other;
- return ((this.getBindingKey() == castOther.getBindingKey()) || (this
- .getBindingKey() != null
- && castOther.getBindingKey() != null && this.getBindingKey()
- .equals(castOther.getBindingKey())))
+ return ((this.getEntityKey() == castOther.getEntityKey()) || (this
+ .getEntityKey() != null
+ && castOther.getEntityKey() != null && this.getEntityKey()
+ .equals(castOther.getEntityKey())))
&& (this.getTmodelInstanceInfoId() == castOther
.getTmodelInstanceInfoId());
}
@@ -77,7 +68,7 @@
result = 37
* result
- + (getBindingKey() == null ? 0 : this.getBindingKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getTmodelInstanceInfoId();
return result;
Modified: 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=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java Fri Dec 5 16:45:52 2008
@@ -18,6 +18,7 @@
import java.util.Date;
import javax.persistence.Column;
+import javax.persistence.Id;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.MappedSuperclass;
@@ -28,8 +29,18 @@
@MappedSuperclass
public abstract class UddiEntity {
+ protected String entityKey;
protected Date lastUpdate;
+ @Id
+ @Column(name = "entity_key", nullable = false, length = 255)
+ public String getEntityKey() {
+ return entityKey;
+ }
+ public void setEntityKey(String entityKey) {
+ this.entityKey = entityKey;
+ }
+
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "last_update", nullable = false, length = 29)
public Date getLastUpdate() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java Fri Dec 5 16:45:52 2008
@@ -24,7 +24,6 @@
public static final String ENTITY_NAME = "BindingTemplate";
public static final String ENTITY_ALIAS = "bt";
- public static final String KEY_NAME = "bindingKey";
public static final String KEY_NAME_PARENT = "businessService." + BusinessServiceQuery.KEY_NAME;
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java Fri Dec 5 16:45:52 2008
@@ -24,7 +24,6 @@
public static final String ENTITY_NAME = "BusinessEntity";
public static final String ENTITY_ALIAS = "be";
- public static final String KEY_NAME = "businessKey";
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java Fri Dec 5 16:45:52 2008
@@ -24,7 +24,6 @@
public static final String ENTITY_NAME = "BusinessService";
public static final String ENTITY_ALIAS = "bs";
- public static final String KEY_NAME = "serviceKey";
public static final String KEY_NAME_PARENT = "businessEntity." + BusinessEntityQuery.KEY_NAME;
protected static String selectSQL;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java Fri Dec 5 16:45:52 2008
@@ -36,8 +36,9 @@
public abstract class EntityQuery {
private static Logger log = Logger.getLogger(EntityQuery.class);
+ public static final String KEY_NAME = "entityKey";
public static final String GENERAL_KEYWORD_TMODEL = "uddi:uddi-org:general_keywords";
-
+
public static final int DEFAULT_MAXROWS = 100;
public static final int DEFAULT_MAXINCLAUSE = 1000;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java Fri Dec 5 16:45:52 2008
@@ -24,8 +24,8 @@
public static final String ENTITY_NAME = "PublisherAssertion";
public static final String ENTITY_ALIAS = "pa";
- public static final String FROM_KEY_NAME = "businessEntityByFromKey.businessKey";
- public static final String TO_KEY_NAME = "businessEntityByToKey.businessKey";
+ public static final String FROM_KEY_NAME = "businessEntityByFromKey." + KEY_NAME;
+ public static final String TO_KEY_NAME = "businessEntityByToKey." + KEY_NAME;
protected static String selectSQL;
protected static String deleteSQL;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org