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

svn commit: r692959 [2/3] - in /webservices/juddi/branches/v3_trunk: ./ juddi-core/ juddi-core/src/main/java/ juddi-core/src/main/java/org/ juddi-core/src/main/java/org/apache/ juddi-core/src/main/java/org/apache/ws/ juddi-core/src/main/java/org/apache...

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/BusinessService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/BusinessService.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/BusinessService.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/BusinessService.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,148 @@
+package org.apache.ws.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 java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.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_service")
+public class BusinessService 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);
+	private Set<ServiceCategory> serviceCategories = new HashSet<ServiceCategory>(0);
+
+	public BusinessService() {
+	}
+
+	public BusinessService(String serviceKey, BusinessEntity businessEntity,
+			UddiEntity uddiEntity, Date lastUpdate) {
+		this.serviceKey = serviceKey;
+		this.businessEntity = businessEntity;
+		this.uddiEntity = uddiEntity;
+		this.lastUpdate = lastUpdate;
+	}
+	public BusinessService(String serviceKey, BusinessEntity businessEntity,
+			UddiEntity uddiEntity, 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;
+		this.bindingTemplates = bindingTemplates;
+		this.serviceCategories = serviceCategories;
+	}
+
+	@Id
+	@Column(name = "service_key", unique = true, nullable = false, length = 41)
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBag.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBag.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBag.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,55 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "category_bag")
+public class CategoryBag implements java.io.Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	private CategoryBagId id;
+
+	public CategoryBag() {
+	}
+
+	public CategoryBag(CategoryBagId id) {
+		this.id = id;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "categoryBagKey", column = @Column(name = "category_bag_key", nullable = false, length = 41)),
+			@AttributeOverride(name = "tmodelKeyRef", column = @Column(name = "tmodel_key_ref", length = 41))})
+
+	public CategoryBagId getId() {
+		return this.id;
+	}
+
+	public void setId(CategoryBagId id) {
+		this.id = id;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagGroup.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagGroup.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagGroup.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagGroup.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,74 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "category_bag_group")
+public class CategoryBagGroup implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private int bagGroupId;
+	private String bindingKey;
+	private String categoryBagKey;
+
+	public CategoryBagGroup() {
+	}
+
+	public CategoryBagGroup(int bagGroupId, String bindingKey,
+			String categoryBagKey) {
+		this.bagGroupId = bagGroupId;
+		this.bindingKey = bindingKey;
+		this.categoryBagKey = categoryBagKey;
+	}
+
+	@Id
+	@Column(name = "bag_group_id", unique = true, nullable = false)
+
+	public int getBagGroupId() {
+		return this.bagGroupId;
+	}
+
+	public void setBagGroupId(int bagGroupId) {
+		this.bagGroupId = bagGroupId;
+	}
+
+	@Column(name = "binding_key", nullable = false, length = 41)
+	public String getBindingKey() {
+		return this.bindingKey;
+	}
+
+	public void setBindingKey(String bindingKey) {
+		this.bindingKey = bindingKey;
+	}
+
+	@Column(name = "category_bag_key", nullable = false, length = 41)
+	public String getCategoryBagKey() {
+		return this.categoryBagKey;
+	}
+
+	public void setCategoryBagKey(String categoryBagKey) {
+		this.categoryBagKey = categoryBagKey;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/CategoryBagId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,93 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class CategoryBagId implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String categoryBagKey;
+	private String tmodelKeyRef;
+
+	public CategoryBagId() {
+	}
+
+	public CategoryBagId(String categoryBagKey) {
+		this.categoryBagKey = categoryBagKey;
+	}
+	public CategoryBagId(String categoryBagKey, String tmodelKeyRef) {
+		this.categoryBagKey = categoryBagKey;
+		this.tmodelKeyRef = tmodelKeyRef;
+	}
+
+	@Column(name = "category_bag_key", nullable = false, length = 41)
+	public String getCategoryBagKey() {
+		return this.categoryBagKey;
+	}
+
+	public void setCategoryBagKey(String categoryBagKey) {
+		this.categoryBagKey = categoryBagKey;
+	}
+
+	@Column(name = "tmodel_key_ref", length = 41)
+	public String getTmodelKeyRef() {
+		return this.tmodelKeyRef;
+	}
+
+	public void setTmodelKeyRef(String tmodelKeyRef) {
+		this.tmodelKeyRef = tmodelKeyRef;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof CategoryBagId))
+			return false;
+		CategoryBagId castOther = (CategoryBagId) other;
+
+		return ((this.getCategoryBagKey() == castOther.getCategoryBagKey()) || (this
+				.getCategoryBagKey() != null
+				&& castOther.getCategoryBagKey() != null && this
+				.getCategoryBagKey().equals(castOther.getCategoryBagKey())))
+				&& ((this.getTmodelKeyRef() == castOther.getTmodelKeyRef()) || (this
+						.getTmodelKeyRef() != null
+						&& castOther.getTmodelKeyRef() != null && this
+						.getTmodelKeyRef().equals(castOther.getTmodelKeyRef())));
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getCategoryBagKey() == null ? 0 : this.getCategoryBagKey()
+						.hashCode());
+		result = 37
+				* result
+				+ (getTmodelKeyRef() == null ? 0 : this.getTmodelKeyRef()
+						.hashCode());
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Contact.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Contact.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Contact.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Contact.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,146 @@
+package org.apache.ws.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.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;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "contact")
+public class Contact implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private ContactId id;
+	private BusinessEntity businessEntity;
+	private String useType;
+	private String personName;
+	private Set<ContactDescr> contactDescrs = new HashSet<ContactDescr>(0);
+	private Set<Email> emails = new HashSet<Email>(0);
+	private Set<Phone> phones = new HashSet<Phone>(0);
+	private Set<Address> addresses = new HashSet<Address>(0);
+
+	public Contact() {
+	}
+
+	public Contact(ContactId id, BusinessEntity businessEntity,
+			String personName) {
+		this.id = id;
+		this.businessEntity = businessEntity;
+		this.personName = personName;
+	}
+	public Contact(ContactId id, BusinessEntity businessEntity, String useType,
+			String personName, Set<ContactDescr> contactDescrs,
+			Set<Email> emails, Set<Phone> phones, Set<Address> addresses) {
+		this.id = id;
+		this.businessEntity = businessEntity;
+		this.useType = useType;
+		this.personName = personName;
+		this.contactDescrs = contactDescrs;
+		this.emails = emails;
+		this.phones = phones;
+		this.addresses = addresses;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 41)),
+			@AttributeOverride(name = "contactId", column = @Column(name = "contact_id", nullable = false))})
+
+	public ContactId getId() {
+		return this.id;
+	}
+
+	public void setId(ContactId id) {
+		this.id = id;
+	}
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "business_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")
+	public String getUseType() {
+		return this.useType;
+	}
+
+	public void setUseType(String useType) {
+		this.useType = useType;
+	}
+
+	@Column(name = "person_name", nullable = false)
+
+	public String getPersonName() {
+		return this.personName;
+	}
+
+	public void setPersonName(String personName) {
+		this.personName = personName;
+	}
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
+	public Set<ContactDescr> getContactDescrs() {
+		return this.contactDescrs;
+	}
+
+	public void setContactDescrs(Set<ContactDescr> contactDescrs) {
+		this.contactDescrs = contactDescrs;
+	}
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
+	public Set<Email> getEmails() {
+		return this.emails;
+	}
+
+	public void setEmails(Set<Email> emails) {
+		this.emails = emails;
+	}
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
+	public Set<Phone> getPhones() {
+		return this.phones;
+	}
+
+	public void setPhones(Set<Phone> phones) {
+		this.phones = phones;
+	}
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
+	public Set<Address> getAddresses() {
+		return this.addresses;
+	}
+
+	public void setAddresses(Set<Address> addresses) {
+		this.addresses = addresses;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescr.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescr.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescr.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,103 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "contact_descr")
+public class ContactDescr implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private ContactDescrId id;
+	private Contact contact;
+	private String langCode;
+	private String descr;
+
+	public ContactDescr() {
+	}
+
+	public ContactDescr(ContactDescrId id, Contact contact, String descr) {
+		this.id = id;
+		this.contact = contact;
+		this.descr = descr;
+	}
+	public ContactDescr(ContactDescrId id, Contact contact, String langCode,
+			String descr) {
+		this.id = id;
+		this.contact = contact;
+		this.langCode = langCode;
+		this.descr = descr;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 41)),
+			@AttributeOverride(name = "contactId", column = @Column(name = "contact_id", nullable = false)),
+			@AttributeOverride(name = "contactDescrId", column = @Column(name = "contact_descr_id", nullable = false))})
+
+	public ContactDescrId getId() {
+		return this.id;
+	}
+
+	public void setId(ContactDescrId id) {
+		this.id = id;
+	}
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumns({
+			@JoinColumn(name = "business_key", referencedColumnName = "business_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;
+	}
+
+	@Column(name = "lang_code", length = 5)
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescrId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescrId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactDescrId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,99 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class ContactDescrId implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String businessKey;
+	private int contactId;
+	private int contactDescrId;
+
+	public ContactDescrId() {
+	}
+
+	public ContactDescrId(String businessKey, int contactId, int contactDescrId) {
+		this.businessKey = businessKey;
+		this.contactId = contactId;
+		this.contactDescrId = contactDescrId;
+	}
+
+	@Column(name = "business_key", nullable = false, length = 41)
+	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 = "contact_descr_id", nullable = false)
+
+	public int getContactDescrId() {
+		return this.contactDescrId;
+	}
+
+	public void setContactDescrId(int contactDescrId) {
+		this.contactDescrId = contactDescrId;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof ContactDescrId))
+			return false;
+		ContactDescrId castOther = (ContactDescrId) other;
+
+		return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
+				.getBusinessKey() != null
+				&& castOther.getBusinessKey() != null && this.getBusinessKey()
+				.equals(castOther.getBusinessKey())))
+				&& (this.getContactId() == castOther.getContactId())
+				&& (this.getContactDescrId() == castOther.getContactDescrId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBusinessKey() == null ? 0 : this.getBusinessKey()
+						.hashCode());
+		result = 37 * result + this.getContactId();
+		result = 37 * result + this.getContactDescrId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ContactId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,85 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class ContactId implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String businessKey;
+	private int contactId;
+
+	public ContactId() {
+	}
+
+	public ContactId(String businessKey, int contactId) {
+		this.businessKey = businessKey;
+		this.contactId = contactId;
+	}
+
+	@Column(name = "business_key", nullable = false, length = 41)
+	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;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof ContactId))
+			return false;
+		ContactId castOther = (ContactId) other;
+
+		return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
+				.getBusinessKey() != null
+				&& castOther.getBusinessKey() != null && this.getBusinessKey()
+				.equals(castOther.getBusinessKey())))
+				&& (this.getContactId() == castOther.getContactId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBusinessKey() == null ? 0 : this.getBusinessKey()
+						.hashCode());
+		result = 37 * result + this.getContactId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrl.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrl.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrl.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,95 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "discovery_url")
+public class DiscoveryUrl implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private DiscoveryUrlId id;
+	private BusinessEntity businessEntity;
+	private String useType;
+	private String url;
+
+	public DiscoveryUrl() {
+	}
+
+	public DiscoveryUrl(DiscoveryUrlId id, BusinessEntity businessEntity,
+			String useType, String url) {
+		this.id = id;
+		this.businessEntity = businessEntity;
+		this.useType = useType;
+		this.url = url;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 41)),
+			@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)
+
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrlId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrlId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrlId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/DiscoveryUrlId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,85 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class DiscoveryUrlId 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;
+		this.discoveryUrlId = discoveryUrlId;
+	}
+
+	@Column(name = "business_key", nullable = false, length = 41)
+	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;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof DiscoveryUrlId))
+			return false;
+		DiscoveryUrlId castOther = (DiscoveryUrlId) other;
+
+		return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
+				.getBusinessKey() != null
+				&& castOther.getBusinessKey() != null && this.getBusinessKey()
+				.equals(castOther.getBusinessKey())))
+				&& (this.getDiscoveryUrlId() == castOther.getDiscoveryUrlId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBusinessKey() == null ? 0 : this.getBusinessKey()
+						.hashCode());
+		result = 37 * result + this.getDiscoveryUrlId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Email.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Email.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Email.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Email.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,103 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "email")
+public class Email implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private EmailId id;
+	private Contact contact;
+	private String useType;
+	private String emailAddress;
+
+	public Email() {
+	}
+
+	public Email(EmailId id, Contact contact, String emailAddress) {
+		this.id = id;
+		this.contact = contact;
+		this.emailAddress = emailAddress;
+	}
+	public Email(EmailId id, Contact contact, String useType,
+			String emailAddress) {
+		this.id = id;
+		this.contact = contact;
+		this.useType = useType;
+		this.emailAddress = emailAddress;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 41)),
+			@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 = "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;
+	}
+
+	@Column(name = "use_type")
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/EmailId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/EmailId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/EmailId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/EmailId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,99 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class EmailId 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;
+		this.contactId = contactId;
+		this.emailId = emailId;
+	}
+
+	@Column(name = "business_key", nullable = false, length = 41)
+	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;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof EmailId))
+			return false;
+		EmailId castOther = (EmailId) other;
+
+		return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
+				.getBusinessKey() != null
+				&& castOther.getBusinessKey() != null && this.getBusinessKey()
+				.equals(castOther.getBusinessKey())))
+				&& (this.getContactId() == castOther.getContactId())
+				&& (this.getEmailId() == castOther.getEmailId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBusinessKey() == null ? 0 : this.getBusinessKey()
+						.hashCode());
+		result = 37 * result + this.getContactId();
+		result = 37 * result + this.getEmailId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescr.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescr.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescr.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,104 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "instance_details_descr")
+public class InstanceDetailsDescr implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private InstanceDetailsDescrId id;
+	private TmodelInstanceInfo tmodelInstanceInfo;
+	private String langCode;
+	private String descr;
+
+	public InstanceDetailsDescr() {
+	}
+
+	public InstanceDetailsDescr(InstanceDetailsDescrId id,
+			TmodelInstanceInfo tmodelInstanceInfo, String descr) {
+		this.id = id;
+		this.tmodelInstanceInfo = tmodelInstanceInfo;
+		this.descr = descr;
+	}
+	public InstanceDetailsDescr(InstanceDetailsDescrId id,
+			TmodelInstanceInfo tmodelInstanceInfo, String langCode, String descr) {
+		this.id = id;
+		this.tmodelInstanceInfo = tmodelInstanceInfo;
+		this.langCode = langCode;
+		this.descr = descr;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 41)),
+			@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)})
+
+	public TmodelInstanceInfo getTmodelInstanceInfo() {
+		return this.tmodelInstanceInfo;
+	}
+
+	public void setTmodelInstanceInfo(TmodelInstanceInfo tmodelInstanceInfo) {
+		this.tmodelInstanceInfo = tmodelInstanceInfo;
+	}
+
+	@Column(name = "lang_code", length = 5)
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescrId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescrId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDescrId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,102 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class InstanceDetailsDescrId 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,
+			int instanceDetailsDescrId) {
+		this.bindingKey = bindingKey;
+		this.tmodelInstanceInfoId = tmodelInstanceInfoId;
+		this.instanceDetailsDescrId = instanceDetailsDescrId;
+	}
+
+	@Column(name = "binding_key", nullable = false, length = 41)
+	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)
+
+	public int getInstanceDetailsDescrId() {
+		return this.instanceDetailsDescrId;
+	}
+
+	public void setInstanceDetailsDescrId(int instanceDetailsDescrId) {
+		this.instanceDetailsDescrId = instanceDetailsDescrId;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof InstanceDetailsDescrId))
+			return false;
+		InstanceDetailsDescrId castOther = (InstanceDetailsDescrId) other;
+
+		return ((this.getBindingKey() == castOther.getBindingKey()) || (this
+				.getBindingKey() != null
+				&& castOther.getBindingKey() != null && this.getBindingKey()
+				.equals(castOther.getBindingKey())))
+				&& (this.getTmodelInstanceInfoId() == castOther
+						.getTmodelInstanceInfoId())
+				&& (this.getInstanceDetailsDescrId() == castOther
+						.getInstanceDetailsDescrId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBindingKey() == null ? 0 : this.getBindingKey()
+						.hashCode());
+		result = 37 * result + this.getTmodelInstanceInfoId();
+		result = 37 * result + this.getInstanceDetailsDescrId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescr.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescr.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescr.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,104 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "instance_details_doc_descr")
+public class InstanceDetailsDocDescr implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private InstanceDetailsDocDescrId id;
+	private TmodelInstanceInfo tmodelInstanceInfo;
+	private String langCode;
+	private String descr;
+
+	public InstanceDetailsDocDescr() {
+	}
+
+	public InstanceDetailsDocDescr(InstanceDetailsDocDescrId id,
+			TmodelInstanceInfo tmodelInstanceInfo, String descr) {
+		this.id = id;
+		this.tmodelInstanceInfo = tmodelInstanceInfo;
+		this.descr = descr;
+	}
+	public InstanceDetailsDocDescr(InstanceDetailsDocDescrId id,
+			TmodelInstanceInfo tmodelInstanceInfo, String langCode, String descr) {
+		this.id = id;
+		this.tmodelInstanceInfo = tmodelInstanceInfo;
+		this.langCode = langCode;
+		this.descr = descr;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 41)),
+			@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)})
+
+	public TmodelInstanceInfo getTmodelInstanceInfo() {
+		return this.tmodelInstanceInfo;
+	}
+
+	public void setTmodelInstanceInfo(TmodelInstanceInfo tmodelInstanceInfo) {
+		this.tmodelInstanceInfo = tmodelInstanceInfo;
+	}
+
+	@Column(name = "lang_code", length = 5)
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescrId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescrId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/InstanceDetailsDocDescrId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,102 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class InstanceDetailsDocDescrId 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,
+			int tmodelInstanceInfoId, int instanceDetailsDocDescrId) {
+		this.bindingKey = bindingKey;
+		this.tmodelInstanceInfoId = tmodelInstanceInfoId;
+		this.instanceDetailsDocDescrId = instanceDetailsDocDescrId;
+	}
+
+	@Column(name = "binding_key", nullable = false, length = 41)
+	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)
+
+	public int getInstanceDetailsDocDescrId() {
+		return this.instanceDetailsDocDescrId;
+	}
+
+	public void setInstanceDetailsDocDescrId(int instanceDetailsDocDescrId) {
+		this.instanceDetailsDocDescrId = instanceDetailsDocDescrId;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof InstanceDetailsDocDescrId))
+			return false;
+		InstanceDetailsDocDescrId castOther = (InstanceDetailsDocDescrId) other;
+
+		return ((this.getBindingKey() == castOther.getBindingKey()) || (this
+				.getBindingKey() != null
+				&& castOther.getBindingKey() != null && this.getBindingKey()
+				.equals(castOther.getBindingKey())))
+				&& (this.getTmodelInstanceInfoId() == castOther
+						.getTmodelInstanceInfoId())
+				&& (this.getInstanceDetailsDocDescrId() == castOther
+						.getInstanceDetailsDocDescrId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBindingKey() == null ? 0 : this.getBindingKey()
+						.hashCode());
+		result = 37 * result + this.getTmodelInstanceInfoId();
+		result = 37 * result + this.getInstanceDetailsDocDescrId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Phone.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Phone.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Phone.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Phone.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,101 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "phone")
+public class Phone implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private PhoneId id;
+	private Contact contact;
+	private String useType;
+	private String phoneNumber;
+
+	public Phone() {
+	}
+
+	public Phone(PhoneId id, Contact contact, String phoneNumber) {
+		this.id = id;
+		this.contact = contact;
+		this.phoneNumber = phoneNumber;
+	}
+	public Phone(PhoneId id, Contact contact, String useType, String phoneNumber) {
+		this.id = id;
+		this.contact = contact;
+		this.useType = useType;
+		this.phoneNumber = phoneNumber;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 41)),
+			@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 = "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;
+	}
+
+	@Column(name = "use_type")
+	public String getUseType() {
+		return this.useType;
+	}
+
+	public void setUseType(String useType) {
+		this.useType = useType;
+	}
+
+	@Column(name = "phone_number", nullable = false, length = 50)
+	public String getPhoneNumber() {
+		return this.phoneNumber;
+	}
+
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PhoneId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PhoneId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PhoneId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PhoneId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,99 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class PhoneId 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;
+		this.contactId = contactId;
+		this.phoneId = phoneId;
+	}
+
+	@Column(name = "business_key", nullable = false, length = 41)
+	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;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof PhoneId))
+			return false;
+		PhoneId castOther = (PhoneId) other;
+
+		return ((this.getBusinessKey() == castOther.getBusinessKey()) || (this
+				.getBusinessKey() != null
+				&& castOther.getBusinessKey() != null && this.getBusinessKey()
+				.equals(castOther.getBusinessKey())))
+				&& (this.getContactId() == castOther.getContactId())
+				&& (this.getPhoneId() == castOther.getPhoneId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getBusinessKey() == null ? 0 : this.getBusinessKey()
+						.hashCode());
+		result = 37 * result + this.getContactId();
+		result = 37 * result + this.getPhoneId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Publisher.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Publisher.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/Publisher.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,146 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "publisher")
+public class Publisher implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String publisherId;
+	private String publisherName;
+	private String emailAddress;
+	private String isAdmin;
+	private String isEnabled;
+	private Integer maxBusinesses;
+	private Integer maxServicesPerBusiness;
+	private Integer maxBindingsPerService;
+	private Integer maxTmodels;
+
+	public Publisher() {
+	}
+
+	public Publisher(String publisherId, String publisherName) {
+		this.publisherId = publisherId;
+		this.publisherName = publisherName;
+	}
+	public Publisher(String publisherId, String publisherName,
+			String emailAddress, String isAdmin, String isEnabled,
+			Integer maxBusinesses, Integer maxServicesPerBusiness,
+			Integer maxBindingsPerService, Integer maxTmodels) {
+		this.publisherId = publisherId;
+		this.publisherName = publisherName;
+		this.emailAddress = emailAddress;
+		this.isAdmin = isAdmin;
+		this.isEnabled = isEnabled;
+		this.maxBusinesses = maxBusinesses;
+		this.maxServicesPerBusiness = maxServicesPerBusiness;
+		this.maxBindingsPerService = maxBindingsPerService;
+		this.maxTmodels = maxTmodels;
+	}
+
+	@Id
+	@Column(name = "publisher_id", unique = true, nullable = false, length = 20)
+	public String getPublisherId() {
+		return this.publisherId;
+	}
+
+	public void setPublisherId(String publisherId) {
+		this.publisherId = publisherId;
+	}
+
+	@Column(name = "publisher_name", nullable = false)
+
+	public String getPublisherName() {
+		return this.publisherName;
+	}
+
+	public void setPublisherName(String publisherName) {
+		this.publisherName = publisherName;
+	}
+
+	@Column(name = "email_address")
+	public String getEmailAddress() {
+		return this.emailAddress;
+	}
+
+	public void setEmailAddress(String emailAddress) {
+		this.emailAddress = emailAddress;
+	}
+
+	@Column(name = "is_admin", length = 5)
+	public String getIsAdmin() {
+		return this.isAdmin;
+	}
+
+	public void setIsAdmin(String isAdmin) {
+		this.isAdmin = isAdmin;
+	}
+
+	@Column(name = "is_enabled", length = 5)
+	public String getIsEnabled() {
+		return this.isEnabled;
+	}
+
+	public void setIsEnabled(String isEnabled) {
+		this.isEnabled = isEnabled;
+	}
+
+	@Column(name = "max_businesses")
+	public Integer getMaxBusinesses() {
+		return this.maxBusinesses;
+	}
+
+	public void setMaxBusinesses(Integer maxBusinesses) {
+		this.maxBusinesses = maxBusinesses;
+	}
+
+	@Column(name = "max_services_per_business")
+	public Integer getMaxServicesPerBusiness() {
+		return this.maxServicesPerBusiness;
+	}
+
+	public void setMaxServicesPerBusiness(Integer maxServicesPerBusiness) {
+		this.maxServicesPerBusiness = maxServicesPerBusiness;
+	}
+
+	@Column(name = "max_bindings_per_service")
+	public Integer getMaxBindingsPerService() {
+		return this.maxBindingsPerService;
+	}
+
+	public void setMaxBindingsPerService(Integer maxBindingsPerService) {
+		this.maxBindingsPerService = maxBindingsPerService;
+	}
+
+	@Column(name = "max_tmodels")
+	public Integer getMaxTmodels() {
+		return this.maxTmodels;
+	}
+
+	public void setMaxTmodels(Integer maxTmodels) {
+		this.maxTmodels = maxTmodels;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertion.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertion.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertion.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertion.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,143 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "publisher_assertion")
+public class PublisherAssertion implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private PublisherAssertionId id;
+	private BusinessEntity businessEntityByToKey;
+	private BusinessEntity businessEntityByFromKey;
+	private String tmodelKey;
+	private String keyName;
+	private String keyValue;
+	private String fromCheck;
+	private String toCheck;
+
+	public PublisherAssertion() {
+	}
+
+	public PublisherAssertion(PublisherAssertionId id,
+			BusinessEntity businessEntityByToKey,
+			BusinessEntity businessEntityByFromKey, String tmodelKey,
+			String keyName, String keyValue, String fromCheck, String toCheck) {
+		this.id = id;
+		this.businessEntityByToKey = businessEntityByToKey;
+		this.businessEntityByFromKey = businessEntityByFromKey;
+		this.tmodelKey = tmodelKey;
+		this.keyName = keyName;
+		this.keyValue = keyValue;
+		this.fromCheck = fromCheck;
+		this.toCheck = toCheck;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "fromKey", column = @Column(name = "from_key", nullable = false, length = 41)),
+			@AttributeOverride(name = "toKey", column = @Column(name = "to_key", nullable = false, length = 41))})
+
+	public PublisherAssertionId getId() {
+		return this.id;
+	}
+
+	public void setId(PublisherAssertionId id) {
+		this.id = id;
+	}
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "to_key", nullable = false, insertable = false, updatable = false)
+
+	public BusinessEntity getBusinessEntityByToKey() {
+		return this.businessEntityByToKey;
+	}
+
+	public void setBusinessEntityByToKey(BusinessEntity businessEntityByToKey) {
+		this.businessEntityByToKey = businessEntityByToKey;
+	}
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "from_key", nullable = false, insertable = false, updatable = false)
+
+	public BusinessEntity getBusinessEntityByFromKey() {
+		return this.businessEntityByFromKey;
+	}
+
+	public void setBusinessEntityByFromKey(
+			BusinessEntity businessEntityByFromKey) {
+		this.businessEntityByFromKey = businessEntityByFromKey;
+	}
+
+	@Column(name = "tmodel_key", nullable = false, length = 41)
+	public String getTmodelKey() {
+		return this.tmodelKey;
+	}
+
+	public void setTmodelKey(String tmodelKey) {
+		this.tmodelKey = tmodelKey;
+	}
+
+	@Column(name = "key_name", nullable = false)
+
+	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;
+	}
+
+	@Column(name = "from_check", nullable = false, length = 5)
+	public String getFromCheck() {
+		return this.fromCheck;
+	}
+
+	public void setFromCheck(String fromCheck) {
+		this.fromCheck = fromCheck;
+	}
+
+	@Column(name = "to_check", nullable = false, length = 5)
+	public String getToCheck() {
+		return this.toCheck;
+	}
+
+	public void setToCheck(String toCheck) {
+		this.toCheck = toCheck;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertionId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertionId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertionId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/PublisherAssertionId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,86 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class PublisherAssertionId implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String fromKey;
+	private String toKey;
+
+	public PublisherAssertionId() {
+	}
+
+	public PublisherAssertionId(String fromKey, String toKey) {
+		this.fromKey = fromKey;
+		this.toKey = toKey;
+	}
+
+	@Column(name = "from_key", nullable = false, length = 41)
+	public String getFromKey() {
+		return this.fromKey;
+	}
+
+	public void setFromKey(String fromKey) {
+		this.fromKey = fromKey;
+	}
+
+	@Column(name = "to_key", nullable = false, length = 41)
+	public String getToKey() {
+		return this.toKey;
+	}
+
+	public void setToKey(String toKey) {
+		this.toKey = toKey;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof PublisherAssertionId))
+			return false;
+		PublisherAssertionId castOther = (PublisherAssertionId) other;
+
+		return ((this.getFromKey() == castOther.getFromKey()) || (this
+				.getFromKey() != null
+				&& castOther.getFromKey() != null && this.getFromKey().equals(
+				castOther.getFromKey())))
+				&& ((this.getToKey() == castOther.getToKey()) || (this
+						.getToKey() != null
+						&& castOther.getToKey() != null && this.getToKey()
+						.equals(castOther.getToKey())));
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37 * result
+				+ (getFromKey() == null ? 0 : this.getFromKey().hashCode());
+		result = 37 * result
+				+ (getToKey() == null ? 0 : this.getToKey().hashCode());
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategory.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategory.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategory.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategory.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,112 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "service_category")
+public class ServiceCategory implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private ServiceCategoryId id;
+	private BusinessService businessService;
+	private String tmodelKeyRef;
+	private String keyName;
+	private String keyValue;
+
+	public ServiceCategory() {
+	}
+
+	public ServiceCategory(ServiceCategoryId id,
+			BusinessService businessService, String keyValue) {
+		this.id = id;
+		this.businessService = businessService;
+		this.keyValue = keyValue;
+	}
+	public ServiceCategory(ServiceCategoryId id,
+			BusinessService businessService, String tmodelKeyRef,
+			String keyName, String keyValue) {
+		this.id = id;
+		this.businessService = businessService;
+		this.tmodelKeyRef = tmodelKeyRef;
+		this.keyName = keyName;
+		this.keyValue = keyValue;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "serviceKey", column = @Column(name = "service_key", nullable = false, length = 41)),
+			@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)
+
+	public BusinessService getBusinessService() {
+		return this.businessService;
+	}
+
+	public void setBusinessService(BusinessService businessService) {
+		this.businessService = businessService;
+	}
+
+	@Column(name = "tmodel_key_ref", length = 41)
+	public String getTmodelKeyRef() {
+		return this.tmodelKeyRef;
+	}
+
+	public void setTmodelKeyRef(String tmodelKeyRef) {
+		this.tmodelKeyRef = tmodelKeyRef;
+	}
+
+	@Column(name = "key_name")
+	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;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategoryId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategoryId.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategoryId.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceCategoryId.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,85 @@
+package org.apache.ws.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 javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Embeddable
+public class ServiceCategoryId 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;
+		this.categoryId = categoryId;
+	}
+
+	@Column(name = "service_key", nullable = false, length = 41)
+	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;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof ServiceCategoryId))
+			return false;
+		ServiceCategoryId castOther = (ServiceCategoryId) other;
+
+		return ((this.getServiceKey() == castOther.getServiceKey()) || (this
+				.getServiceKey() != null
+				&& castOther.getServiceKey() != null && this.getServiceKey()
+				.equals(castOther.getServiceKey())))
+				&& (this.getCategoryId() == castOther.getCategoryId());
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37
+				* result
+				+ (getServiceKey() == null ? 0 : this.getServiceKey()
+						.hashCode());
+		result = 37 * result + this.getCategoryId();
+		return result;
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceDescr.java?rev=692959&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceDescr.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/ws/juddi/model/ServiceDescr.java Sun Sep  7 14:59:54 2008
@@ -0,0 +1,100 @@
+package org.apache.ws.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 javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ * @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ */
+@Entity
+@Table(name = "service_descr")
+public class ServiceDescr implements java.io.Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private ServiceDescrId id;
+	private BusinessService businessService;
+	private String langCode;
+	private String descr;
+
+	public ServiceDescr() {
+	}
+
+	public ServiceDescr(ServiceDescrId id, BusinessService businessService,
+			String descr) {
+		this.id = id;
+		this.businessService = businessService;
+		this.descr = descr;
+	}
+	public ServiceDescr(ServiceDescrId id, BusinessService businessService,
+			String langCode, String descr) {
+		this.id = id;
+		this.businessService = businessService;
+		this.langCode = langCode;
+		this.descr = descr;
+	}
+
+	@EmbeddedId
+	@AttributeOverrides({
+			@AttributeOverride(name = "serviceKey", column = @Column(name = "service_key", nullable = false, length = 41)),
+			@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)
+
+	public BusinessService getBusinessService() {
+		return this.businessService;
+	}
+
+	public void setBusinessService(BusinessService businessService) {
+		this.businessService = businessService;
+	}
+
+	@Column(name = "lang_code", length = 5)
+	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;
+	}
+
+}



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