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 [1/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/...
Author: jfaath
Date: Fri Dec 5 16:45:52 2008
New Revision: 723935
URL: http://svn.apache.org/viewvc?rev=723935&view=rev
Log:
Cleaned up the model by applying inheritance. This includes moving entity keys to the UddiEntity superclass and applying a hierarchy to the nested Id types.
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Id.java (with props)
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Address.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLineId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategory.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategory.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifier.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifierId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessNameId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrl.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/DiscoveryUrlId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Email.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/EmailId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/InstanceDetailsDocDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Phone.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/PhoneId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategory.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceCategoryId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceName.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ServiceNameId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategory.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelDocDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifier.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelIdentifierId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfo.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescr.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoDescrId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelInstanceInfoId.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntity.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/util/Install.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java Fri Dec 5 16:45:52 2008
@@ -376,11 +376,11 @@
org.apache.juddi.model.BindingTemplate modelBindingTemplate = new org.apache.juddi.model.BindingTemplate();
org.apache.juddi.model.BusinessService modelBusinessService = new org.apache.juddi.model.BusinessService();
- modelBusinessService.setServiceKey(apiBindingTemplate.getServiceKey());
+ modelBusinessService.setEntityKey(apiBindingTemplate.getServiceKey());
MappingApiToModel.mapBindingTemplate(apiBindingTemplate, modelBindingTemplate, modelBusinessService);
- Object existingUddiEntity = em.find(modelBindingTemplate.getClass(), modelBindingTemplate.getBindingKey());
+ Object existingUddiEntity = em.find(modelBindingTemplate.getClass(), modelBindingTemplate.getEntityKey());
if (existingUddiEntity != null)
em.remove(existingUddiEntity);
@@ -417,7 +417,7 @@
MappingApiToModel.mapBusinessEntity(apiBusinessEntity, modelBusinessEntity);
- Object existingUddiEntity = em.find(modelBusinessEntity.getClass(), modelBusinessEntity.getBusinessKey());
+ Object existingUddiEntity = em.find(modelBusinessEntity.getClass(), modelBusinessEntity.getEntityKey());
if (existingUddiEntity != null)
em.remove(existingUddiEntity);
@@ -452,11 +452,11 @@
org.apache.juddi.model.BusinessService modelBusinessService = new org.apache.juddi.model.BusinessService();
org.apache.juddi.model.BusinessEntity modelBusinessEntity = new org.apache.juddi.model.BusinessEntity();
- modelBusinessEntity.setBusinessKey(apiBusinessService.getBusinessKey());
+ modelBusinessEntity.setEntityKey(apiBusinessService.getBusinessKey());
MappingApiToModel.mapBusinessService(apiBusinessService, modelBusinessService, modelBusinessEntity);
- Object existingUddiEntity = em.find(modelBusinessService.getClass(), modelBusinessService.getServiceKey());
+ Object existingUddiEntity = em.find(modelBusinessService.getClass(), modelBusinessService.getEntityKey());
if (existingUddiEntity != null)
em.remove(existingUddiEntity);
@@ -493,7 +493,7 @@
MappingApiToModel.mapTModel(apiTModel, modelTModel);
- Object existingUddiEntity = em.find(modelTModel.getClass(), modelTModel.getTmodelKey());
+ Object existingUddiEntity = em.find(modelTModel.getClass(), modelTModel.getEntityKey());
if (existingUddiEntity != null)
em.remove(existingUddiEntity);
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Fri Dec 5 16:45:52 2008
@@ -50,7 +50,7 @@
org.apache.juddi.model.BusinessEntity modelBusinessEntity)
throws DispositionReportFaultMessage {
- modelBusinessEntity.setBusinessKey(apiBusinessEntity.getBusinessKey());
+ modelBusinessEntity.setEntityKey(apiBusinessEntity.getBusinessKey());
modelBusinessEntity.setLastUpdate(new Date());
mapBusinessNames(apiBusinessEntity.getName(), modelBusinessEntity.getBusinessNames(), modelBusinessEntity);
@@ -72,7 +72,7 @@
int id = 0;
for (org.uddi.api_v3.Name apiName : apiNameList) {
- org.apache.juddi.model.BusinessNameId businessNameId = new org.apache.juddi.model.BusinessNameId(modelBusinessEntity.getBusinessKey(), id++);
+ org.apache.juddi.model.BusinessNameId businessNameId = new org.apache.juddi.model.BusinessNameId(modelBusinessEntity.getEntityKey(), id++);
modelNameList.add(new org.apache.juddi.model.BusinessName(businessNameId, modelBusinessEntity, apiName.getLang(), apiName.getValue()));
}
}
@@ -85,7 +85,7 @@
int id = 0;
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
- org.apache.juddi.model.BusinessDescrId businessDescId = new org.apache.juddi.model.BusinessDescrId(modelBusinessEntity.getBusinessKey(), id++);
+ org.apache.juddi.model.BusinessDescrId businessDescId = new org.apache.juddi.model.BusinessDescrId(modelBusinessEntity.getEntityKey(), id++);
modelDescList.add(new org.apache.juddi.model.BusinessDescr(businessDescId, modelBusinessEntity, apiDesc.getLang(), apiDesc.getValue()));
}
}
@@ -100,7 +100,7 @@
List<org.uddi.api_v3.DiscoveryURL> apiDiscUrlList = apiDiscUrls.getDiscoveryURL();
int id = 0;
for (org.uddi.api_v3.DiscoveryURL apiDiscUrl : apiDiscUrlList) {
- org.apache.juddi.model.DiscoveryUrlId discUrlId = new org.apache.juddi.model.DiscoveryUrlId(modelBusinessEntity.getBusinessKey(), id++);
+ org.apache.juddi.model.DiscoveryUrlId discUrlId = new org.apache.juddi.model.DiscoveryUrlId(modelBusinessEntity.getEntityKey(), id++);
modelDiscUrlList.add(new org.apache.juddi.model.DiscoveryUrl(discUrlId, modelBusinessEntity, apiDiscUrl.getUseType(), apiDiscUrl.getValue()));
}
}
@@ -122,14 +122,14 @@
if (apiNameList != null && apiNameList.size() > 0)
personName = ((org.uddi.api_v3.PersonName)apiNameList.get(0)).getValue();
- org.apache.juddi.model.ContactId contactId = new org.apache.juddi.model.ContactId(modelBusinessEntity.getBusinessKey(), id++);
+ org.apache.juddi.model.ContactId contactId = new org.apache.juddi.model.ContactId(modelBusinessEntity.getEntityKey(), id++);
org.apache.juddi.model.Contact modelContact = new org.apache.juddi.model.Contact(contactId, modelBusinessEntity, personName);
modelContact.setUseType(apiContact.getUseType());
- mapContactDescriptions(apiContact.getDescription(), modelContact.getContactDescrs(), modelContact, modelBusinessEntity.getBusinessKey());
- mapContactEmails(apiContact.getEmail(), modelContact.getEmails(), modelContact, modelBusinessEntity.getBusinessKey());
- mapContactPhones(apiContact.getPhone(), modelContact.getPhones(), modelContact, modelBusinessEntity.getBusinessKey());
- mapContactAddresses(apiContact.getAddress(), modelContact.getAddresses(), modelContact, modelBusinessEntity.getBusinessKey());
+ mapContactDescriptions(apiContact.getDescription(), modelContact.getContactDescrs(), modelContact, modelBusinessEntity.getEntityKey());
+ mapContactEmails(apiContact.getEmail(), modelContact.getEmails(), modelContact, modelBusinessEntity.getEntityKey());
+ mapContactPhones(apiContact.getPhone(), modelContact.getPhones(), modelContact, modelBusinessEntity.getEntityKey());
+ mapContactAddresses(apiContact.getAddress(), modelContact.getAddresses(), modelContact, modelBusinessEntity.getEntityKey());
modelContactList.add(modelContact);
}
@@ -225,7 +225,7 @@
List<org.uddi.api_v3.KeyedReference> apiKeyedRefList = apiIdentifierBag.getKeyedReference();
int id = 0;
for (org.uddi.api_v3.KeyedReference apiKeyedRef : apiKeyedRefList) {
- org.apache.juddi.model.BusinessIdentifierId identifierId = new org.apache.juddi.model.BusinessIdentifierId(modelBusinessEntity.getBusinessKey(), id++);
+ org.apache.juddi.model.BusinessIdentifierId identifierId = new org.apache.juddi.model.BusinessIdentifierId(modelBusinessEntity.getEntityKey(), id++);
modelIdentifierList.add(new org.apache.juddi.model.BusinessIdentifier(identifierId, modelBusinessEntity, apiKeyedRef.getTModelKey(), apiKeyedRef.getKeyName(), apiKeyedRef.getKeyValue()));
}
}
@@ -246,7 +246,7 @@
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
org.uddi.api_v3.KeyedReference apiKeyedRef = (org.uddi.api_v3.KeyedReference)elem.getValue();
- org.apache.juddi.model.BusinessCategoryId categoryId = new org.apache.juddi.model.BusinessCategoryId(modelBusinessEntity.getBusinessKey(), id++);
+ org.apache.juddi.model.BusinessCategoryId categoryId = new org.apache.juddi.model.BusinessCategoryId(modelBusinessEntity.getEntityKey(), id++);
modelCategoryList.add(new org.apache.juddi.model.BusinessCategory(categoryId, modelBusinessEntity, apiKeyedRef.getTModelKey(), apiKeyedRef.getKeyName(), apiKeyedRef.getKeyValue()));
}
}
@@ -277,7 +277,7 @@
throws DispositionReportFaultMessage {
modelBusinessService.setBusinessEntity(modelBusinessEntity);
- modelBusinessService.setServiceKey(apiBusinessService.getServiceKey());
+ modelBusinessService.setEntityKey(apiBusinessService.getServiceKey());
modelBusinessService.setLastUpdate(new Date());
mapServiceNames(apiBusinessService.getName(), modelBusinessService.getServiceNames(), modelBusinessService);
@@ -296,7 +296,7 @@
int id = 0;
for (org.uddi.api_v3.Name apiName : apiNameList) {
- org.apache.juddi.model.ServiceNameId serviceNameId = new org.apache.juddi.model.ServiceNameId(modelBusinessService.getServiceKey(), id++);
+ org.apache.juddi.model.ServiceNameId serviceNameId = new org.apache.juddi.model.ServiceNameId(modelBusinessService.getEntityKey(), id++);
modelNameList.add(new org.apache.juddi.model.ServiceName(serviceNameId, modelBusinessService, apiName.getLang(), apiName.getValue()));
}
}
@@ -309,7 +309,7 @@
int id = 0;
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
- org.apache.juddi.model.ServiceDescrId serviceDescId = new org.apache.juddi.model.ServiceDescrId(modelBusinessService.getServiceKey(), id++);
+ org.apache.juddi.model.ServiceDescrId serviceDescId = new org.apache.juddi.model.ServiceDescrId(modelBusinessService.getEntityKey(), id++);
modelDescList.add(new org.apache.juddi.model.ServiceDescr(serviceDescId, modelBusinessService, apiDesc.getLang(), apiDesc.getValue()));
}
}
@@ -329,7 +329,7 @@
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
org.uddi.api_v3.KeyedReference apiKeyedRef = (org.uddi.api_v3.KeyedReference)elem.getValue();
- org.apache.juddi.model.ServiceCategoryId categoryId = new org.apache.juddi.model.ServiceCategoryId(modelBusinessService.getServiceKey(), id++);
+ org.apache.juddi.model.ServiceCategoryId categoryId = new org.apache.juddi.model.ServiceCategoryId(modelBusinessService.getEntityKey(), id++);
modelCategoryList.add(new org.apache.juddi.model.ServiceCategory(categoryId, modelBusinessService, apiKeyedRef.getTModelKey(), apiKeyedRef.getKeyName(), apiKeyedRef.getKeyValue()));
}
}
@@ -360,7 +360,7 @@
throws DispositionReportFaultMessage {
modelBindingTemplate.setBusinessService(modelBusinessService);
- modelBindingTemplate.setBindingKey(apiBindingTemplate.getBindingKey());
+ modelBindingTemplate.setEntityKey(apiBindingTemplate.getBindingKey());
modelBindingTemplate.setLastUpdate(new Date());
modelBindingTemplate.setAccessPointType(apiBindingTemplate.getAccessPoint().getUseType());
modelBindingTemplate.setAccessPointUrl(apiBindingTemplate.getAccessPoint().getValue());
@@ -379,7 +379,7 @@
int id = 0;
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
- org.apache.juddi.model.BindingDescrId bindingDescId = new org.apache.juddi.model.BindingDescrId(modelBindingTemplate.getBindingKey(), id++);
+ org.apache.juddi.model.BindingDescrId bindingDescId = new org.apache.juddi.model.BindingDescrId(modelBindingTemplate.getEntityKey(), id++);
modelDescList.add(new org.apache.juddi.model.BindingDescr(bindingDescId, modelBindingTemplate, apiDesc.getLang(), apiDesc.getValue()));
}
}
@@ -399,7 +399,7 @@
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
org.uddi.api_v3.KeyedReference apiKeyedRef = (org.uddi.api_v3.KeyedReference)elem.getValue();
- org.apache.juddi.model.BindingCategoryId categoryId = new org.apache.juddi.model.BindingCategoryId(modelBindingTemplate.getBindingKey(), id++);
+ org.apache.juddi.model.BindingCategoryId categoryId = new org.apache.juddi.model.BindingCategoryId(modelBindingTemplate.getEntityKey(), id++);
modelCategoryList.add(new org.apache.juddi.model.BindingCategory(categoryId, modelBindingTemplate, apiKeyedRef.getTModelKey(), apiKeyedRef.getKeyName(), apiKeyedRef.getKeyValue()));
}
}
@@ -416,11 +416,11 @@
List<org.uddi.api_v3.TModelInstanceInfo> apiTModelInstInfoList = apiTModelInstDetails.getTModelInstanceInfo();
int id = 0;
for (org.uddi.api_v3.TModelInstanceInfo apiTModelInstInfo : apiTModelInstInfoList) {
- org.apache.juddi.model.TmodelInstanceInfoId tmodelInstInfoId = new org.apache.juddi.model.TmodelInstanceInfoId(modelBindingTemplate.getBindingKey(), id++);
+ org.apache.juddi.model.TmodelInstanceInfoId tmodelInstInfoId = new org.apache.juddi.model.TmodelInstanceInfoId(modelBindingTemplate.getEntityKey(), id++);
org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo = new org.apache.juddi.model.TmodelInstanceInfo(tmodelInstInfoId, modelBindingTemplate, apiTModelInstInfo.getTModelKey());
- mapTModelInstanceInfoDescriptions(apiTModelInstInfo.getDescription(), modelTModelInstInfo.getTmodelInstanceInfoDescrs(), modelTModelInstInfo, modelBindingTemplate.getBindingKey());
- mapInstanceDetails(apiTModelInstInfo.getInstanceDetails(), modelTModelInstInfo, modelBindingTemplate.getBindingKey());
+ mapTModelInstanceInfoDescriptions(apiTModelInstInfo.getDescription(), modelTModelInstInfo.getTmodelInstanceInfoDescrs(), modelTModelInstInfo, modelBindingTemplate.getEntityKey());
+ mapInstanceDetails(apiTModelInstInfo.getInstanceDetails(), modelTModelInstInfo, modelBindingTemplate.getEntityKey());
modelTModelInstInfoList.add(modelTModelInstInfo);
}
@@ -473,7 +473,7 @@
org.apache.juddi.model.Tmodel modelTModel)
throws DispositionReportFaultMessage {
- modelTModel.setTmodelKey(apiTModel.getTModelKey());
+ modelTModel.setEntityKey(apiTModel.getTModelKey());
modelTModel.setLastUpdate(new Date());
modelTModel.setName(apiTModel.getName().getValue());
modelTModel.setDeleted(apiTModel.isDeleted());
@@ -493,7 +493,7 @@
int id = 0;
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
- org.apache.juddi.model.TmodelDescrId tmodelDescId = new org.apache.juddi.model.TmodelDescrId(modelTModel.getTmodelKey(), id++);
+ org.apache.juddi.model.TmodelDescrId tmodelDescId = new org.apache.juddi.model.TmodelDescrId(modelTModel.getEntityKey(), id++);
modelDescList.add(new org.apache.juddi.model.TmodelDescr(tmodelDescId, modelTModel, apiDesc.getLang(), apiDesc.getValue()));
}
}
@@ -508,7 +508,7 @@
List<org.uddi.api_v3.KeyedReference> apiKeyedRefList = apiIdentifierBag.getKeyedReference();
int id = 0;
for (org.uddi.api_v3.KeyedReference apiKeyedRef : apiKeyedRefList) {
- org.apache.juddi.model.TmodelIdentifierId identifierId = new org.apache.juddi.model.TmodelIdentifierId(modelTModel.getTmodelKey(), id++);
+ org.apache.juddi.model.TmodelIdentifierId identifierId = new org.apache.juddi.model.TmodelIdentifierId(modelTModel.getEntityKey(), id++);
modelIdentifierList.add(new org.apache.juddi.model.TmodelIdentifier(identifierId, modelTModel, apiKeyedRef.getTModelKey(), apiKeyedRef.getKeyName(), apiKeyedRef.getKeyValue()));
}
}
@@ -529,7 +529,7 @@
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
org.uddi.api_v3.KeyedReference apiKeyedRef = (org.uddi.api_v3.KeyedReference)elem.getValue();
- org.apache.juddi.model.TmodelCategoryId categoryId = new org.apache.juddi.model.TmodelCategoryId(modelTModel.getTmodelKey(), id++);
+ org.apache.juddi.model.TmodelCategoryId categoryId = new org.apache.juddi.model.TmodelCategoryId(modelTModel.getEntityKey(), id++);
modelCategoryList.add(new org.apache.juddi.model.TmodelCategory(categoryId, modelTModel, apiKeyedRef.getTModelKey(), apiKeyedRef.getKeyName(), apiKeyedRef.getKeyValue()));
}
}
@@ -543,11 +543,11 @@
modelPubAssertion.setId(new org.apache.juddi.model.PublisherAssertionId(apiPubAssertion.getFromKey(), apiPubAssertion.getToKey()));
org.apache.juddi.model.BusinessEntity beFrom = new org.apache.juddi.model.BusinessEntity();
- beFrom.setBusinessKey(apiPubAssertion.getFromKey());
+ beFrom.setEntityKey(apiPubAssertion.getFromKey());
modelPubAssertion.setBusinessEntityByFromKey(beFrom);
org.apache.juddi.model.BusinessEntity beTo = new org.apache.juddi.model.BusinessEntity();
- beFrom.setBusinessKey(apiPubAssertion.getToKey());
+ beFrom.setEntityKey(apiPubAssertion.getToKey());
modelPubAssertion.setBusinessEntityByToKey(beTo);
org.uddi.api_v3.KeyedReference apiKeyedRef = apiPubAssertion.getKeyedReference();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Fri Dec 5 16:45:52 2008
@@ -52,7 +52,7 @@
org.uddi.api_v3.BusinessEntity apiBusinessEntity)
throws DispositionReportFaultMessage {
- apiBusinessEntity.setBusinessKey(modelBusinessEntity.getBusinessKey());
+ apiBusinessEntity.setBusinessKey(modelBusinessEntity.getEntityKey());
mapBusinessNames(modelBusinessEntity.getBusinessNames(), apiBusinessEntity.getName());
mapBusinessDescriptions(modelBusinessEntity.getBusinessDescrs(), apiBusinessEntity.getDescription());
@@ -276,8 +276,8 @@
org.uddi.api_v3.BusinessService apiBusinessService)
throws DispositionReportFaultMessage {
- apiBusinessService.setBusinessKey(modelBusinessService.getBusinessEntity().getBusinessKey());
- apiBusinessService.setServiceKey(modelBusinessService.getServiceKey());
+ apiBusinessService.setBusinessKey(modelBusinessService.getBusinessEntity().getEntityKey());
+ apiBusinessService.setServiceKey(modelBusinessService.getEntityKey());
mapServiceNames(modelBusinessService.getServiceNames(), apiBusinessService.getName());
mapServiceDescriptions(modelBusinessService.getServiceDescrs(), apiBusinessService.getDescription());
@@ -358,8 +358,8 @@
org.uddi.api_v3.BindingTemplate apiBindingTemplate)
throws DispositionReportFaultMessage {
- apiBindingTemplate.setServiceKey(modelBindingTemplate.getBusinessService().getServiceKey());
- apiBindingTemplate.setBindingKey(modelBindingTemplate.getBindingKey());
+ apiBindingTemplate.setServiceKey(modelBindingTemplate.getBusinessService().getEntityKey());
+ apiBindingTemplate.setBindingKey(modelBindingTemplate.getEntityKey());
org.uddi.api_v3.AccessPoint apiAccessPoint = new org.uddi.api_v3.AccessPoint();
apiAccessPoint.setUseType(modelBindingTemplate.getAccessPointType());
apiAccessPoint.setValue(modelBindingTemplate.getAccessPointUrl());
@@ -475,7 +475,7 @@
org.uddi.api_v3.TModel apiTModel)
throws DispositionReportFaultMessage {
- apiTModel.setTModelKey(modelTModel.getTmodelKey());
+ apiTModel.setTModelKey(modelTModel.getEntityKey());
org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
apiName.setValue(modelTModel.getName());
apiTModel.setName(apiName);
@@ -550,7 +550,7 @@
org.uddi.api_v3.BusinessInfo apiBusinessInfo)
throws DispositionReportFaultMessage {
- apiBusinessInfo.setBusinessKey(modelBusinessEntity.getBusinessKey());
+ apiBusinessInfo.setBusinessKey(modelBusinessEntity.getEntityKey());
mapBusinessNames(modelBusinessEntity.getBusinessNames(), apiBusinessInfo.getName());
mapBusinessDescriptions(modelBusinessEntity.getBusinessDescrs(), apiBusinessInfo.getDescription());
@@ -583,8 +583,8 @@
org.uddi.api_v3.ServiceInfo apiServiceInfo)
throws DispositionReportFaultMessage {
- apiServiceInfo.setBusinessKey(modelBusinessService.getBusinessEntity().getBusinessKey());
- apiServiceInfo.setServiceKey(modelBusinessService.getServiceKey());
+ apiServiceInfo.setBusinessKey(modelBusinessService.getBusinessEntity().getEntityKey());
+ apiServiceInfo.setServiceKey(modelBusinessService.getEntityKey());
mapServiceNames(modelBusinessService.getServiceNames(), apiServiceInfo.getName());
}
@@ -593,7 +593,7 @@
org.uddi.api_v3.TModelInfo apiTModelInfo)
throws DispositionReportFaultMessage {
- apiTModelInfo.setTModelKey(modelTModel.getTmodelKey());
+ apiTModelInfo.setTModelKey(modelTModel.getEntityKey());
org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
apiName.setValue(modelTModel.getName());
apiTModelInfo.setName(apiName);
@@ -656,11 +656,11 @@
org.uddi.api_v3.KeysOwned keysOwned = new org.uddi.api_v3.KeysOwned();
Collections.sort((List<String>)businessKeys);
- if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByFromKey().getBusinessKey()) >= 0)
- keysOwned.getContent().add(new ObjectFactory().createFromKey(modelPublisherAssertion.getBusinessEntityByFromKey().getBusinessKey()));
+ if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey()) >= 0)
+ keysOwned.getContent().add(new ObjectFactory().createFromKey(modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey()));
- if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByToKey().getBusinessKey()) >= 0)
- keysOwned.getContent().add(new ObjectFactory().createToKey(modelPublisherAssertion.getBusinessEntityByToKey().getBusinessKey()));
+ if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey()) >= 0)
+ keysOwned.getContent().add(new ObjectFactory().createToKey(modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey()));
}
@@ -670,7 +670,7 @@
org.uddi.api_v3.RelatedBusinessInfo apiRelatedBusinessInfo)
throws DispositionReportFaultMessage {
- apiRelatedBusinessInfo.setBusinessKey(modelRelatedBusiness.getBusinessKey());
+ apiRelatedBusinessInfo.setBusinessKey(modelRelatedBusiness.getEntityKey());
mapBusinessNames(modelRelatedBusiness.getBusinessNames(), apiRelatedBusinessInfo.getName());
mapBusinessDescriptions(modelRelatedBusiness.getBusinessDescrs(), apiRelatedBusinessInfo.getDescription());
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Address.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Address.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Address.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Address.java Fri Dec 5 16:45:52 2008
@@ -32,6 +32,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 = "address")
@@ -63,27 +64,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 = "addressId", column = @Column(name = "address_id", nullable = false))})
-
public AddressId getId() {
return this.id;
}
-
public void setId(AddressId 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;
}
@@ -92,7 +86,6 @@
public String getUseType() {
return this.useType;
}
-
public void setUseType(String useType) {
this.useType = useType;
}
@@ -101,7 +94,6 @@
public String getSortCode() {
return this.sortCode;
}
-
public void setSortCode(String sortCode) {
this.sortCode = sortCode;
}
@@ -110,15 +102,14 @@
public String getTmodelKey() {
return this.tmodelKey;
}
-
public void setTmodelKey(String tmodelKey) {
this.tmodelKey = tmodelKey;
}
+
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "address")
public Set<AddressLine> getAddressLines() {
return this.addressLines;
}
-
public void setAddressLines(Set<AddressLine> addressLines) {
this.addressLines = addressLines;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressId.java Fri Dec 5 16:45:52 2008
@@ -14,56 +14,37 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
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 AddressId implements java.io.Serializable {
+@MappedSuperclass
+public class AddressId extends ContactId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
- private int contactId;
- private int addressId;
+ protected int addressId;
public AddressId() {
}
- public AddressId(String businessKey, int contactId, int addressId) {
- this.businessKey = businessKey;
+ public AddressId(String entityKey, int contactId, int addressId) {
+ this.entityKey = entityKey;
this.contactId = contactId;
this.addressId = addressId;
}
- @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 = "address_id", nullable = false)
-
public int getAddressId() {
return this.addressId;
}
-
public void setAddressId(int addressId) {
this.addressId = addressId;
}
@@ -77,10 +58,10 @@
return false;
AddressId castOther = (AddressId) 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.getAddressId() == castOther.getAddressId());
}
@@ -90,7 +71,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getContactId();
result = 37 * result + this.getAddressId();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLine.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 = "address_line")
@@ -58,29 +57,21 @@
}
@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 = "addressId", column = @Column(name = "address_id", nullable = false)),
- @AttributeOverride(name = "addressLineId", column = @Column(name = "address_line_id", nullable = false))})
-
public AddressLineId getId() {
return this.id;
}
-
public void setId(AddressLineId 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),
@JoinColumn(name = "address_id", referencedColumnName = "address_id", nullable = false, insertable = false, updatable = false)})
-
public Address getAddress() {
return this.address;
}
-
public void setAddress(Address address) {
this.address = address;
}
@@ -89,7 +80,6 @@
public String getLine() {
return this.line;
}
-
public void setLine(String line) {
this.line = line;
}
@@ -98,7 +88,6 @@
public String getKeyName() {
return this.keyName;
}
-
public void setKeyName(String keyName) {
this.keyName = keyName;
}
@@ -107,7 +96,6 @@
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/AddressLineId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLineId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLineId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/AddressLineId.java Fri Dec 5 16:45:52 2008
@@ -20,62 +20,29 @@
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
*/
@Embeddable
-public class AddressLineId implements java.io.Serializable {
+public class AddressLineId extends AddressId implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
- private int contactId;
- private int addressId;
private int addressLineId;
public AddressLineId() {
}
- public AddressLineId(String businessKey, int contactId, int addressId,
+ public AddressLineId(String entityKey, int contactId, int addressId,
int addressLineId) {
- this.businessKey = businessKey;
+ this.entityKey = entityKey;
this.contactId = contactId;
this.addressId = addressId;
this.addressLineId = addressLineId;
}
- @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 = "address_id", nullable = false)
-
- public int getAddressId() {
- return this.addressId;
- }
-
- public void setAddressId(int addressId) {
- this.addressId = addressId;
- }
-
- @Column(name = "address_line_id", nullable = false)
-
+ @Column(name = "line_id", nullable = false)
public int getAddressLineId() {
return this.addressLineId;
}
-
public void setAddressLineId(int addressLineId) {
this.addressLineId = addressLineId;
}
@@ -89,10 +56,10 @@
return false;
AddressLineId castOther = (AddressLineId) 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.getAddressId() == castOther.getAddressId())
&& (this.getAddressLineId() == castOther.getAddressLineId());
@@ -103,7 +70,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getContactId();
result = 37 * result + this.getAddressId();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategory.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategory.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategory.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategory.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 = "binding_category")
@@ -59,24 +58,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 255)),
- @AttributeOverride(name = "categoryId", column = @Column(name = "category_id", nullable = false))})
-
public BindingCategoryId getId() {
return this.id;
}
-
public void setId(BindingCategoryId 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;
}
@@ -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/BindingCategoryId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingCategoryId.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 BindingCategoryId implements java.io.Serializable {
+public class BindingCategoryId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
private int categoryId;
public BindingCategoryId() {
}
- public BindingCategoryId(String bindingKey, int categoryId) {
- this.bindingKey = bindingKey;
+ public BindingCategoryId(String entityKey, int categoryId) {
+ this.entityKey = entityKey;
this.categoryId = categoryId;
}
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
-
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
@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;
BindingCategoryId castOther = (BindingCategoryId) 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.getCategoryId() == castOther.getCategoryId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getBindingKey() == null ? 0 : this.getBindingKey()
+ + (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/BindingDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescr.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 = "binding_descr")
@@ -56,24 +55,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "bindingKey", column = @Column(name = "binding_key", nullable = false, length = 255)),
- @AttributeOverride(name = "bindingDescrId", column = @Column(name = "binding_descr_id", nullable = false))})
-
public BindingDescrId getId() {
return this.id;
}
-
public void setId(BindingDescrId 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;
}
@@ -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/BindingDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingDescrId.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 BindingDescrId implements java.io.Serializable {
+public class BindingDescrId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
private int bindingDescrId;
public BindingDescrId() {
}
- public BindingDescrId(String bindingKey, int bindingDescrId) {
- this.bindingKey = bindingKey;
+ public BindingDescrId(String entityKey, int bindingDescrId) {
+ this.entityKey = entityKey;
this.bindingDescrId = bindingDescrId;
}
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
-
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
- @Column(name = "binding_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getBindingDescrId() {
return this.bindingDescrId;
}
-
public void setBindingDescrId(int bindingDescrId) {
this.bindingDescrId = bindingDescrId;
}
@@ -64,10 +53,10 @@
return false;
BindingDescrId castOther = (BindingDescrId) 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.getBindingDescrId() == castOther.getBindingDescrId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getBindingKey() == null ? 0 : this.getBindingKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getBindingDescrId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java 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 BindingTemplate extends UddiEntity implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String bindingKey;
private BusinessService businessService;
private String accessPointType;
private String accessPointUrl;
@@ -50,17 +48,17 @@
public BindingTemplate() {
}
- public BindingTemplate(String bindingKey, BusinessService businessService, Date lastUpdate) {
- this.bindingKey = bindingKey;
+ public BindingTemplate(String entityKey, BusinessService businessService, Date lastUpdate) {
+ this.entityKey = entityKey;
this.businessService = businessService;
this.lastUpdate = lastUpdate;
}
- public BindingTemplate(String bindingKey, BusinessService businessService, String accessPointType,
+ public BindingTemplate(String entityKey, BusinessService businessService, String accessPointType,
String accessPointUrl, String hostingRedirector, Date lastUpdate,
Set<BindingCategory> bindingCategories,
Set<TmodelInstanceInfo> tmodelInstanceInfos,
Set<BindingDescr> bindingDescrs) {
- this.bindingKey = bindingKey;
+ this.entityKey = entityKey;
this.businessService = businessService;
this.accessPointType = accessPointType;
this.accessPointUrl = accessPointUrl;
@@ -71,15 +69,6 @@
this.bindingDescrs = bindingDescrs;
}
- @Id
- @Column(name = "binding_key", nullable = false, length = 255)
- public String getBindingKey() {
- return this.bindingKey;
- }
- public void setBindingKey(String bindingKey) {
- this.bindingKey = bindingKey;
- }
-
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "service_key", nullable = false)
public BusinessService getBusinessService() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategory.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategory.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategory.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategory.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 = "business_category")
@@ -48,6 +47,7 @@
this.businessEntity = businessEntity;
this.keyValue = keyValue;
}
+
public BusinessCategory(BusinessCategoryId id,
BusinessEntity businessEntity, String tmodelKeyRef, String keyName,
String keyValue) {
@@ -59,24 +59,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "categoryId", column = @Column(name = "category_id", nullable = false))})
-
public BusinessCategoryId getId() {
return this.id;
}
-
public void setId(BusinessCategoryId 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;
}
@@ -85,7 +79,6 @@
public String getTmodelKeyRef() {
return this.tmodelKeyRef;
}
-
public void setTmodelKeyRef(String tmodelKeyRef) {
this.tmodelKeyRef = tmodelKeyRef;
}
@@ -94,17 +87,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/BusinessCategoryId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryId.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 BusinessCategoryId implements java.io.Serializable {
+public class BusinessCategoryId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
private int categoryId;
public BusinessCategoryId() {
}
- public BusinessCategoryId(String businessKey, int categoryId) {
- this.businessKey = businessKey;
+ public BusinessCategoryId(String entityKey, int categoryId) {
+ this.entityKey = entityKey;
this.categoryId = categoryId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
@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;
BusinessCategoryId castOther = (BusinessCategoryId) 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.getCategoryId() == castOther.getCategoryId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (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/BusinessDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescr.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 = "business_descr")
@@ -56,24 +55,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "businessDescrId", column = @Column(name = "business_descr_id", nullable = false))})
-
public BusinessDescrId getId() {
return this.id;
}
-
public void setId(BusinessDescrId 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;
}
@@ -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/BusinessDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessDescrId.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 BusinessDescrId implements java.io.Serializable {
+public class BusinessDescrId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
private int businessDescrId;
public BusinessDescrId() {
}
- public BusinessDescrId(String businessKey, int businessDescrId) {
- this.businessKey = businessKey;
+ public BusinessDescrId(String entityKey, int businessDescrId) {
+ this.entityKey = entityKey;
this.businessDescrId = businessDescrId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
- @Column(name = "business_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getBusinessDescrId() {
return this.businessDescrId;
}
-
public void setBusinessDescrId(int businessDescrId) {
this.businessDescrId = businessDescrId;
}
@@ -64,10 +53,10 @@
return false;
BusinessDescrId castOther = (BusinessDescrId) 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.getBusinessDescrId() == castOther.getBusinessDescrId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getBusinessDescrId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Fri Dec 5 16:45:52 2008
@@ -20,10 +20,8 @@
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;
@@ -39,7 +37,6 @@
public class BusinessEntity extends UddiEntity implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
private UddiEntityPublisher publisher;
private Set<Contact> contacts = new HashSet<Contact>(0);
private Set<BusinessIdentifier> businessIdentifiers = new HashSet<BusinessIdentifier>(0);
@@ -54,11 +51,11 @@
public BusinessEntity() {
}
- public BusinessEntity(String businessKey, Date lastUpdate) {
- this.businessKey = businessKey;
+ public BusinessEntity(String entityKey, Date lastUpdate) {
+ this.entityKey = entityKey;
this.lastUpdate = lastUpdate;
}
- public BusinessEntity(String businessKey, String authorizedName,
+ public BusinessEntity(String entityKey, String authorizedName,
UddiEntityPublisher publisher, String operator,
Date lastUpdate, Set<Contact> contacts,
Set<BusinessIdentifier> businessIdentifiers,
@@ -68,7 +65,7 @@
Set<BusinessCategory> businessCategories,
Set<BusinessService> businessServices,
Set<BusinessDescr> businessDescrs) {
- this.businessKey = businessKey;
+ this.entityKey = entityKey;
this.publisher = publisher;
this.lastUpdate = lastUpdate;
this.contacts = contacts;
@@ -82,15 +79,6 @@
this.businessDescrs = businessDescrs;
}
- @Id
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
@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/BusinessIdentifier.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifier.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifier.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifier.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 = "business_identifier")
@@ -59,24 +58,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "identifierId", column = @Column(name = "identifier_id", nullable = false))})
-
public BusinessIdentifierId getId() {
return this.id;
}
-
public void setId(BusinessIdentifierId 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;
}
@@ -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/BusinessIdentifierId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifierId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifierId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessIdentifierId.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 BusinessIdentifierId implements java.io.Serializable {
+public class BusinessIdentifierId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
private int identifierId;
public BusinessIdentifierId() {
}
- public BusinessIdentifierId(String businessKey, int identifierId) {
- this.businessKey = businessKey;
+ public BusinessIdentifierId(String entityKey, int identifierId) {
+ this.entityKey = entityKey;
this.identifierId = identifierId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
@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;
BusinessIdentifierId castOther = (BusinessIdentifierId) 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.getIdentifierId() == castOther.getIdentifierId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (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/BusinessName.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessName.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 = "business_name")
@@ -56,24 +55,18 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "businessNameId", column = @Column(name = "business_name_id", nullable = false))})
-
public BusinessNameId getId() {
return this.id;
}
-
public void setId(BusinessNameId 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;
}
@@ -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/BusinessNameId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessNameId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessNameId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessNameId.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 BusinessNameId implements java.io.Serializable {
+public class BusinessNameId extends Id implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String businessKey;
private int businessNameId;
public BusinessNameId() {
}
- public BusinessNameId(String businessKey, int businessNameId) {
- this.businessKey = businessKey;
+ public BusinessNameId(String entityKey, int businessNameId) {
+ this.entityKey = entityKey;
this.businessNameId = businessNameId;
}
- @Column(name = "business_key", nullable = false, length = 255)
- public String getBusinessKey() {
- return this.businessKey;
- }
-
- public void setBusinessKey(String businessKey) {
- this.businessKey = businessKey;
- }
-
@Column(name = "business_name_id", nullable = false)
-
public int getBusinessNameId() {
return this.businessNameId;
}
-
public void setBusinessNameId(int businessNameId) {
this.businessNameId = businessNameId;
}
@@ -64,10 +53,10 @@
return false;
BusinessNameId castOther = (BusinessNameId) 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.getBusinessNameId() == castOther.getBusinessNameId());
}
@@ -76,7 +65,7 @@
result = 37
* result
- + (getBusinessKey() == null ? 0 : this.getBusinessKey()
+ + (getEntityKey() == null ? 0 : this.getEntityKey()
.hashCode());
result = 37 * result + this.getBusinessNameId();
return result;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java Fri Dec 5 16:45:52 2008
@@ -20,10 +20,8 @@
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;
@@ -38,7 +36,6 @@
public class BusinessService extends UddiEntity implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String serviceKey;
private BusinessEntity businessEntity;
private Set<ServiceName> serviceNames = new HashSet<ServiceName>(0);
private Set<ServiceDescr> serviceDescrs = new HashSet<ServiceDescr>(0);
@@ -48,16 +45,16 @@
public BusinessService() {
}
- public BusinessService(String serviceKey, BusinessEntity businessEntity, Date lastUpdate) {
- this.serviceKey = serviceKey;
+ public BusinessService(String entityKey, BusinessEntity businessEntity, Date lastUpdate) {
+ this.entityKey = entityKey;
this.businessEntity = businessEntity;
this.lastUpdate = lastUpdate;
}
- public BusinessService(String serviceKey, BusinessEntity businessEntity, Date lastUpdate,
+ public BusinessService(String entityKey, BusinessEntity businessEntity, Date lastUpdate,
Set<ServiceName> serviceNames, Set<ServiceDescr> serviceDescrs,
Set<BindingTemplate> bindingTemplates,
Set<ServiceCategory> serviceCategories) {
- this.serviceKey = serviceKey;
+ this.entityKey = entityKey;
this.businessEntity = businessEntity;
this.lastUpdate = lastUpdate;
this.serviceNames = serviceNames;
@@ -66,15 +63,6 @@
this.serviceCategories = serviceCategories;
}
- @Id
- @Column(name = "service_key", nullable = false, length = 255)
- 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() {
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.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;
@@ -33,6 +31,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 = "contact")
@@ -71,10 +70,6 @@
}
@EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "businessKey", column = @Column(name = "business_key", nullable = false, length = 255)),
- @AttributeOverride(name = "contactId", column = @Column(name = "contact_id", nullable = false))})
-
public ContactId getId() {
return this.id;
}
@@ -83,7 +78,7 @@
}
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "business_key", nullable = false, insertable = false, updatable = false)
+ @JoinColumn(name = "entity_key", nullable = false, insertable = false, updatable = false)
public BusinessEntity getBusinessEntity() {
return this.businessEntity;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescr.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 = "contact_descr")
@@ -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 = "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 = "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 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/ContactDescrId.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescrId.java?rev=723935&r1=723934&r2=723935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescrId.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/ContactDescrId.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 ContactDescrId implements java.io.Serializable {
+public class ContactDescrId extends ContactId 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;
+ public ContactDescrId(String entityKey, int contactId, int contactDescrId) {
+ this.entityKey = entityKey;
this.contactId = contactId;
this.contactDescrId = contactDescrId;
}
- @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 = "contact_descr_id", nullable = false)
-
+ @Column(name = "descr_id", nullable = false)
public int getContactDescrId() {
return this.contactDescrId;
}
-
public void setContactDescrId(int contactDescrId) {
this.contactDescrId = contactDescrId;
}
@@ -76,10 +54,10 @@
return false;
ContactDescrId castOther = (ContactDescrId) 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.getContactDescrId() == castOther.getContactDescrId());
}
@@ -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.getContactDescrId();
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org