Author: tcunning
Date: Thu May 19 02:05:09 2011
New Revision: 1124513
URL: http://svn.apache.org/viewvc?rev=1124513&view=rev
Log:
JUDDI-456
Change references to BusinessService/BusinessEntity.id to entityKey.
openJPA does not do the mapping to UDDIEntity that hibernate does.
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java?rev=1124513&r1=1124512&r2=1124513&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java
Thu May 19 02:05:09 2011
@@ -163,15 +163,15 @@ public class FindEntityByCombinedCategor
currentAlias = entityAliasChild2;
if (BusinessEntityQuery.ENTITY_NAME.equals(entityName)) {
- joinClause = entityAlias + ".id" + " = "
- + entityAliasChild + "." + entityField + ".id" + " and
"
- + entityAliasChild + "." + entityField + ".id" + " = "
- + entityAliasChild2 +
".businessService.businessEntity.id";
+ joinClause = entityAlias + ".entityKey" + " = "
+ + entityAliasChild + "." + entityField + ".entityKey"
+ " and "
+ + entityAliasChild + "." + entityField + ".entityKey"
+ " = "
+ + entityAliasChild2 +
".businessService.businessEntity.entityKey";
} else {
- joinClause = entityAlias + ".id" + " = "
- + entityAliasChild + "." + entityField + ".id" + "
and "
- + entityAliasChild + "." + entityField + ".id" + "
= "
- + entityAliasChild2 +
".bindingTemplate.businessService.id";
+ joinClause = entityAlias + ".entityKey" + " = "
+ + entityAliasChild + "." + entityField +
".entityKey" + " and "
+ + entityAliasChild + "." + entityField +
".entityKey" + " = "
+ + entityAliasChild2 +
".bindingTemplate.businessService.entityKey";
}
appendConditions(dynamicQry, fq, keyedRefs);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
