You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/04/15 15:07:03 UTC
svn commit: r1468025 [1/4] - in /juddi/branches/juddi-3.2.x: ./
juddi-client/src/main/java/org/apache/juddi/v3/client/ juddi-core-openjpa/
juddi-core-openjpa/src/test/resources/META-INF/ juddi-core/
juddi-core/src/main/java/org/apache/juddi/api/impl/ j...
Author: alexoree
Date: Mon Apr 15 13:07:00 2013
New Revision: 1468025
URL: http://svn.apache.org/r1468025
Log:
commit sync from trunk
starting support for subscriptions (still needs i18n support)
Added:
juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java
- copied unchanged from r1467812, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTestPerformance.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_110_FindBusinessTest.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_110_FindBusinessTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_120_CombineCategoryBagsFindServiceTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_130_CombineCategoryBagsFindBusinessTest.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_130_CombineCategoryBagsFindBusinessTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/config/ReleaseVersionTest.java
- copied unchanged from r1467812, juddi/trunk/juddi-core/src/test/java/org/apache/juddi/config/ReleaseVersionTest.java
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscriptionFeed.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/subscriptionFeed.jsp
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/orm.xml.example
- copied unchanged from r1467812, juddi/trunk/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/orm.xml.example
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/orm.xml.example
- copied unchanged from r1467812, juddi/trunk/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/orm.xml.example
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/orm.xml.example
- copied unchanged from r1467812, juddi/trunk/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/orm.xml.example
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml
- copied unchanged from r1467812, juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findAllSignedBusinesses.xml
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business5.xml
- copied unchanged from r1467812, juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business5.xml
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi545-business.xml
- copied unchanged from r1467812, juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi545-business.xml
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
- copied unchanged from r1467812, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
Removed:
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/orm.xml
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/orm.xml
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindServicesIntegrationTest.java
Modified:
juddi/branches/juddi-3.2.x/ (props changed)
juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml
juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml
juddi/branches/juddi-3.2.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
juddi/branches/juddi-3.2.x/juddi-core/pom.xml
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/ (props changed)
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java (contents, props changed)
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/config/Release.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCombinedCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryGroupQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByCombinedCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByNameQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryGroupQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByCategoryQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByIdentifierQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByPublisherQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
juddi/branches/juddi-3.2.x/juddi-core/src/test/resources/META-INF/persistence.xml
juddi/branches/juddi-3.2.x/juddi-examples/simple-browse/ (props changed)
juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml
juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties
juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp
juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml
juddi/branches/juddi-3.2.x/juddi-tomcat/context.xml
juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.2.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.2.x/readme.txt
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/ (props changed)
juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business1.xml
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (contents, props changed)
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
Propchange: juddi/branches/juddi-3.2.x/
------------------------------------------------------------------------------
Merged /juddi/trunk:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml Mon Apr 15 13:07:00 2013
@@ -90,11 +90,10 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>1.2.2</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
</plugin>
-
</plugins>
</build>
<dependencies>
@@ -116,7 +115,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>1.2.2</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
Modified: juddi/branches/juddi-3.2.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml Mon Apr 15 13:07:00 2013
@@ -58,6 +58,7 @@
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.TempKey</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
@@ -74,6 +75,7 @@
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
<property name="openjpa.jdbc.UpdateManager" value="operation-order"/>
<property name="openjpa.RuntimeUnenhancedClasses" value="warn"/>
+ <property name="openjpa.Compatibility" value="CheckDatabaseForCascadePersistToDetachedEntity=true"/>
<!-- derby connection properties -->
<property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
@@ -90,10 +92,10 @@
-->
<!-- pgsql connection properties
- <property name="openjpa.ConnectionURL" value="jdbc:postgresql://localhost/juddi"/>
+ <property name="openjpa.ConnectionURL" value="jdbc:postgresql://localhost:5432/juddi"/>
<property name="openjpa.ConnectionDriverName" value="org.postgresql.Driver"/>
<property name="openjpa.ConnectionUserName" value="juddi"/>
- <property name="openjpa.ConnectionPassword" value="juddi"/>
+ <property name="openjpa.ConnectionPassword" value="password"/>
-->
</properties>
Modified: juddi/branches/juddi-3.2.x/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/pom.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/pom.xml Mon Apr 15 13:07:00 2013
@@ -22,22 +22,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3</version>
- <!--
- <configuration>
- <excludes>
- <exclude>**/persistence</exclude>
- <exclude>**/persistence.xml</exclude>
- <exclude>**/hibernate-persistence.xml</exclude>
- <exclude>**/openjpa-persistence.xml</exclude>
- <exclude>**/juddi-orm.xml</exclude>
- </excludes>
- </configuration>
- -->
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
@@ -55,7 +39,6 @@
org.apache.juddi.v3.error</Export-Package>
<Include-Resource>juddi_install_data=src/main/resources/juddi_install_data,
src/main/resources/messages.properties</Include-Resource>
-
</instructions>
</configuration>
</plugin>
@@ -68,13 +51,6 @@
<phase>generate-resources</phase>
<configuration>
<tasks>
- <copy file="src/main/resources/version/Release.java.template"
- tofile="src/main/java/org/apache/juddi/config/Release.java"
- overwrite="true">
- <filterset>
- <filter token="juddi.version" value="${project.version}" />
- </filterset>
- </copy>
<delete dir="juddi-derby-test-db" />
</tasks>
</configuration>
@@ -110,7 +86,6 @@
</plugins>
</build>
<dependencies>
-
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>uddi-ws</artifactId>
Propchange: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/
------------------------------------------------------------------------------
Merged /juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java Mon Apr 15 13:07:00 2013
@@ -192,15 +192,18 @@ public class InquiryHelper {
keysFound = FindBusinessByTModelKeyQuery.select(em, findQualifiers, body.getTModelBag(), keysFound);
keysFound = FindBusinessByIdentifierQuery.select(em, findQualifiers, body.getIdentifierBag(), keysFound);
keysFound = FindBusinessByDiscoveryURLQuery.select(em, findQualifiers, body.getDiscoveryURLs(), keysFound);
- if (findQualifiers.isCombineCategoryBags()) {
- keysFound = FindBusinessByCombinedCategoryQuery.select(em, findQualifiers, body.getCategoryBag(), keysFound);
- } else {
- keysFound = FindBusinessByCategoryQuery.select(em, findQualifiers, body.getCategoryBag(), keysFound);
- }
+ if (findQualifiers.isCombineCategoryBags()) {
+ keysFound = FindBusinessByCombinedCategoryQuery.select(em, findQualifiers, body.getCategoryBag(), keysFound);
+ } else {
+ keysFound = FindBusinessByCategoryQuery.select(em, findQualifiers, body.getCategoryBag(), keysFound);
+ }
keysFound = FindBusinessByCategoryGroupQuery.select(em, findQualifiers, body.getCategoryBag(), keysFound);
keysFound = FindBusinessByNameQuery.select(em, findQualifiers, body.getName(), keysFound);
+ // If there no keys in the bag then remove the empty TModelBag
+ if (body.getTModelBag().getTModelKey().size()==0) body.setTModelBag(null);
+
return keysFound;
}
@@ -208,7 +211,6 @@ public class InquiryHelper {
return getBusinessListFromKeys(body, findQualifiers, em, keysFound, null, null, null, null);
}
- @SuppressWarnings("unchecked")
public static BusinessList getBusinessListFromKeys(FindBusiness body, FindQualifiers findQualifiers, EntityManager em, List<?> keysFound,
Date modifiedAfter, Date modifiedBefore, Holder<Integer> subscriptionStartIndex, Integer subscriptionMaxRows)
throws DispositionReportFaultMessage {
@@ -218,28 +220,8 @@ public class InquiryHelper {
result.setListDescription(listDesc);
// Sort and retrieve the final results taking paging into account
- List<?> queryResults = FetchBusinessEntitiesQuery.select(em, findQualifiers, keysFound, body.getMaxRows(), body.getListHead(), listDesc);
- List<?> serviceResults = null;
- for (int i = 0; i<queryResults.size(); i++) {
- org.apache.juddi.model.BusinessEntity be = (org.apache.juddi.model.BusinessEntity) queryResults.get(i);
-
- List<Object> keysIn = new ArrayList<Object>();
- List<org.apache.juddi.model.BusinessService> services = be.getBusinessServices();
- for (int j = 0; j<services.size(); j++) {
- keysIn.add(services.get(j).getEntityKey());
- }
-
- serviceResults = FindServiceByTModelKeyQuery.select(em, findQualifiers, body.getTModelBag(), null, keysIn);
- if (serviceResults == null) {
- be.setBusinessServices(null);
- } else {
- ListDescription ldesc = new ListDescription();
- result.setListDescription(listDesc);
- List<?> srvcs = FetchBusinessServicesQuery.select(em, findQualifiers, serviceResults, body.getMaxRows(),
- body.getListHead(), ldesc);
- be.setBusinessServices((List<org.apache.juddi.model.BusinessService>)srvcs);
- }
- }
+ List<?> queryResults = FetchBusinessEntitiesQuery.select(
+ em, findQualifiers, keysFound, body.getMaxRows(), body.getListHead(), listDesc);
if (queryResults != null && queryResults.size() > 0)
result.setBusinessInfos(new org.uddi.api_v3.BusinessInfos());
@@ -304,9 +286,8 @@ public class InquiryHelper {
body.setTModelBag(new TModelBag());
doFindTModelEmbeddedSearch(em, body.getFindQualifiers(), body.getFindTModel(), body.getTModelBag());
-
keysFound = FindServiceByTModelKeyQuery.select(em, findQualifiers, body.getTModelBag(), body.getBusinessKey(), keysFound);
- if (findQualifiers.isCombineCategoryBags()) {
+ if (findQualifiers.isCombineCategoryBags()) {
keysFound = FindServiceByCombinedCategoryQuery.select(em, findQualifiers, body.getCategoryBag(), body.getBusinessKey(), keysFound);
} else {
keysFound = FindServiceByCategoryQuery.select(em, findQualifiers, body.getCategoryBag(), body.getBusinessKey(), keysFound);
@@ -347,7 +328,7 @@ public class InquiryHelper {
org.apache.juddi.model.BusinessService modelBusinessService = (org.apache.juddi.model.BusinessService)item;
org.uddi.api_v3.ServiceInfo apiServiceInfo = new org.uddi.api_v3.ServiceInfo();
- logger.info(modelBusinessService.getEntityKey() + " is modified " + modelBusinessService.getModifiedIncludingChildren() + " " + modelBusinessService.getModifiedIncludingChildren().getTime() );
+ logger.debug(modelBusinessService.getEntityKey() + " is modified " + modelBusinessService.getModifiedIncludingChildren() + " " + modelBusinessService.getModifiedIncludingChildren().getTime() );
if (modifiedAfter != null && modifiedAfter.after(modelBusinessService.getModifiedIncludingChildren())) {
currentIndex++;
continue;
@@ -489,8 +470,10 @@ public class InquiryHelper {
throws DispositionReportFaultMessage {
if (relatedBusinessInfos == null)
relatedBusinessInfos = new org.uddi.api_v3.RelatedBusinessInfos();
-
- org.apache.juddi.model.BusinessEntity focalBusiness = em.find(org.apache.juddi.model.BusinessEntity.class, focalKey);
+ org.apache.juddi.model.BusinessEntity focalBusiness = null;
+ try {
+ focalBusiness = em.find(org.apache.juddi.model.BusinessEntity.class, focalKey);
+ } catch (ClassCastException e) {}
if (focalBusiness == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.BusinessNotFound", focalKey));
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java Mon Apr 15 13:07:00 2013
@@ -175,9 +175,11 @@ public class JUDDIApiImpl extends Authen
List<String> publisherIdList = body.getPublisherId();
for (String publisherId : publisherIdList) {
-
- org.apache.juddi.model.Publisher modelPublisher = em.find(org.apache.juddi.model.Publisher.class, publisherId);
- if (modelPublisher == null) {
+ org.apache.juddi.model.Publisher modelPublisher = null;
+ try {
+ modelPublisher = em.find(org.apache.juddi.model.Publisher.class, publisherId);
+ } catch (ClassCastException e) {}
+ if (modelPublisher == null) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.PublisherNotFound", publisherId));
}
@@ -388,8 +390,10 @@ public class JUDDIApiImpl extends Authen
List<String> subscriptionKeyList = body.getClientSubscriptionKey();
for (String subscriptionKey : subscriptionKeyList) {
- org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo =
- em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo = null;
+ try {
+ modelClientSubscriptionInfo = em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ } catch (ClassCastException e) {}
if (modelClientSubscriptionInfo == null) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
}
@@ -523,8 +527,10 @@ public class JUDDIApiImpl extends Authen
this.getEntityPublisher(em, body.getAuthInfo());
for (GetSubscriptionResults getSubscriptionResult : body.getGetSubscriptionResultsList()) {
String subscriptionKey = getSubscriptionResult.getSubscriptionKey();
- org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo =
- em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo = null;
+ try {
+ modelClientSubscriptionInfo = em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ } catch (ClassCastException e) {}
if (modelClientSubscriptionInfo == null) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
}
Propchange: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
('svn:mergeinfo' removed)
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java Mon Apr 15 13:07:00 2013
@@ -18,6 +18,7 @@
package org.apache.juddi.api.impl;
import java.util.List;
+import java.util.UUID;
import javax.jws.WebService;
import javax.persistence.EntityManager;
@@ -33,6 +34,8 @@ import org.apache.juddi.config.AppConfig
import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.config.Property;
import org.apache.juddi.mapping.MappingModelToApi;
+import org.apache.juddi.model.TempKey;
+import org.apache.juddi.query.util.FindQualifiers;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.InvalidKeyPassedException;
import org.apache.juddi.validation.ValidateInquiry;
@@ -105,14 +108,17 @@ public class UDDIInquiryImpl extends Aut
// Check that we were passed a valid serviceKey per
// 5.1.12.4 of the UDDI v3 spec
String serviceKey = body.getServiceKey();
- org.apache.juddi.model.BusinessService modelBusinessService = em.find(org.apache.juddi.model.BusinessService.class, serviceKey);
- if (modelBusinessService == null)
- throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.ServiceNotFound", serviceKey));
+ org.apache.juddi.model.BusinessService modelBusinessService = null;
+ try {
+ em.find(org.apache.juddi.model.BusinessService.class, serviceKey);
+ } catch (ClassCastException e) {}
+ if (modelBusinessService == null)
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.ServiceNotFound", serviceKey));
}
}
BindingDetail result = InquiryHelper.getBindingDetailFromKeys(body, findQualifiers, em, keysFound);
- tx.commit();
+ tx.rollback();
long procTime = System.nanoTime() - startTime;
serviceCounter.update(InquiryQuery.FIND_BINDING, QueryStatus.SUCCESS, procTime);
@@ -152,7 +158,7 @@ public class UDDIInquiryImpl extends Aut
BusinessList result = InquiryHelper.getBusinessListFromKeys(body, findQualifiers, em, keysFound);
- tx.commit();
+ tx.rollback();
long procTime = System.nanoTime() - startTime;
serviceCounter.update(InquiryQuery.FIND_BUSINESS, QueryStatus.SUCCESS, procTime);
@@ -192,7 +198,7 @@ public class UDDIInquiryImpl extends Aut
RelatedBusinessesList result = InquiryHelper.getRelatedBusinessesList(body, em);
- tx.commit();
+ tx.rollback();
long procTime = System.nanoTime() - startTime;
serviceCounter.update(InquiryQuery.FIND_RELATEDBUSINESSES, QueryStatus.SUCCESS, procTime);
@@ -232,19 +238,22 @@ public class UDDIInquiryImpl extends Aut
if (keysFound.size() == 0) {
if (body.getBusinessKey() != null) {
- // Check that we were passed a valid serviceKey per
- // 5.1.12.4 of the UDDI v3 spec
- String businessKey = body.getBusinessKey();
- org.apache.juddi.model.BusinessEntity modelBusinessEntity = em.find(org.apache.juddi.model.BusinessEntity.class, businessKey);
- if (modelBusinessEntity == null) {
- throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.ServiceNotFound", businessKey));
- }
+ // Check that we were passed a valid businessKey per
+ // 5.1.12.4 of the UDDI v3 spec
+ String businessKey = body.getBusinessKey();
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity = null;
+ try {
+ modelBusinessEntity = em.find(org.apache.juddi.model.BusinessEntity.class, businessKey);
+ } catch (ClassCastException e) {}
+ if (modelBusinessEntity == null) {
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.BusinessNotFound", businessKey));
+ }
}
}
ServiceList result = InquiryHelper.getServiceListFromKeys(body, findQualifiers, em, keysFound);
- tx.commit();
+ tx.rollback();
long procTime = System.nanoTime() - startTime;
serviceCounter.update(InquiryQuery.FIND_SERVICE, QueryStatus.SUCCESS, procTime);
@@ -284,7 +293,7 @@ public class UDDIInquiryImpl extends Aut
TModelList result = InquiryHelper.getTModelListFromKeys(body, findQualifiers, em, keysFound);
- tx.commit();
+ tx.rollback();
long procTime = System.nanoTime() - startTime;
serviceCounter.update(InquiryQuery.FIND_TMODEL, QueryStatus.SUCCESS, procTime);
@@ -321,8 +330,10 @@ public class UDDIInquiryImpl extends Aut
List<String> bindingKeyList = body.getBindingKey();
for (String bindingKey : bindingKeyList) {
-
- org.apache.juddi.model.BindingTemplate modelBindingTemplate = em.find(org.apache.juddi.model.BindingTemplate.class, bindingKey);
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate = null;
+ try {
+ modelBindingTemplate = em.find(org.apache.juddi.model.BindingTemplate.class, bindingKey);
+ } catch (ClassCastException e) {}
if (modelBindingTemplate == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.BindingTemplateNotFound", bindingKey));
@@ -370,8 +381,10 @@ public class UDDIInquiryImpl extends Aut
List<String> businessKeyList = body.getBusinessKey();
for (String businessKey : businessKeyList) {
-
- org.apache.juddi.model.BusinessEntity modelBusinessEntity = em.find(org.apache.juddi.model.BusinessEntity.class, businessKey);
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity = null;
+ try {
+ modelBusinessEntity = em.find(org.apache.juddi.model.BusinessEntity.class, businessKey);
+ } catch (ClassCastException e) {}
if (modelBusinessEntity == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.BusinessNotFound", businessKey));
@@ -419,8 +432,10 @@ public class UDDIInquiryImpl extends Aut
List<String> entityKeyList = body.getEntityKey();
for (String entityKey : entityKeyList) {
-
- org.apache.juddi.model.UddiEntity modelUddiEntity = em.find(org.apache.juddi.model.UddiEntity.class, entityKey);
+ org.apache.juddi.model.UddiEntity modelUddiEntity = null;
+ try {
+ modelUddiEntity = em.find(org.apache.juddi.model.UddiEntity.class, entityKey);
+ } catch (ClassCastException e) {}
if (modelUddiEntity == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.EntityNotFound", entityKey));
@@ -447,14 +462,14 @@ public class UDDIInquiryImpl extends Aut
public ServiceDetail getServiceDetail(GetServiceDetail body)
throws DispositionReportFaultMessage {
- long startTime = System.nanoTime();
- try {
- new ValidateInquiry(null).validateGetServiceDetail(body);
- } catch (DispositionReportFaultMessage drfm) {
- long procTime = System.nanoTime() - startTime;
- serviceCounter.update(InquiryQuery.GET_SERVICEDETAIL, QueryStatus.FAILED, procTime);
- throw drfm;
- }
+ long startTime = System.nanoTime();
+ try {
+ new ValidateInquiry(null).validateGetServiceDetail(body);
+ } catch (DispositionReportFaultMessage drfm) {
+ long procTime = System.nanoTime() - startTime;
+ serviceCounter.update(InquiryQuery.GET_SERVICEDETAIL, QueryStatus.FAILED, procTime);
+ throw drfm;
+ }
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -468,8 +483,10 @@ public class UDDIInquiryImpl extends Aut
List<String> serviceKeyList = body.getServiceKey();
for (String serviceKey : serviceKeyList) {
-
- org.apache.juddi.model.BusinessService modelBusinessService = em.find(org.apache.juddi.model.BusinessService.class, serviceKey);
+ org.apache.juddi.model.BusinessService modelBusinessService = null;
+ try {
+ modelBusinessService = em.find(org.apache.juddi.model.BusinessService.class, serviceKey);
+ } catch (ClassCastException e){}
if (modelBusinessService == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.ServiceNotFound", serviceKey));
@@ -518,11 +535,12 @@ public class UDDIInquiryImpl extends Aut
List<String> tmodelKeyList = body.getTModelKey();
for (String tmodelKey : tmodelKeyList) {
-
- org.apache.juddi.model.Tmodel modelTModel = em.find(org.apache.juddi.model.Tmodel.class, tmodelKey);
- if (modelTModel == null) {
+ org.apache.juddi.model.Tmodel modelTModel = null;
+ try {
+ modelTModel = em.find(org.apache.juddi.model.Tmodel.class, tmodelKey);
+ } catch (ClassCastException e) {}
+ if (modelTModel == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNotFound", tmodelKey));
- }
org.uddi.api_v3.TModel apiTModel = new org.uddi.api_v3.TModel();
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java Mon Apr 15 13:07:00 2013
@@ -75,8 +75,10 @@ public class UDDISubscriptionListenerImp
this.getEntityPublisher(em, body.getAuthInfo());
String subscriptionKey = body.getSubscriptionResultsList().getSubscription().getSubscriptionKey();
- org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo =
- em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo = null;
+ try {
+ modelClientSubscriptionInfo = em.find(org.apache.juddi.model.ClientSubscriptionInfo.class, subscriptionKey);
+ } catch (ClassCastException e) {}
if (modelClientSubscriptionInfo == null) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
}
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/config/Release.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/config/Release.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/config/Release.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/config/Release.java Mon Apr 15 13:07:00 2013
@@ -15,22 +15,28 @@
package org.apache.juddi.config;
/**
- * WARNING:
- * Do not modify this class as it is generated. Rather update the Release.java.template
- * in main/java/resources/version
+ *
*/
public class Release {
- private static final String REGISTRY_VERSION = "3.1.5-SNAPSHOT";
+
private static final String UDDI_VERSION = "3.0";
+ private static final String JAR_NAME = "juddi-core";
+ private static String registryVersion = null;
private Release () {
}
public static String getRegistryVersion() {
- return REGISTRY_VERSION;
+ if (registryVersion == null) {
+ registryVersion = org.apache.juddi.v3.client.Release.getVersionFromManifest(JAR_NAME);
+ }
+ return registryVersion;
+
}
public static String getUDDIVersion() {
return UDDI_VERSION;
}
+
+
}
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Mon Apr 15 13:07:00 2013
@@ -373,7 +373,19 @@ public class MappingModelToApi {
for (org.apache.juddi.model.DiscoveryUrl modelDiscUrl : modelDiscUrlList) {
org.uddi.api_v3.DiscoveryURL apiDiscUrl = new org.uddi.api_v3.DiscoveryURL();
apiDiscUrl.setUseType(modelDiscUrl.getUseType());
- apiDiscUrl.setValue(modelDiscUrl.getUrl());
+ String discoveryURL = modelDiscUrl.getUrl();
+ try {
+ String baseUrl = AppConfig.getConfiguration().getString("juddi.server.baseurl");
+ if (baseUrl==null) {
+ logger.warn("Token 'juddi.server.baseurl' not found in the juddiv3.properties, defaulting to '"
+ + Property.DEFAULT_BASE_URL + "'");
+ baseUrl = Property.DEFAULT_BASE_URL;
+ }
+ discoveryURL = discoveryURL.replaceAll("\\$\\{juddi.server.baseurl\\}", baseUrl);
+ } catch (ConfigurationException e) {
+ logger.error(e.getMessage(),e);
+ }
+ apiDiscUrl.setValue(discoveryURL);
apiDiscUrlList.add(apiDiscUrl);
}
apiBusinessEntity.setDiscoveryURLs(apiDiscUrls);
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/BusinessService.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/EntityQuery.java Mon Apr 15 13:07:00 2013
@@ -20,6 +20,7 @@ package org.apache.juddi.query;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
+
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -29,6 +30,7 @@ import org.apache.commons.logging.LogFac
import org.uddi.api_v3.ListDescription;
import org.apache.juddi.config.AppConfig;
import org.apache.juddi.config.Property;
+import org.apache.juddi.model.TempKey;
import org.apache.juddi.query.util.DynamicQuery;
/**
@@ -38,6 +40,11 @@ public abstract class EntityQuery {
private static Log log = LogFactory.getLog(EntityQuery.class);
public static final String KEY_NAME = "entityKey";
+ public static final String TEMP_ENTITY_NAME = "TempKey";
+ 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;
@@ -162,4 +169,13 @@ public abstract class EntityQuery {
}
+ public static void storeIntermediateKeySetResults (EntityManager em, String txId, List<?> keysIn) {
+
+ for (Object key : keysIn) {
+ TempKey tempKey = new TempKey();
+ tempKey.setPk(txId,key.toString());
+ em.persist(tempKey);
+ }
+ }
+
}
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java Mon Apr 15 13:07:00 2013
@@ -19,10 +19,15 @@ package org.apache.juddi.query;
import java.util.Collections;
import java.util.List;
+import java.util.UUID;
+
import javax.persistence.EntityManager;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -51,15 +56,30 @@ public class FetchBindingTemplatesQuery
selectSQL = sql.toString();
}
- public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRows, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
+ public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRowsUser, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
// If keysIn is null or empty, then nothing to fetch.
if ((keysIn == null) || (keysIn.size() == 0))
return Collections.emptyList();
-
+ int maxRows = DEFAULT_MAXROWS;
+ try {
+ maxRows = AppConfig.getConfiguration().getInteger(Property.JUDDI_MAX_ROWS, DEFAULT_MAXROWS);
+ }
+ catch(ConfigurationException ce) {
+ log.error("Configuration exception occurred retrieving: " + Property.JUDDI_MAX_ROWS);
+ }
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
- appendSortTables(dynamicQry);
- dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ if (keysIn.size() > maxRows) {
+ UUID uuid = UUID.randomUUID();
+ storeIntermediateKeySetResults(em, uuid.toString(), keysIn);
+ appendTempTable(dynamicQry);
+ appendSortTables(dynamicQry);
+ appendTempJoin(dynamicQry, uuid.toString());
+ }
+ else {
+ appendSortTables(dynamicQry);
+ dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ }
if (restrictions != null && restrictions.length > 0)
dynamicQry.AND().pad().appendGroupedAnd(restrictions);
@@ -67,7 +87,18 @@ public class FetchBindingTemplatesQuery
log.debug(dynamicQry);
- return getPagedResult(em, dynamicQry, maxRows, listHead, listDesc);
+ return getPagedResult(em, dynamicQry, maxRowsUser, listHead, listDesc);
+ }
+
+ private static void appendTempTable(DynamicQuery qry) {
+ qry.comma().append(TEMP_ENTITY_NAME + " " + TEMP_ENTITY_ALIAS );
+ }
+
+ private static void appendTempJoin(DynamicQuery qry, String uuid) {
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_KEY_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.pad().append(ENTITY_ALIAS + "." + KEY_NAME);
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_TXID_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.append("'" + uuid + "'").pad();
}
private static void appendSortTables(DynamicQuery qry) {
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java Mon Apr 15 13:07:00 2013
@@ -19,10 +19,15 @@ package org.apache.juddi.query;
import java.util.Collections;
import java.util.List;
+import java.util.UUID;
+
import javax.persistence.EntityManager;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -51,23 +56,49 @@ public class FetchBusinessEntitiesQuery
selectSQL = sql.toString();
}
- public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRows, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
+ public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRowsUser, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
// If keysIn is null or empty, then nothing to fetch.
if ((keysIn == null) || (keysIn.size() == 0))
- return Collections.emptyList();
-
+ return Collections.emptyList();
+
+ int maxRows = DEFAULT_MAXROWS;
+ try {
+ maxRows = AppConfig.getConfiguration().getInteger(Property.JUDDI_MAX_ROWS, DEFAULT_MAXROWS);
+ }
+ catch(ConfigurationException ce) {
+ log.error("Configuration exception occurred retrieving: " + Property.JUDDI_MAX_ROWS);
+ }
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
- appendSortTables(dynamicQry);
- dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ if (keysIn.size() > maxRows) {
+ UUID uuid = UUID.randomUUID();
+ storeIntermediateKeySetResults(em, uuid.toString(), keysIn);
+ appendTempTable(dynamicQry);
+ appendSortTables(dynamicQry);
+ appendTempJoin(dynamicQry, uuid.toString());
+ }
+ else {
+ appendSortTables(dynamicQry);
+ dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ }
if (restrictions != null && restrictions.length > 0)
dynamicQry.AND().pad().appendGroupedAnd(restrictions);
appendSortCriteria(dynamicQry, fq);
log.debug(dynamicQry);
-
- return getPagedResult(em, dynamicQry, maxRows, listHead, listDesc);
+ return getPagedResult(em, dynamicQry, maxRowsUser, listHead, listDesc);
+ }
+
+ private static void appendTempTable(DynamicQuery qry) {
+ qry.comma().append(TEMP_ENTITY_NAME + " " + TEMP_ENTITY_ALIAS );
+ }
+
+ private static void appendTempJoin(DynamicQuery qry, String uuid) {
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_KEY_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.pad().append(ENTITY_ALIAS + "." + KEY_NAME);
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_TXID_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.append("'" + uuid + "'").pad();
}
private static void appendSortTables(DynamicQuery qry) {
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java Mon Apr 15 13:07:00 2013
@@ -19,10 +19,15 @@ package org.apache.juddi.query;
import java.util.Collections;
import java.util.List;
+import java.util.UUID;
+
import javax.persistence.EntityManager;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -51,23 +56,49 @@ public class FetchBusinessServicesQuery
selectSQL = sql.toString();
}
- public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRows, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
+ public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRowsUser, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
// If keysIn is null or empty, then nothing to fetch.
if ((keysIn == null) || (keysIn.size() == 0))
return Collections.emptyList();
-
+
+ int maxRows = DEFAULT_MAXROWS;
+ try {
+ maxRows = AppConfig.getConfiguration().getInteger(Property.JUDDI_MAX_ROWS, DEFAULT_MAXROWS);
+ }
+ catch(ConfigurationException ce) {
+ log.error("Configuration exception occurred retrieving: " + Property.JUDDI_MAX_ROWS);
+ }
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
- appendSortTables(dynamicQry);
- dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ if (keysIn.size() > maxRows) {
+ UUID uuid = UUID.randomUUID();
+ storeIntermediateKeySetResults(em, uuid.toString(), keysIn);
+ appendTempTable(dynamicQry);
+ appendSortTables(dynamicQry);
+ appendTempJoin(dynamicQry, uuid.toString());
+ }
+ else {
+ appendSortTables(dynamicQry);
+ dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ }
if (restrictions != null && restrictions.length > 0)
dynamicQry.AND().pad().appendGroupedAnd(restrictions);
appendSortCriteria(dynamicQry, fq);
log.debug(dynamicQry);
-
- return getPagedResult(em, dynamicQry, maxRows, listHead, listDesc);
+ return getPagedResult(em, dynamicQry, maxRowsUser, listHead, listDesc);
+ }
+
+ private static void appendTempTable(DynamicQuery qry) {
+ qry.comma().append(TEMP_ENTITY_NAME + " " + TEMP_ENTITY_ALIAS );
+ }
+
+ private static void appendTempJoin(DynamicQuery qry, String uuid) {
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_KEY_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.append(ENTITY_ALIAS + "." + KEY_NAME);
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_TXID_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.append("'" + uuid + "'").pad();
}
private static void appendSortTables(DynamicQuery qry) {
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java Mon Apr 15 13:07:00 2013
@@ -19,10 +19,15 @@ package org.apache.juddi.query;
import java.util.Collections;
import java.util.List;
+import java.util.UUID;
+
import javax.persistence.EntityManager;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -51,15 +56,30 @@ public class FetchTModelsQuery extends T
selectSQL = sql.toString();
}
- public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRows, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
+ public static List<?> select(EntityManager em, FindQualifiers fq, List<?> keysIn, Integer maxRowsUser, Integer listHead, ListDescription listDesc, DynamicQuery.Parameter... restrictions) throws DispositionReportFaultMessage {
// If keysIn is null or empty, then nothing to fetch.
if ((keysIn == null) || (keysIn.size() == 0))
return Collections.emptyList();
-
+ int maxRows = DEFAULT_MAXROWS;
+ try {
+ maxRows = AppConfig.getConfiguration().getInteger(Property.JUDDI_MAX_ROWS, DEFAULT_MAXROWS);
+ }
+ catch(ConfigurationException ce) {
+ log.error("Configuration exception occurred retrieving: " + Property.JUDDI_MAX_ROWS);
+ }
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
- appendSortTables(dynamicQry);
- dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ if (keysIn.size() > maxRows) {
+ UUID uuid = UUID.randomUUID();
+ storeIntermediateKeySetResults(em, uuid.toString(), keysIn);
+ appendTempTable(dynamicQry);
+ appendSortTables(dynamicQry);
+ appendTempJoin(dynamicQry, uuid.toString());
+ }
+ else {
+ appendSortTables(dynamicQry);
+ dynamicQry.appendInListWithAnd(ENTITY_ALIAS + "." + KEY_NAME, keysIn);
+ }
if (restrictions != null && restrictions.length > 0)
dynamicQry.AND().pad().appendGroupedAnd(restrictions);
@@ -67,7 +87,18 @@ public class FetchTModelsQuery extends T
log.debug(dynamicQry);
- return getPagedResult(em, dynamicQry, maxRows, listHead, listDesc);
+ return getPagedResult(em, dynamicQry, maxRowsUser, listHead, listDesc);
+ }
+
+ private static void appendTempTable(DynamicQuery qry) {
+ qry.comma().append(TEMP_ENTITY_NAME + " " + TEMP_ENTITY_ALIAS );
+ }
+
+ private static void appendTempJoin(DynamicQuery qry, String uuid) {
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_KEY_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.append(ENTITY_ALIAS + "." + KEY_NAME);
+ qry.pad().AND().pad().append(TEMP_ENTITY_PK_TXID_NAME).append(DynamicQuery.PREDICATE_EQUALS);
+ qry.append("'" + uuid + "'").pad();
}
private static void appendSortTables(DynamicQuery qry) {
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCombinedCategoryQuery.java Mon Apr 15 13:07:00 2013
@@ -49,8 +49,12 @@ import org.uddi.api_v3.CategoryBag;
*/
public class FindBusinessByCombinedCategoryQuery {
- private static final String ENTITY_NAME_CHILD = "BusinessCategoryBag";
- private static final String ENTITY_NAME_CHILD2 = "ServiceCategoryBag";
+ private static final String ENTITY_NAME_CHILD = "BusinessCategoryBag";
+ private static final String ENTITY_FIELD2 = "businessService." + BusinessEntityQuery.ENTITY_FIELD;
+ private static final String ENTITY_NAME_CHILD2 = "ServiceCategoryBag";
+ private static final String ENTITY_FIELD3 = "bindingTemplate.businessService." + BusinessEntityQuery.ENTITY_FIELD;
+ private static final String ENTITY_NAME_CHILD3 = "BindingCategoryBag";
+
private static FindEntityByCombinedCategoryQuery findQuery;
@@ -60,7 +64,11 @@ public class FindBusinessByCombinedCateg
BusinessEntityQuery.KEY_NAME,
BusinessEntityQuery.ENTITY_FIELD,
ENTITY_NAME_CHILD,
- ENTITY_NAME_CHILD2);
+ ENTITY_FIELD2,
+ ENTITY_NAME_CHILD2,
+ ENTITY_FIELD3,
+ ENTITY_NAME_CHILD3,
+ BusinessEntityQuery.SIGNATURE_PRESENT);
}
public static List<?> select(EntityManager em, FindQualifiers fq, CategoryBag categoryBag, List<?> keysIn) {
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByIdentifierQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByNameQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByPublisherQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java Mon Apr 15 13:07:00 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/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java Mon Apr 15 13:07:00 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();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org