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 2013/04/14 05:52:10 UTC
svn commit: r1467724 - in /juddi/trunk: juddi-core-openjpa/
juddi-core/src/main/java/org/apache/juddi/model/
juddi-core/src/main/java/org/apache/juddi/query/
juddi-core/src/test/java/org/apache/juddi/api/impl/
uddi-tck-base/src/main/java/org/apache/jud...
Author: kstam
Date: Sun Apr 14 03:52:09 2013
New Revision: 1467724
URL: http://svn.apache.org/r1467724
Log:
JUDDI-589 Implementing the signaturePresent find qualifier.
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml
Modified:
juddi/trunk/juddi-core-openjpa/build.xml
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
Modified: juddi/trunk/juddi-core-openjpa/build.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/build.xml?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/build.xml (original)
+++ juddi/trunk/juddi-core-openjpa/build.xml Sun Apr 14 03:52:09 2013
@@ -9,6 +9,8 @@
</target>
<target name="copy-src">
+ <echo>delete: ${basedir}/src/main/java</echo>
+ <delete dir="${basedir}/src/main/java" />
<mkdir dir="${basedir}/src/main/java"/>
<echo>copy: ${juddi.core.dir}/src/test/java</echo>
<copy todir="${basedir}/src/main/java">
@@ -19,6 +21,8 @@
</target>
<target name="copy-tests">
+ <echo>delete: ${basedir}/src/test/java</echo>
+ <delete dir="${basedir}/src/test/java" />
<mkdir dir="${basedir}/src/test/java"/>
<echo>copy: ${juddi.core.dir}/src/test/java</echo>
<copy todir="${basedir}/src/test/java">
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Sun Apr 14 03:52:09 2013
@@ -46,7 +46,7 @@ public class BindingTemplate extends Udd
private String hostingRedirector;
private BindingCategoryBag categoryBag;
private List<TmodelInstanceInfo> tmodelInstanceInfos = new ArrayList<TmodelInstanceInfo>(0);
- private List<Signature> signatures = new ArrayList<Signature>(0);
+ private List<Signature> signatures = new ArrayList<Signature>(0);
public BindingTemplate() {
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Sun Apr 14 03:52:09 2013
@@ -46,7 +46,7 @@ public class BusinessEntity extends Uddi
private List<BusinessService> businessServices = new ArrayList<BusinessService>(0);
private List<BusinessDescr> businessDescrs = new ArrayList<BusinessDescr>(0);
private List<ServiceProjection> serviceProjections = new ArrayList<ServiceProjection>(0);
- private List<Signature> signatures = new ArrayList<Signature>(0);
+ private List<Signature> signatures = new ArrayList<Signature>(0);
public BusinessEntity() {
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java Sun Apr 14 03:52:09 2013
@@ -43,8 +43,8 @@ public class BusinessService extends Udd
private List<ServiceDescr> serviceDescrs = new ArrayList<ServiceDescr>(0);
private List<BindingTemplate> bindingTemplates = new ArrayList<BindingTemplate>(0);
private ServiceCategoryBag categoryBag;
- private List<ServiceProjection> projectingBusinesses = new ArrayList<ServiceProjection>(0);
- private List<Signature> signatures = new ArrayList<Signature>(0);
+ private List<ServiceProjection> projectingBusinesses = new ArrayList<ServiceProjection>(0);
+ private List<Signature> signatures = new ArrayList<Signature>(0);
public BusinessService() {
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java Sun Apr 14 03:52:09 2013
@@ -44,7 +44,7 @@ public class Publisher extends UddiEntit
private Integer maxServicesPerBusiness;
private Integer maxBindingsPerService;
private Integer maxTmodels;
- private List<Signature> signatures = new ArrayList<Signature>(0);
+ private List<Signature> signatures = new ArrayList<Signature>(0);
public Publisher() {
super(null);
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Sun Apr 14 03:52:09 2013
@@ -45,7 +45,7 @@ public class Tmodel extends UddiEntity i
private List<TmodelDescr> tmodelDescrs = new ArrayList<TmodelDescr>(0);
private List<TmodelIdentifier> tmodelIdentifiers = new ArrayList<TmodelIdentifier>(0);
private TmodelCategoryBag categoryBag;
- private List<Signature> signatures = new ArrayList<Signature>(0);
+ private List<Signature> signatures = new ArrayList<Signature>(0);
public Tmodel() {
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java Sun Apr 14 03:52:09 2013
@@ -26,6 +26,10 @@ public class BindingTemplateQuery extend
public static final String ENTITY_ALIAS = "bt";
public static final String ENTITY_FIELD = "bindingTemplate";
public static final String KEY_NAME_PARENT = BusinessServiceQuery.ENTITY_FIELD + "." + BusinessServiceQuery.KEY_NAME;
+ public static final String SIGNATURE_PRESENT =
+ ENTITY_ALIAS + "." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY OR " +
+ ENTITY_ALIAS + ".businessService." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY OR " +
+ ENTITY_ALIAS + ".businessService.businessEntity." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY ";
protected static String selectSQL;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java Sun Apr 14 03:52:09 2013
@@ -26,7 +26,8 @@ public class BusinessEntityQuery extends
public static final String ENTITY_NAME = "BusinessEntity";
public static final String ENTITY_ALIAS = "be";
public static final String ENTITY_FIELD = "businessEntity";
-
+ public static final String SIGNATURE_PRESENT = ENTITY_ALIAS + "." + SIGNATURE_FIELD + " IS NOT EMPTY ";
+
protected static String selectSQL;
static {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java Sun Apr 14 03:52:09 2013
@@ -26,6 +26,9 @@ public class BusinessServiceQuery extend
public static final String ENTITY_ALIAS = "bs";
public static final String ENTITY_FIELD = "businessService";
public static final String KEY_NAME_PARENT = BusinessEntityQuery.ENTITY_FIELD + "." + BusinessEntityQuery.KEY_NAME;
+ public static final String SIGNATURE_PRESENT =
+ ENTITY_ALIAS + "." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY OR " +
+ ENTITY_ALIAS + ".businessEntity." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY ";
protected static String selectSQL;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java Sun Apr 14 03:52:09 2013
@@ -44,6 +44,7 @@ public abstract class EntityQuery {
public static final String TEMP_ENTITY_ALIAS = "tk";
public static final String TEMP_ENTITY_PK_TXID_NAME = TEMP_ENTITY_ALIAS + ".pk.txId";
public static final String TEMP_ENTITY_PK_KEY_NAME = TEMP_ENTITY_ALIAS + ".pk.entityKey";
+ public static final String SIGNATURE_FIELD = "signatures";
public static final int DEFAULT_MAXROWS = 1000;
public static final int DEFAULT_MAXINCLAUSE = 1000;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java Sun Apr 14 03:52:09 2013
@@ -54,7 +54,8 @@ public class FindBindingByCategoryGroupQ
BindingTemplateQuery.ENTITY_ALIAS,
BindingTemplateQuery.KEY_NAME,
BindingTemplateQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BindingTemplateQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, String parentKey, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -48,7 +48,8 @@ public class FindBindingByCategoryQuery
BindingTemplateQuery.ENTITY_ALIAS,
BindingTemplateQuery.KEY_NAME,
BindingTemplateQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BindingTemplateQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, String parentKey, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java Sun Apr 14 03:52:09 2013
@@ -53,14 +53,15 @@ public class FindBindingByTModelKeyQuery
private static Log log = LogFactory.getLog(FindBindingByTModelKeyQuery.class);
public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo";
-
+
protected static String entityAliasChild;
static {
entityAliasChild = buildAlias(ENTITY_NAME_CHILD);
}
- public static List<?> select(EntityManager em, FindQualifiers fq, TModelBag tModels, String parentKey, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
+ public static List<?> select(EntityManager em, FindQualifiers fq, TModelBag tModels, String parentKey,
+ List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
if ((keysIn != null) && (keysIn.size() == 0))
return keysIn;
@@ -150,6 +151,9 @@ public class FindBindingByTModelKeyQuery
qry.append(thetaJoinsStr);
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(BindingTemplateQuery.SIGNATURE_PRESENT).pad().closeParen().pad();
+ }
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java Sun Apr 14 03:52:09 2013
@@ -53,7 +53,8 @@ public class FindBusinessByCategoryGroup
BusinessEntityQuery.ENTITY_ALIAS,
BusinessEntityQuery.KEY_NAME,
BusinessEntityQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -47,7 +47,8 @@ public class FindBusinessByCategoryQuery
BusinessEntityQuery.ENTITY_ALIAS,
BusinessEntityQuery.KEY_NAME,
BusinessEntityQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -67,7 +67,8 @@ public class FindBusinessByCombinedCateg
ENTITY_FIELD2,
ENTITY_NAME_CHILD2,
ENTITY_FIELD3,
- ENTITY_NAME_CHILD3);
+ ENTITY_NAME_CHILD3,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java Sun Apr 14 03:52:09 2013
@@ -54,7 +54,8 @@ public class FindBusinessByDiscoveryURLQ
entityAliasChild = buildAlias(ENTITY_NAME_CHILD);
}
- public static List<?> select(EntityManager em, FindQualifiers fq, DiscoveryURLs discURLs, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
+ public static List<?> select(EntityManager em, FindQualifiers fq, DiscoveryURLs discURLs,
+ List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
if ((keysIn != null) && (keysIn.size() == 0))
return keysIn;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java Sun Apr 14 03:52:09 2013
@@ -46,7 +46,8 @@ public class FindBusinessByIdentifierQue
BusinessEntityQuery.ENTITY_ALIAS,
BusinessEntityQuery.KEY_NAME,
BusinessEntityQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, IdentifierBag identifiers, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java Sun Apr 14 03:52:09 2013
@@ -46,7 +46,7 @@ import org.uddi.api_v3.Name;
public class FindBusinessByNameQuery {
public static final String ENTITY_NAME_CHILD = "BusinessName";
-
+
private static FindEntityByNamesQuery findQuery;
static {
@@ -54,7 +54,8 @@ public class FindBusinessByNameQuery {
BusinessEntityQuery.ENTITY_ALIAS,
BusinessEntityQuery.KEY_NAME,
BusinessEntityQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, List<Name> names, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java Sun Apr 14 03:52:09 2013
@@ -37,7 +37,11 @@ public class FindBusinessByPublisherQuer
private static FindEntityByPublisherQuery findQuery;
static {
- findQuery = new FindEntityByPublisherQuery(BusinessEntityQuery.ENTITY_NAME, BusinessEntityQuery.ENTITY_ALIAS, BusinessEntityQuery.KEY_NAME);
+ findQuery = new FindEntityByPublisherQuery(
+ BusinessEntityQuery.ENTITY_NAME,
+ BusinessEntityQuery.ENTITY_ALIAS,
+ BusinessEntityQuery.KEY_NAME,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, UddiEntityPublisher publisher, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java Sun Apr 14 03:52:09 2013
@@ -155,6 +155,9 @@ public class FindBusinessByTModelKeyQuer
qry.append(thetaJoinsStr);
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(BusinessEntityQuery.SIGNATURE_PRESENT).pad().closeParen().pad();
+ }
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java Sun Apr 14 03:52:09 2013
@@ -71,14 +71,17 @@ public class FindEntityByCategoryGroupQu
private String entityNameChild;
private String entityAliasChild;
private String selectSQL;
+ private String signaturePresent;
- public FindEntityByCategoryGroupQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
+ public FindEntityByCategoryGroupQuery(String entityName, String entityAlias, String keyName,
+ String entityField, String entityNameChild, String signaturePresent) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
this.entityField = entityField;
this.entityNameChild = entityNameChild;
this.entityAliasChild = buildAlias(entityNameChild);
+ this.signaturePresent = signaturePresent;
StringBuffer sql = new StringBuffer(200);
sql.append("select distinct " + entityAlias + "." + keyName + " from "
@@ -116,6 +119,14 @@ public class FindEntityByCategoryGroupQu
return selectSQL;
}
+ public String getSignaturePresent() {
+ return signaturePresent;
+ }
+
+ public void setSignaturePresent(String signaturePresent) {
+ this.signaturePresent = signaturePresent;
+ }
+
@SuppressWarnings("unchecked")
public List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
@@ -305,6 +316,9 @@ public class FindEntityByCategoryGroupQu
qry.append(thetaJoinsStr);
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(getSignaturePresent()).pad().closeParen().pad();
+ }
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -64,14 +64,17 @@ public class FindEntityByCategoryQuery e
protected String entityNameChild;
protected String entityAliasChild;
protected String selectSQL;
+ protected String signaturePresent;
- public FindEntityByCategoryQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
+ public FindEntityByCategoryQuery(String entityName, String entityAlias, String keyName,
+ String entityField, String entityNameChild, String signaturePresent) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
this.entityField = entityField;
this.entityNameChild = entityNameChild;
this.entityAliasChild = buildAlias(entityNameChild);
+ this.signaturePresent = signaturePresent;
StringBuffer sql = new StringBuffer(200);
sql.append("select distinct " + entityAlias + "." + keyName + " from " + entityName + " " + entityAlias + " , " + entityNameChild + " " + entityAliasChild + " ");
@@ -105,7 +108,14 @@ public class FindEntityByCategoryQuery e
public String getSelectSQL() {
return selectSQL;
}
+
+ public String getSignaturePresent() {
+ return signaturePresent;
+ }
+ public void setSignaturePresent(String signaturePresent) {
+ this.signaturePresent = signaturePresent;
+ }
public List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
@@ -289,6 +299,9 @@ public class FindEntityByCategoryQuery e
qry.append(thetaJoinsStr);
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(getSignaturePresent()).pad().closeParen().pad();
+ }
}
}
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=1467724&r1=1467723&r2=1467724&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 Sun Apr 14 03:52:09 2013
@@ -85,14 +85,19 @@ public class FindEntityByCombinedCategor
protected String entityField3;
protected String entityNameChild3;
protected String entityAliasChild3;
+
+ protected String signaturePresent;
- public FindEntityByCombinedCategoryQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
- super(entityName, entityAlias, keyName, entityField, entityNameChild);
+ public FindEntityByCombinedCategoryQuery(String entityName, String entityAlias, String keyName,
+ String entityField, String entityNameChild, String signaturePresent) {
+ super(entityName, entityAlias, keyName, entityField, entityNameChild, signaturePresent);
}
- public FindEntityByCombinedCategoryQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild,
- String entityField2, String entityNameChild2, String entityField3, String entityNameChild3) {
- super(entityName, entityAlias, keyName, entityField, entityNameChild);
+ public FindEntityByCombinedCategoryQuery(String entityName, String entityAlias, String keyName,
+ String entityField, String entityNameChild,
+ String entityField2, String entityNameChild2, String entityField3, String entityNameChild3,
+ String signaturePresent) {
+ super(entityName, entityAlias, keyName, entityField, entityNameChild, signaturePresent);
this.entityNameChild2 = entityNameChild2;
this.entityAliasChild2 = buildAlias(entityNameChild2);
@@ -102,7 +107,7 @@ public class FindEntityByCombinedCategor
this.entityNameChild3 = entityNameChild3;
this.entityAliasChild3 = buildAlias(entityNameChild3);
}
-
+ this.signaturePresent = signaturePresent;
selectSQL = "";
}
@@ -122,7 +127,8 @@ public class FindEntityByCombinedCategor
return entityAliasChild3;
}
- public List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
+ public List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag,
+ List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
if ((keysIn != null) && (keysIn.size() == 0))
@@ -209,7 +215,7 @@ public class FindEntityByCombinedCategor
List<?> keysIn, DynamicQuery.Parameter... restrictions)
{
FindEntityByCategoryQuery findEntityByCategoryQuery = new FindEntityByCategoryQuery(
- entityName, entityAlias, keyName, entityField, entityNameChild);
+ entityName, entityAlias, keyName, entityField, entityNameChild, signaturePresent);
for (KeyedReference keyedReference : categoryBag.getKeyedReference()) {
CategoryBag categoryBagWithOneKey = new CategoryBag();
categoryBagWithOneKey.getKeyedReference().add(keyedReference);
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java Sun Apr 14 03:52:09 2013
@@ -59,14 +59,17 @@ public class FindEntityByIdentifierQuery
private String entityNameChild;
private String entityAliasChild;
private String selectSQL;
+ private String signaturePresent;
- public FindEntityByIdentifierQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
+ public FindEntityByIdentifierQuery(String entityName, String entityAlias, String keyName,
+ String entityField, String entityNameChild, String signaturePresent) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
this.entityField = entityField;
this.entityNameChild = entityNameChild;
this.entityAliasChild = buildAlias(entityNameChild);
+ this.signaturePresent = signaturePresent;
StringBuffer sql = new StringBuffer(200);
sql.append("select distinct " + entityAlias + "." + keyName + " from " + entityName + " " + entityAlias + " ");
@@ -100,6 +103,14 @@ public class FindEntityByIdentifierQuery
public String getSelectSQL() {
return selectSQL;
}
+
+ public String getSignaturePresent() {
+ return signaturePresent;
+ }
+
+ public void setSignaturePresent(String signaturePresent) {
+ this.signaturePresent = signaturePresent;
+ }
public List<?> select(EntityManager em, FindQualifiers fq, IdentifierBag identifiers, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
@@ -268,6 +279,9 @@ public class FindEntityByIdentifierQuery
qry.append(thetaJoinsStr);
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(getSignaturePresent()).pad().closeParen().pad();
+ }
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java Sun Apr 14 03:52:09 2013
@@ -46,14 +46,17 @@ public class FindEntityByNamesQuery exte
private String entityNameChild;
private String entityAliasChild;
private String selectSQL;
+ private String signaturePresent;
- public FindEntityByNamesQuery(String entityName, String entityAlias, String keyName, String entityField, String entityNameChild) {
+ public FindEntityByNamesQuery(String entityName, String entityAlias, String keyName, String entityField,
+ String entityNameChild, String signaturePresent) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
this.entityField = entityField;
this.entityNameChild = entityNameChild;
this.entityAliasChild = buildAlias(entityNameChild);
+ this.signaturePresent = signaturePresent;
StringBuffer sql = new StringBuffer(200);
sql.append("select distinct " + entityAlias + "." + keyName + " from " + entityName + " " + entityAlias + " ");
@@ -88,6 +91,13 @@ public class FindEntityByNamesQuery exte
return selectSQL;
}
+ public String getSignaturePresent() {
+ return signaturePresent;
+ }
+
+ public void setSignaturePresent(String signaturePresent) {
+ this.signaturePresent = signaturePresent;
+ }
public List<?> select(EntityManager em, FindQualifiers fq, List<Name> names, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
@@ -158,6 +168,11 @@ public class FindEntityByNamesQuery exte
qry.WHERE().pad().openParen().pad();
qry.append(entityAlias + "." + keyName + " = " + entityAliasChild + "." + entityField + "." + keyName + " ");
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(getSignaturePresent()).pad().closeParen().pad();
+ }
}
+
+
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java Sun Apr 14 03:52:09 2013
@@ -39,11 +39,13 @@ public class FindEntityByPublisherQuery
private String entityAlias;
private String keyName;
private String selectSQL;
+ private String signaturePresent;
- public FindEntityByPublisherQuery(String entityName, String entityAlias, String keyName) {
+ public FindEntityByPublisherQuery(String entityName, String entityAlias, String keyName, String signaturePresent) {
this.entityName = entityName;
this.entityAlias = entityAlias;
this.keyName = keyName;
+ this.signaturePresent = signaturePresent;
StringBuffer sql = new StringBuffer(200);
sql.append("select distinct " + entityAlias + "." + keyName + " from " + entityName + " " + entityAlias + " ");
@@ -66,6 +68,14 @@ public class FindEntityByPublisherQuery
return selectSQL;
}
+ public String getSignaturePresent() {
+ return signaturePresent;
+ }
+
+ public void setSignaturePresent(String signaturePresent) {
+ this.signaturePresent = signaturePresent;
+ }
+
public List<?> select(EntityManager em, FindQualifiers fq, UddiEntityPublisher publisher, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
@@ -88,7 +98,11 @@ public class FindEntityByPublisherQuery
*/
public void appendConditions(DynamicQuery qry, FindQualifiers fq, UddiEntityPublisher publisher) {
qry.WHERE().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.pad().openParen().pad().append(getSignaturePresent()).pad().closeParen().pad().AND();
+ }
qry.appendGroupedAnd(new DynamicQuery.Parameter(entityAlias + "." + AUTHORIZED_NAME_FIELD, publisher.getAuthorizedName(), DynamicQuery.PREDICATE_EQUALS));
}
-
+
+
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java Sun Apr 14 03:52:09 2013
@@ -53,7 +53,8 @@ public class FindServiceByCategoryGroupQ
BusinessServiceQuery.ENTITY_ALIAS,
BusinessServiceQuery.KEY_NAME,
BusinessServiceQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessServiceQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, String parentKey, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -47,7 +47,8 @@ public class FindServiceByCategoryQuery
BusinessServiceQuery.ENTITY_ALIAS,
BusinessServiceQuery.KEY_NAME,
BusinessServiceQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessServiceQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, String parentKey, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -72,7 +72,8 @@ public class FindServiceByCombinedCatego
ENTITY_FIELD2,
ENTITY_NAME_CHILD2,
null,
- null);
+ null,
+ BusinessServiceQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, String parentKey, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java Sun Apr 14 03:52:09 2013
@@ -45,7 +45,7 @@ import org.uddi.api_v3.Name;
*/
public class FindServiceByNameQuery {
- public static final String ENTITY_NAME_CHILD = "ServiceName";
+ public static final String ENTITY_NAME_CHILD = "ServiceName";
private static FindEntityByNamesQuery findQuery;
@@ -54,7 +54,8 @@ public class FindServiceByNameQuery {
BusinessServiceQuery.ENTITY_ALIAS,
BusinessServiceQuery.KEY_NAME,
BusinessServiceQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ BusinessServiceQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, List<Name> names, String parentKey, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java Sun Apr 14 03:52:09 2013
@@ -158,6 +158,9 @@ public class FindServiceByTModelKeyQuery
qry.append(thetaJoinsStr);
qry.closeParen().pad();
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(BusinessServiceQuery.SIGNATURE_PRESENT).pad().closeParen().pad();
+ }
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java Sun Apr 14 03:52:09 2013
@@ -54,7 +54,8 @@ public class FindTModelByCategoryGroupQu
TModelQuery.ENTITY_ALIAS,
TModelQuery.KEY_NAME,
TModelQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ TModelQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java Sun Apr 14 03:52:09 2013
@@ -48,7 +48,8 @@ public class FindTModelByCategoryQuery {
TModelQuery.ENTITY_ALIAS,
TModelQuery.KEY_NAME,
TModelQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ TModelQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java Sun Apr 14 03:52:09 2013
@@ -47,7 +47,8 @@ public class FindTModelByIdentifierQuery
TModelQuery.ENTITY_ALIAS,
TModelQuery.KEY_NAME,
TModelQuery.ENTITY_FIELD,
- ENTITY_NAME_CHILD);
+ ENTITY_NAME_CHILD,
+ TModelQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, IdentifierBag identifiers, List<?> keysIn) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java Sun Apr 14 03:52:09 2013
@@ -97,7 +97,9 @@ public class FindTModelByNameQuery exten
}
qry.closeParen().pad();
-
+ if (fq!=null && fq.isSignaturePresent()) {
+ qry.AND().pad().openParen().pad().append(TModelQuery.SIGNATURE_PRESENT).pad().closeParen().pad();
+ }
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java Sun Apr 14 03:52:09 2013
@@ -37,7 +37,11 @@ public class FindTModelByPublisherQuery
private static FindEntityByPublisherQuery findQuery;
static {
- findQuery = new FindEntityByPublisherQuery(TModelQuery.ENTITY_NAME, TModelQuery.ENTITY_ALIAS, TModelQuery.KEY_NAME);
+ findQuery = new FindEntityByPublisherQuery(
+ TModelQuery.ENTITY_NAME,
+ TModelQuery.ENTITY_ALIAS,
+ TModelQuery.KEY_NAME,
+ TModelQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, UddiEntityPublisher publisher, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java Sun Apr 14 03:52:09 2013
@@ -25,6 +25,7 @@ public class TModelQuery extends EntityQ
public static final String ENTITY_NAME = "Tmodel";
public static final String ENTITY_ALIAS = "t";
public static final String ENTITY_FIELD = "tmodel";
+ public static final String SIGNATURE_PRESENT = ENTITY_ALIAS + "." + SIGNATURE_FIELD + " IS NOT EMPTY ";
protected static String selectSQL;
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java Sun Apr 14 03:52:09 2013
@@ -21,6 +21,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.tck.TckBusiness;
+import org.apache.juddi.v3.tck.TckFindEntity;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
@@ -41,6 +42,7 @@ public class API_030_BusinessEntityTest
private static API_010_PublisherTest api010 = new API_010_PublisherTest();
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
+ private static TckFindEntity tckFindEntity = new TckFindEntity(new UDDIInquiryImpl());
private static String authInfoJoe = null;
private static String authInfoSam = null;
@@ -87,5 +89,26 @@ public class API_030_BusinessEntityTest
}
}
+ @Test
+ public void testJoePublisherBusinessEntitySignature() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckBusiness.saveJoePublisherBusinessX509Signature(authInfoJoe);
+ tckFindEntity.findAllBusiness();
+ tckTModel.saveSamSyndicatorTmodel(authInfoSam);
+ tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+
+ //find the signed business
+ tckFindEntity.findAllSignedBusiness();
+
+ tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+
+ } finally {
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+ }
+ }
+
}
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java Sun Apr 14 03:52:09 2013
@@ -15,28 +15,19 @@
package org.apache.juddi.api.impl;
import java.rmi.RemoteException;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.Registry;
-import org.apache.juddi.config.PersistenceManager;
-import org.apache.juddi.query.util.DynamicQuery;
-import org.apache.juddi.v3.tck.Property;
import org.apache.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckBusinessService;
-import org.apache.juddi.v3.tck.TckFindEntity;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckSecurity;
import org.apache.juddi.v3.tck.TckTModel;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -159,52 +150,6 @@ public class API_040_BusinessServiceTest
}
}
- @Test @Ignore
- public void combineCategoryBagsFindServices() {
- try {
- tckTModel.saveJoePublisherTmodel(authInfoJoe);
- tckBusiness.saveCombineCatBagsPublisherBusiness(authInfoJoe);
-
- PersistenceManager pm = new PersistenceManager();
- EntityManager em = pm.getEntityManager();
-
- String sql = "select bs.entityKey from BusinessService bs ," +
- " ServiceCategoryBag ServiceCategory_ , " +
- "KeyedReference KeyedRefere_0 , KeyedReference KeyedRefere_1 " +
- "where ( bs.entityKey = ServiceCategory_.businessService.entityKey and " +
- " ( ServiceCategory_.id = KeyedRefere_0.categoryBag.id ))";
- String sql3 = "select bs.entityKey from BusinessService bs UNION select bs.entityKey from BusinessService bs";
-
- String sql2 = "select bs.entityKey, categoryBag.id from BusinessService bs, " +
- " BindingTemplate bt, " +
- " BindingCategoryBag categoryBag ," +
- "KeyedReference KeyedRefere_0, KeyedReference KeyedRefere_1 " +
- "where categoryBag.id = bt.categoryBag.id and " +
- "bt.businessService.entityKey = bs.entityKey and " +
- "( (KeyedRefere_0.categoryBag.id=categoryBag.id and KeyedRefere_0.tmodelKeyRef = 'uddi:uddi.joepublisher.com:tmodel01' and KeyedRefere_0.keyValue = 'value-z') or " +
- "(KeyedRefere_1.categoryBag.id=categoryBag.id and KeyedRefere_1.tmodelKeyRef = 'uddi:uddi.joepublisher.com:tmodel02' and KeyedRefere_1.keyValue = 'value-x') ) " +
- " group by bs.entityKey, categoryBag.id ";
-
- String sql1 = "select bs.entityKey from BusinessService bs ," +
- " BindingTemplate bt, ServiceCategoryBag ServiceCategory_ , " +
- " BindingCategoryBag BindingCategory_ , " +
- "KeyedReference KeyedRefere_0, KeyedReference KeyedRefere_1 " +
- "where ( ((bt.businessService.entityKey = bs.entityKey and bt.entityKey = BindingCategory_.bindingTemplate.entityKey and " +
- " BindingCategory_.id = KeyedRefere_0.categoryBag.id) AND (bs.entityKey = ServiceCategory_.businessService.entityKey and ServiceCategory_.id = KeyedRefere_0.categoryBag.id)" +
- ") and KeyedRefere_0.categoryBag.id = KeyedRefere_1.categoryBag.id and ( " +
- "(KeyedRefere_0.tmodelKeyRef = 'uddi:uddi.joepublisher.com:tmodel01' and KeyedRefere_0.keyValue = 'value-z') and " +
- "(KeyedRefere_1.tmodelKeyRef = 'uddi:uddi.joepublisher.com:tmodel02' and KeyedRefere_1.keyValue = 'value-x') ) ) ";
- Query qry = em.createQuery(sql2);
- List result = qry.getResultList();
- System.out.println(result);
-
- //tckFindEntity.findService_CombinedCatBag();
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail(e.getMessage());
- }
- }
-
@Test
public void samsyndicator() {
try {
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java Sun Apr 14 03:52:09 2013
@@ -91,17 +91,17 @@ public class API_050_BindingTemplateTest
tckFindEntity.findServiceDetail("uddi:uddi.joepublisher.com:serviceone");
tckBindingTemplate.deleteBinding(authInfoJoe, "uddi:uddi.joepublisher.com:bindingone");
- String serviceKey = tckFindEntity.findService();
+ String serviceKey = tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
- serviceKey = tckFindEntity.findService();
+ serviceKey = tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
- tckFindEntity.findService();
+ tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
} finally {
tckBusinessService.deleteJoePublisherService(authInfoJoe);
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java Sun Apr 14 03:52:09 2013
@@ -20,6 +20,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.Registry;
+import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.tck.TckBindingTemplate;
import org.apache.juddi.v3.tck.TckBusiness;
import org.apache.juddi.v3.tck.TckBusinessService;
@@ -75,9 +76,33 @@ public class API_070_FindEntityTest
tckBusinessService.saveJoePublisherService(authInfoJoe);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
tckFindEntity.findBusiness();
- tckFindEntity.findService();
- tckFindEntity.findBinding();
- tckFindEntity.findTModel();
+ tckFindEntity.findService(null);
+ tckFindEntity.findBinding(null);
+ tckFindEntity.findTModel(null);
+ tckFindEntity.findAllBusiness();
+ tckFindEntity.getNonExitingBusiness();
+ } finally {
+ tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
+ tckBusinessService.deleteJoePublisherService(authInfoJoe);
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ }
+
+ }
+
+ @Test
+ public void findSignedEntities() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckBusiness.saveJoePublisherBusinessX509Signature(authInfoJoe);
+ tckBusinessService.saveJoePublisherService(authInfoJoe);
+ tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
+
+ tckFindEntity.findAllSignedBusiness();
+ tckFindEntity.findService(UDDIConstants.SIGNATURE_PRESENT);
+ tckFindEntity.findBinding(UDDIConstants.SIGNATURE_PRESENT);
+ //tckFindEntity.findTModel(UDDIConstants.SIGNATURE_PRESENT);
+
tckFindEntity.findAllBusiness();
tckFindEntity.getNonExitingBusiness();
} finally {
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java Sun Apr 14 03:52:09 2013
@@ -29,7 +29,6 @@ import org.apache.juddi.v3.tck.TckTModel
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.FindQualifiers;
Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java Sun Apr 14 03:52:09 2013
@@ -65,6 +65,7 @@ public class TckFindEntity
{
final static String FIND_BUSINESS_XML = "uddi_data/find/findBusiness1.xml";
final static String FIND_ALL_BUSINESSES_XML = "uddi_data/find/findAllBusinesses.xml";
+ final static String FIND_ALL_SIGNED_BUSINESSES_XML= "uddi_data/find/findAllSignedBusinesses.xml";
final static String FIND_RELATED_BUSINESS_SORT_BY_NAME_XML = "uddi_data/find/findRelatedBusinesses_sortByName.xml";
final static String FIND_RELATED_BUSINESS_FROM_KEY= "uddi_data/find/findRelatedBusinesses_fromKey.xml";
final static String FIND_RELATED_BUSINESS_TO_KEY = "uddi_data/find/findRelatedBusinesses_toKey.xml";
@@ -151,6 +152,30 @@ public class TckFindEntity
}
}
+ public List<BusinessInfo> findAllSignedBusiness() {
+ List<BusinessInfo> biList = null;
+ try {
+ FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_ALL_SIGNED_BUSINESSES_XML, "org.uddi.api_v3");
+ BusinessList result = inquiry.findBusiness(body);
+ if (result == null)
+ Assert.fail("Null result from find business operation");
+ BusinessInfos bInfos = result.getBusinessInfos();
+ if (bInfos == null)
+ Assert.fail("No result from find business operation");
+ biList = bInfos.getBusinessInfo();
+ if (biList == null || biList.size() == 0)
+ Assert.fail("No result from find business operation");
+ //expecting at one business
+ Assert.assertTrue(biList.size()==1);
+ return biList;
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ return biList;
+ }
+
public void findRelatedBusiness_sortByName(boolean isOneSided) {
try {
FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_SORT_BY_NAME_XML, "org.uddi.api_v3");
@@ -242,10 +267,11 @@ public class TckFindEntity
}
}
- public String findService() {
+ public String findService(String findQualifier) {
String serviceKey = null;
try {
FindService body = (FindService)EntityCreator.buildFromDoc(FIND_SERVICE_XML, "org.uddi.api_v3");
+ if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
ServiceList result = inquiry.findService(body);
if (result == null)
Assert.fail("Null result from find service operation");
@@ -330,9 +356,10 @@ public class TckFindEntity
Assert.fail("No exception should be thrown.");
}
}
- public void findBinding() {
+ public void findBinding(String findQualifier) {
try {
FindBinding body = (FindBinding)EntityCreator.buildFromDoc(FIND_BINDING_XML, "org.uddi.api_v3");
+ if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
BindingDetail result = inquiry.findBinding(body);
if (result == null)
Assert.fail("Null result from find binding operation");
@@ -355,9 +382,10 @@ public class TckFindEntity
}
}
- public void findTModel() {
+ public void findTModel(String findQualifier) {
try {
FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+ if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
TModelList result = inquiry.findTModel(body);
if (result == null)
Assert.fail("Null result from find tModel operation");
Added: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml?rev=1467724&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml (added)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml Sun Apr 14 03:52:09 2013
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 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.
+ *
+ */ -->
+<find_business xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" listHead="0">
+ <findQualifiers>
+ <findQualifier>orLikeKeys</findQualifier>
+ <findQualifier>caseInsensitiveMatch</findQualifier>
+ <findQualifier>approximateMatch</findQualifier>
+ <findQualifier>signaturePresent</findQualifier>
+ </findQualifiers>
+ <name>%</name>
+
+</find_business>
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java Sun Apr 14 03:52:09 2013
@@ -3,7 +3,6 @@ package org.apache.juddi.v3.tck;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
-import java.net.URL;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.v3.client.UDDIService;
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Sun Apr 14 03:52:09 2013
@@ -97,17 +97,17 @@ public class UDDI_050_BindingTemplateInt
tckBusinessService.saveJoePublisherService(authInfoJoe);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
tckBindingTemplate.deleteBinding(authInfoJoe, "uddi:uddi.joepublisher.com:bindingone");
- String serviceKey = tckFindEntity.findService();
+ String serviceKey = tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
- serviceKey = tckFindEntity.findService();
+ serviceKey = tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
- tckFindEntity.findService();
+ tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
} finally {
tckBusinessService.deleteJoePublisherService(authInfoJoe);
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java Sun Apr 14 03:52:09 2013
@@ -17,6 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
@@ -83,9 +84,9 @@ public class UDDI_070_FindEntityIntegrat
tckBusinessService.saveJoePublisherService(authInfoJoe);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
tckFindEntity.findBusiness();
- tckFindEntity.findService();
- tckFindEntity.findBinding();
- tckFindEntity.findTModel();
+ tckFindEntity.findService(null);
+ tckFindEntity.findBinding(null);
+ tckFindEntity.findTModel(null);
tckFindEntity.getNonExitingBusiness();
} catch (Exception e) {
e.printStackTrace();
@@ -99,9 +100,31 @@ public class UDDI_070_FindEntityIntegrat
tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
tckTModel.deleteJoePublisherTmodel(authInfoJoe);
}
-
}
+ @Test
+ public void findSignedEntities() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckBusiness.saveJoePublisherBusinessX509Signature(authInfoJoe);
+ tckBusinessService.saveJoePublisherService(authInfoJoe);
+ tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
+
+ tckFindEntity.findAllSignedBusiness();
+ tckFindEntity.findService(UDDIConstants.SIGNATURE_PRESENT);
+ tckFindEntity.findBinding(UDDIConstants.SIGNATURE_PRESENT);
+ //tckFindEntity.findTModel(UDDIConstants.SIGNATURE_PRESENT);
+
+ tckFindEntity.findAllBusiness();
+ tckFindEntity.getNonExitingBusiness();
+ } finally {
+ tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
+ tckBusinessService.deleteJoePublisherService(authInfoJoe);
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ }
+
+ }
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Sun Apr 14 03:52:09 2013
@@ -14,8 +14,6 @@ package org.apache.juddi.v3.tck;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.util.Date;
-
import javax.xml.ws.Endpoint;
import org.apache.commons.configuration.ConfigurationException;
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java Sun Apr 14 03:52:09 2013
@@ -27,16 +27,12 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.uddi.api_v3.BusinessInfo;
-import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.CategoryBag;
-import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
import org.uddi.api_v3.FindService;
import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.ServiceInfo;
import org.uddi.api_v3.ServiceList;
-import org.uddi.api_v3.TModelBag;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java?rev=1467724&r1=1467723&r2=1467724&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java Sun Apr 14 03:52:09 2013
@@ -31,11 +31,7 @@ import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
-import org.uddi.api_v3.FindService;
import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.ServiceInfo;
-import org.uddi.api_v3.ServiceList;
-import org.uddi.api_v3.TModelBag;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org