juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1562631 [1/2] - in /juddi/trunk: juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/ juddi-core/src/main/resources/juddi_install_data/ juddi-examples/more-uddi-samples/ juddi-examples/more-uddi-samples/src/main/java/or...
Date Wed, 29 Jan 2014 23:16:08 GMT
Author: alexoree
Date: Wed Jan 29 23:16:07 2014
New Revision: 1562631

URL: http://svn.apache.org/r1562631
Log:
JUDDI-780 including uddiv2 tmodels to install data
JUDDI-827 done, altering the migration tool for bulk create, adding lorem ipsum text

Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java
    juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
    juddi/trunk/juddi-examples/more-uddi-samples/pom.xml
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
    juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
    juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
    juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js
    juddi/trunk/juddi-gui/src/main/webapp/js/main.js
    juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js
    juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js
    juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp
    juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp
    juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java
    juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java Wed Jan 29 23:16:07 2014
@@ -199,6 +199,7 @@ public class Inquiry3to2 implements UDDI
                         } catch (Exception ex) {
                         }
                         ret.getOperationalInfo().add(oi);
+                        ret.setTruncated(false);
                 }
                 return ret;
         }

Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml Wed Jan 29 23:16:07 2014
@@ -1347,15 +1347,27 @@
     </tModel>
 	
 	<tModel tModelKey="uddi:uddi.org:ubr:categorization:iso3166">
+		<name>ubr-uddi-org:iso-ch:3166-2003</name>
         <name>ISO 3166 Country Codes</name>
         <description xml:lang="en">When used in a Category Bag for a Business or Service, it can indicate the physical or logically location of the Business or Service.</description>
+		<description xml:lang="en">ISO 3166 Codes for names of countries or regions. Updated with newsletters ISO 3166-1 V-1, V-2, V-3, V-4, V-5, V-6, V-7, ISO 3166-2 I-1, I-2, I-3, I-4.</description>
        <overviewDoc>
             <overviewURL>
                http://www.iso.org/iso/country_codes
             </overviewURL>
         </overviewDoc>
+		 <overviewDoc>
+		<overviewURL useType="text">
+		  http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166
+		</overviewURL> 
+	  </overviewDoc> 
         <categoryBag>
             <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+			<keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
+			 <keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
+			<keyedReference keyName="uddi-org:types:valueSet"      keyValue="valueSet"       tModelKey="uddi:uddi.org:categorization:types"/> 
+   
+			
         </categoryBag>
     </tModel>
 	
@@ -1422,12 +1434,8 @@
 	    </overviewURL>
 	  </overviewDoc>
 	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:postalAddress"
-	      keyValue="postalAddress"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
+	    <keyedReference keyName="uddi-org:types:postalAddress"	      keyValue="postalAddress"	      tModelKey="uddi:uddi.org:categorization:types"/>
+	    <keyedReference keyName="uddi-org:types:unchecked"	      keyValue="unchecked"	      tModelKey="uddi:uddi.org:categorization:types"/>
 	   </categoryBag>
 	</tModel>
 	
@@ -1485,9 +1493,11 @@
 	    </overviewURL>
 	  </overviewDoc>
 	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
+	    <!--<keyedReference keyName="uddi-org:types:unchecked"	      keyValue="unchecked"	      tModelKey="uddi:uddi.org:categorization:types"/>-->
+		  <keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uddi:uddi.org:categorization:types"/> 
+		<keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uddi:uddi.org:categorization:types"/> 
+		<keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
+	  
 	   </categoryBag>
 	</tModel>
 	
@@ -1510,7 +1520,7 @@
                       keyValue="keyGenerator" />
         </categoryBag>
 	</tModel>
-	
+	 
 	
 	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:1997">
 	  <name>North American Industry Classification System 1997</name>
@@ -1519,14 +1529,21 @@
 	    <overviewURL useType="text">
 	      https://www.census.gov/eos/www/naics/reference_files_tools/1997/1997.html
 	    </overviewURL>
+		
 	  </overviewDoc>
+	  <overviewDoc>
+	   <overviewURL useType="text">
+            http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS 
+         </overviewURL>  
+		</overviewDoc>
 	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
+	     <!--<keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked"  tModelKey="uddi:uddi.org:categorization:types"/>-->
+		 <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/> 
+	     <keyedReference keyName="uddi-org:types:checked"  keyValue="checked"   tModelKey="uddi:uddi.org:categorization:types"/> 
+         <keyedReference keyName="uddi-org:types:cacheable"  keyValue="cacheable"  tModelKey="uddi:uddi.org:categorization:types"/> 
 	   </categoryBag>
 	</tModel>
-	
+	 
 	
 	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2012">
 	  <name>North American Industry Classification System 2012</name>
@@ -1544,19 +1561,28 @@
 	</tModel>
 	
 	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2002">
+	  <name>ntis-gov:naics:2002</name> 
 	  <name>North American Industry Classification System 2002</name>
 	  <description xml:lang="en">North American Industry Classification System 2002</description>
+	  <description xml:lang="en">Business Taxonomy: NAICS (2002 Release)</description> 
 	  <overviewDoc>
 	    <overviewURL useType="text">
 	      https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2002
 	    </overviewURL>
 	  </overviewDoc>
+	  <overviewDoc> 
+    <overviewURL>
+      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS2002 
+    </overviewURL> 
+  </overviewDoc> 
 	  <categoryBag>
-	    <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
+		<keyedReference keyName="uddi-org:types:categorization"     keyValue="categorization"     tModelKey="uddi:uddi.org:categorization:types"/> 
+		<keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uddi:uddi.org:categorization:types"/> 
+		<keyedReference keyName="uddi-org:types:cacheable"      keyValue="cacheable"       tModelKey="uddi:uddi.org:categorization:types"/> 
 	   </categoryBag>
 	</tModel>
+
+
 	
 	<tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2007">
 	  <name>North American Industry Classification System 2007</name>
@@ -1650,13 +1676,390 @@
                 http://fedgov.dnb.com/webform/pages/dunsnumber.jsp
             </overviewURL>
         </overviewDoc>
+		<overviewDoc>
+			<overviewURL useType="text">
+			  http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#D-U-N-S
+			</overviewURL> 
+		  </overviewDoc> 
         <categoryBag>
-            <keyedReference keyName="uddi-org:types:unchecked"
-	      keyValue="unchecked"
-	      tModelKey="uddi:uddi.org:categorization:types"/>
+            <keyedReference keyName="uddi-org:types:unchecked"	      keyValue="unchecked"	      tModelKey="uddi:uddi.org:categorization:types"/>
+		   <keyedReference keyName="uddi-org:types:identifier"		keyValue="identifier"       tModelKey="uddi:uddi.org:categorization:types"/> 
+		   <keyedReference keyName="D-U-N-S"   keyValue="0060"  tModelKey="uddi:uddi.org:ubr:identifier:iso6523icd"/>
         </categoryBag>
 	</tModel>
+	<!-- new stuff -->
 	
+	<tModel	 tModelKey="uddi:uddi.org:ubr:identifier:iso6523icd">
+	  <name>ubr-uddi-org:iso-ch:1998:icd</name>
+	  <description xml:lang="EN">ISO 6523 International Code Designator (ICD) System
+	  </description>
+	  <overviewDoc>
+		<overviewURL useType="text">
+		  http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO6523Code
+		</overviewURL> 
+	  </overviewDoc> 
+	  <categoryBag>
+		<keyedReference keyName="uddi-org:types:identifier"      keyValue="identifier"       tModelKey="uddi:uddi.org:categorization:types"/> 
+		<keyedReference keyName="uddi-org:types:unchecked"      keyValue="unchecked"       tModelKey="uddi:uddi.org:categorization:types"/> 
+	   </categoryBag>
+	</tModel>
 	
 	
+	<tModel tModelKey="uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823">
+        <name>dnb-com:D-U-N-S</name>
+        <description xml:lang="en">Dun&amp;Bradstreet D-U-N-S® Number</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel is used for the Dun&amp;Bradstreet D-U-N-S® Number identifier.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#D-U-N-S</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="identifier"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:C0B9FE13-179F-413D-8A5B-5004DB8E5BB2">
+        <name>ntis-gov:naics:1997</name>
+        <description xml:lang="en">Business Taxonomy: NAICS(1997 Release)</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel defines the NAICS industry taxonomy.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:C7536010-F786-11DB-A010-E6245C4E79A1">
+        <name>org.jboss.soa.esb.:category</name>
+        <overviewDoc/>
+    </tModel>
+    <tModel tModelKey="uuid:B1B1BAF5-2329-43E6-AE13-BA8E97195039">
+        <name>thomasregister-com:supplierID</name>
+        <description xml:lang="en">Thomas Registry Suppliers</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel is used for the Thomas Register supplier identifier codes.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Thomas</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="identifier"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:A035A07C-F362-44DD-8F95-E2B134BF43B4">
+        <name>uddi-org:general_keywords</name>
+        <description xml:lang="en">Special taxonomy consisting of namespace identifiers and the keywords associated with the namespaces</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel defines an unidentified taxonomy.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#GenKW</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+			<keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:68DE9E80-AD09-469D-8A37-088422BFBC36">
+        <name>uddi-org:http</name>
+        <description xml:lang="en">An HTTP or web browser-based web service</description>
+        <overviewDoc>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_CoreOther_tModels.htm#overHTTP</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="tModelType" keyValue="transport"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B">
+        <name>uddi-org:inquiry_v2</name>
+        <description xml:lang="en">UDDI Inquiry API Version 2 - Core Specification</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel defines the inquiry API calls for interacting with a V2 UDDI node.</description>
+            <overviewURL>http://www.uddi.org/wsdl/inquire_v2.wsdl</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="specification"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="xmlSpec"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="soapSpec"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="wsdlSpec"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E">
+        <name>uddi-org:isReplacedBy</name>
+        <description xml:lang="en">An identifier system used to point (using UDDI keys) to the tModel (or businessEntity) that is the logical replacement for the one in which isReplacedBy is used</description>
+        <overviewDoc>
+            <description xml:lang="en">This is a checked value set.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#IsReplacedBy</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="identifier"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:4E49A8D6-D5A2-4FC2-93A0-0411D8D19E88">
+        <name>uddi-org:iso-ch:3166-1999</name>
+        <description xml:lang="en">ISO 3166-1:1997 and 3166-2:1998. Codes for names of countries and their subdivisions. Part 1: Country codes. Part 2:Country subdivision codes. Update newsletters include ISO 3166-1 V-1 (1998-02-05), V-2 (1999-10-01), ISO 3166-2 I-1 (1998)</description>
+        <overviewDoc>
+            <description xml:lang="en">Taxonomy used to categorize entries by geographic location.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166</overviewURL>
+        </overviewDoc>
+		 <overviewDoc>
+            <overviewURL>
+               http://www.iso.org/iso/country_codes
+            </overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:327A56F0-3299-4461-BC23-5CD513E95C55">
+        <name>uddi-org:operators</name>
+        <description xml:lang="en">Taxonomy for categorizing the businessEntity of an operator of a registry.</description>
+        <overviewDoc>
+            <description xml:lang="en">This checked value set is used to identify UDDI operators.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Operators</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:4064C064-6D14-4F35-8953-9652106476A9">
+        <name>uddi-org:owningBusiness</name>
+        <description xml:lang="en">A pointer to a businessEntity that owns the tagged data.</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel indicates the businessEntity that published or owns the tagged tModel. Used with tModels to establish an &quot;owned&quot; relationship with a registered businessEntity.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#owningBusiness</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:6E10B91B-BABC-3442-B8FC-5A3C8FDE0794">
+        <name>uddi-org:protocol:http</name>
+        <description xml:lang="en">A tModel that represents the HTTP protocol</description>
+        <overviewDoc>
+            <description xml:lang="en">The HTTP Protocol tModel can be used to indicate that a Web service supports the HTTP protocol.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#http</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="protocol"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:AA254698-93DE-3870-8DF3-A5C075D64A0E">
+        <name>uddi-org:protocol:soap</name>
+        <description xml:lang="en">A tModel that represents the SOAP 1.1 protocol</description>
+        <overviewDoc>
+            <description xml:lang="en">The SOAP Protocol tModel can be used to indicate that a Web service supports the SOAP 1.1 protocol.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#soap</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="protocol"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03">
+        <name>uddi-org:relationships</name>
+        <description xml:lang="en">Starter set classifications of businessEntity relationships</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel is used to describe business relationships. Used in the publisher assertion messages.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Relationships</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="relationship"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A">
+        <name>uddi-org:taxonomy_v2</name>
+        <description xml:lang="en">UDDI Taxonomy API Version 2 - Core Specification</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel defines the taxonomy validation API calls for interacting with a V2 UDDI node.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Registry_tModels.htm#TaxV2</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="specification"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="xmlSpec"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="soapSpec"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4">
+        <name>uddi-org:types</name>
+        <description xml:lang="en">UDDI Type Taxonomy</description>
+        <overviewDoc>
+            <description xml:lang="en">Taxonomy used to categorize Service Descriptions.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UDDItypes</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212">
+        <name>uddi-org:wsdl:address</name>
+        <description xml:lang="en">A tModel used to indicate the WSDL address option.</description>
+        <overviewDoc>
+            <description xml:lang="en">The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#Address</overviewURL>
+        </overviewDoc>
+    </tModel>
+    <tModel tModelKey="uuid:4DC74177-7806-34D9-AECD-33C57DC3A865">
+        <name>uddi-org:wsdl:categorization:protocol</name>
+        <description xml:lang="en">Category system used to describe the protocol supported by a wsdl:binding.</description>
+        <overviewDoc>
+            <description xml:lang="en">The Protocol Categorization tModel provides a mechanism to capture this protocol information in the UDDI binding tModel.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#protocol</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:E5C43936-86E4-37BF-8196-1D04B35C0099">
+        <name>uddi-org:wsdl:categorization:transport</name>
+        <description xml:lang="en">Category system used to describe the transport supported by a wsdl:binding.</description>
+        <overviewDoc>
+            <description xml:lang="en">The Transport Categorization tModel provides a mechanism to capture transport information in the UDDI binding tModel which allows a user to search for bindings that implement a specific transport protocol.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#transport</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="checked"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:082B0851-25D8-303C-B332-F24A6D53E38E">
+        <name>uddi-org:wsdl:portTypeReference</name>
+        <description xml:lang="en">A category system used to reference a wsdl:portType tModel</description>
+        <overviewDoc>
+            <description xml:lang="en">The WSDL portType Reference category system provides a mechanism to indicate that a UDDI entity has a relationship with a certain wsdl:portType tModel.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#portTypeReference</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="checked"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="categorization"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457">
+        <name>uddi-org:wsdl:types</name>
+        <description xml:lang="en">WSDL Type Category System</description>
+        <overviewDoc>
+            <description xml:lang="en">The WSDL Entity Type tModel uses a number of UDDI entities to represent the various entities within a WSDL document.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#wsdlTypes</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="unchecked"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="categorization"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:2EC65201-9109-3919-9BEC-C9DBEFCACCF6">
+        <name>uddi-org:xml:localName</name>
+        <description xml:lang="en">A category system used to indicate XML local names</description>
+        <overviewDoc>
+            <description xml:lang="en">The XML Local Name tModel provides a mechanism to indicate the name attribute for the uddi:businessService.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#xmlLocalName</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="unchecked"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="categorization"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:D01987D1-AB2E-3013-9BE2-2A66EB99D824">
+        <name>uddi-org:xml:namespace</name>
+        <description xml:lang="en">A category system used to indicate namespaces</description>
+        <overviewDoc>
+            <description xml:lang="en">A namespace provides necessary qualifying information about a technical concept or model. The XML Namespace tModel provides a mechanism to associate a namespace with a UDDI entity.</description>
+            <overviewURL>http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#xmlNamespace</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="unchecked"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="uddi-org:types" keyValue="categorization"/>
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:CD153257-086A-4237-B336-6BDCBDCC6634">
+        <name>unspsc-org:unspsc</name>
+        <description xml:lang="en">Product Taxonomy: UNSPSC (Version 7.3)</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel defines Version 7.3 of the UNSPSC product taxonomy.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UNSPSC</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="Checked"/>
+			<keyedReference keyName="uddi-org:types:cacheable"   keyValue="cacheable"  tModelKey="uddi:uddi.org:categorization:types"/> 
+   
+        </categoryBag>
+    </tModel>
+    <tModel tModelKey="uuid:DB77450D-9FA8-45D4-A7BC-04411D14E384">
+        <name>unspsc-org:unspsc:3-1</name>
+        <description xml:lang="en">Product Taxonomy: UNSPSC (Version 3.1)</description>
+        <overviewDoc>
+            <description xml:lang="en">This tModel defines the UNSPSC product taxonomy.</description>
+            <overviewURL>http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UNSPSC31</overviewURL>
+        </overviewDoc>
+        <categoryBag>
+            <keyedReference tModelKey="uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4" keyName="types" keyValue="categorization"/>
+        </categoryBag>
+    </tModel>
+	
+	<tModel tModelKey="uuid:f1b347da-6cbb-3a10-93e7-7cd4328b88d3">
+  <name>ubr-uddi-org:iso-ch:1998:icd</name>
+  <description xml:lang="EN">ISO 6523 International Code Designator (ICD) System
+  </description>
+  <overviewDoc>
+    <overviewURL>
+      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO6523Code
+    </overviewURL> 
+  </overviewDoc> 
+  <categoryBag>
+    <keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"
+      keyName="types"
+      keyValue="identifier"/>
+  </categoryBag>
+</tModel>
+
+
+
+<tModel tModelKey="uuid:1ff729f2-1948-46cf-b660-31ec107f1663"> 
+  <name>ntis-gov:naics:2002</name> 
+  <name>North American Industry Classification System 2002</name>
+  <description xml:lang="en">North American Industry Classification System 2002</description>
+  <description xml:lang="en">Business Taxonomy: NAICS (2002 Release)</description> 
+  <overviewDoc> 
+    <overviewURL>
+      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS2002 
+    </overviewURL> 
+  </overviewDoc> 
+  <categoryBag>
+    <keyedReference keyName="uddi-org:types:categorization"      keyValue="categorization"       tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"/> 
+    <keyedReference keyName="uddi-org:types:checked"      keyValue="checked"       tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"/>
+    <keyedReference keyName="uddi-org:types:cacheable"       keyValue="cacheable"       tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"/>
+   </categoryBag>
+</tModel>
+ 
+ <tModel
+ tModelKey="uuid:4614c240-b483-11d7-8be8-000629dc0a53">
+  <name> unspsc-org:unspsc:v6.0501</name>
+  <description xml:lang="en"> Product and Service Category System: United Nations Standard Products and Services Code (UNSPSC)</description>
+  <overviewDoc>
+    <overviewURL>
+      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UNSPSCv60501
+    </overviewURL> 
+  </overviewDoc> 
+  <categoryBag>
+    <keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"      keyName="types"      keyValue="categorization"/>
+    <keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"      keyName="types"      keyValue="checked"/>
+  </categoryBag>
+</tModel>
+
+
+<tModel
+ tModelKey="uuid:48eb2518-c1bd-354f-92c9-21a53b0ff2b1">
+  <name>ubr-uddi-org:postalAddress</name>
+  <description xml:lang="en">Postal address structure</description>
+  <overviewDoc>
+    <overviewURL useType="text">
+      http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
+    </overviewURL> 
+  </overviewDoc> 
+  <categoryBag>
+    <keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"      keyName="types"      keyValue="categorization"/>
+    <keyedReference tModelKey="uuid:c1acf26d-9672-4404-9d70-39b756e62ab4"      keyName="types"      keyValue="checked"/>
+  </categoryBag>
+</tModel> 
+
 </save_tModel>
\ No newline at end of file

Modified: juddi/trunk/juddi-examples/more-uddi-samples/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/pom.xml?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/pom.xml (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/pom.xml Wed Jan 29 23:16:07 2014
@@ -28,6 +28,13 @@
 			<artifactId>juddi-client</artifactId>
 			<version>3.2.0-SNAPSHOT</version>
 		</dependency>
+      <!-- a lorem ipsum generator MIT license-->
+      <dependency>
+         <groupId>de.sven-jacobs</groupId>
+         <artifactId>loremipsum</artifactId>
+         <version>1.0</version>
+      </dependency>
+            
 	</dependencies>
 	<build>
 		<plugins>

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java Wed Jan 29 23:16:07 2014
@@ -16,13 +16,13 @@
  */
 package org.apache.juddi.samples;
 
+import de.svenjacobs.loremipsum.LoremIpsum;
 import java.util.GregorianCalendar;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import org.apache.juddi.api_v3.AccessPointType;
 import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.*;
 import org.uddi.v3_service.UDDIPublicationPortType;
@@ -70,6 +70,7 @@ public class UddiCreatebulk {
                                 token = rootAuthToken.getAuthInfo();
                         }
 
+                        LoremIpsum textgen = new LoremIpsum();
                         DatatypeFactory df = DatatypeFactory.newInstance();
                         GregorianCalendar gcal = new GregorianCalendar();
                         gcal.setTimeInMillis(System.currentTimeMillis());
@@ -79,7 +80,8 @@ public class UddiCreatebulk {
                                 BusinessEntity myBusEntity = new BusinessEntity();
                                 Name myBusName = new Name();
                                 myBusName.setLang("en");
-                                myBusName.setValue("My Business " + i + " " + xcal.toString());
+                                myBusName.setValue("My Business " + i + " " + xcal.toString() + " " + textgen.getWords(5, 2) );
+                                myBusEntity.getDescription().add(new Description( textgen.getWords(10, 2), null));
                                 myBusEntity.getName().add(myBusName);
 
                                 // Adding the business entity to the "save" structure, using our publisher's authentication info and saving away.
@@ -96,12 +98,10 @@ public class UddiCreatebulk {
                                         myService.setBusinessKey(myBusKey);
                                         Name myServName = new Name();
                                         myServName.setLang("en");
-                                        myServName.setValue("My Service " + i + " " + k + " " + xcal.toString());
+                                        myServName.setValue("My Service " + i + " " + k + " " + xcal.toString()+ " " + textgen.getWords(5, 2) );
                                         myService.getName().add(myServName);
-                                        Description d2 = new Description();
-                                        d2.setValue("my service description");
-                                        d2.setLang("en");
-                                        myService.getDescription().add(d2);
+                                        myService.getDescription().add(new Description( textgen.getWords(10, 2), null));
+                                        
                                         // Add binding templates, etc...
                                         BindingTemplate myBindingTemplate = new BindingTemplate();
                                         myBindingTemplate.setCategoryBag(new CategoryBag());
@@ -151,11 +151,11 @@ public class UddiCreatebulk {
                                         tii.getDescription().add(d);
                                         tii.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
                                         tii.setInstanceDetails(new InstanceDetails());
-                                        tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing this endpoint, up to 4KB of data");
+                                        tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing this endpoint, up to 4KB of data"+ " " + textgen.getWords(20, 2) );
                                         tii.getInstanceDetails().getDescription().add(d);
                                         OverviewDoc od = new OverviewDoc();
                                         d = new Description();
-                                        d.setValue("ovweview doc description");
+                                        d.setValue("ovweview doc description"+ " " + textgen.getWords(5, 2) );
                                         od.getDescription().add(d);
                                         od.setOverviewURL(new OverviewURL());
                                         od.getOverviewURL().setUseType("www");

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Wed Jan 29 23:16:07 2014
@@ -611,6 +611,7 @@ public class UddiHub implements Serializ
                         fb.setListHead(offset);
                         fb.setAuthInfo(GetToken());
                         org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
+                        fq.getFindQualifier().add(UDDIConstants.CASE_INSENSITIVE_MATCH);
                         fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
                         fq.getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         fb.setFindQualifiers(fq);
@@ -1188,6 +1189,7 @@ public class UddiHub implements Serializ
                         fs.getName().add(n);
                         fs.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
                         fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                        fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.CASE_INSENSITIVE_MATCH);
                         fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         ServiceList findService = null;//inquiry.findService(fs);
                         try {
@@ -1351,6 +1353,7 @@ public class UddiHub implements Serializ
                         fm.getName().setValue(keyword);
                         fm.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
                         fm.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                        fm.getFindQualifiers().getFindQualifier().add(UDDIConstants.CASE_INSENSITIVE_MATCH);
                         fm.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         TModelList findTModel = null;
                         try {

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java Wed Jan 29 23:16:07 2014
@@ -103,7 +103,7 @@ public class Printers {
                                 append("<Br>");
                         sb.append(ResourceLoader.GetResource(locale, "items.description")).
                                 append(": ").
-                                append(ListToDescString(bindingTemplates.getBindingTemplate().get(i).getDescription())).
+                                append(trunc(ListToDescString(bindingTemplates.getBindingTemplate().get(i).getDescription()))).
                                 append("<Br>");
                         sb.append(ResourceLoader.GetResource(locale, "pages.editor.tabnav.categories")).
                                 append(": ").append(CatBagToString(bindingTemplates.getBindingTemplate().get(i).getCategoryBag(), locale)).
@@ -198,18 +198,26 @@ public class Printers {
                                 sb.append("</a>");
                         }
                         sb.append("</td><td>")
-                                .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue()));
+                                .append(StringEscapeUtils.escapeHtml(trunc(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue())));
                         if (findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang() != null) {
                                 sb.append(", ")
                                         .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang()));
                         }
                         sb.append("</td><td>")
-                                .append(StringEscapeUtils.escapeHtml(Printers.ListToDescString(findTModel.getTModelInfos().getTModelInfo().get(i).getDescription())))
+                                .append(StringEscapeUtils.escapeHtml(trunc(Printers.ListToDescString(findTModel.getTModelInfos().getTModelInfo().get(i).getDescription()))))
                                 .append("</td></tr>");
                 }
+                
                 sb.append("</table>");
                 return sb.toString();
         }
+        
+        private static String trunc(String input){
+           if (input==null) return "";
+           if (input.length() > 60)
+            return input.substring(0, 60) + "...";
+           return input;
+        }
 
         /**
          * used from hub
@@ -241,9 +249,10 @@ public class Printers {
                                 append("\"  href=\"businessEditor2.jsp?id=").
                                 append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
                                 append("\">").
-                                append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getName()))).
+                                append(StringEscapeUtils.escapeHtml(trunc(Printers.ListNamesToString(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getName())))).
+                                append(" <i class=\"icon-edit\"></i>").
                                 append("</a></td><td>").
-                                append("<a class=\"btn btn-primary\" href=\"javascript:ShowServicesByBusinessKey('").
+                                append("<a class=\"btn\" href=\"javascript:ShowServicesByBusinessKey('").
                                 append(StringEscapeUtils.escapeJavaScript(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
                                 append("');\">");
 
@@ -254,9 +263,10 @@ public class Printers {
                         }
                         sb.append("</a>");
                         if (!isChooser) {
-                                sb.append("<a class=\"btn btn-primary\" href=\"serviceEditor.jsp?bizid=").
+                                sb.append(" <a class=\"btn btn-primary\" href=\"serviceEditor.jsp?bizid=").
                                         append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
-                                        append("\"><i class=\"icon-plus-sign icon-white  icon-large\"></i></a>");
+                                        append("\"><i class=\"icon-plus-sign icon-white  icon-large\"></i> ").
+                                        append(ResourceLoader.GetResource(session, "actions.add")).append("</a>");
                         }
                         sb.append("</td></tr>");
 
@@ -301,7 +311,7 @@ public class Printers {
                                 append("\" title=\"").
                                 append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey()))
                                 .append("\">");
-                        sb.append(Printers.ListNamesToString(findService.getServiceInfos().getServiceInfo().get(i).getName())).append("<i class=\"icon-edit icon-large\"></i<</a></td><td>");
+                        sb.append(trunc(Printers.ListNamesToString(findService.getServiceInfos().getServiceInfo().get(i).getName()))).append("<i class=\"icon-edit icon-large\"></i<</a></td><td>");
 
                         sb.append((findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).append("</td><td>");
                         sb.append("<a href=\"businessEditor2.jsp?id=")

Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties Wed Jan 29 23:16:07 2014
@@ -348,7 +348,7 @@ pages.serviceimport.content.step1a.wadl=
 items.optional=(Optional)
 items.ignoresslerror=Ignore SSL Errors
 items.businesskeyorname=Business Key or Name
-pages.serviceimport.content.step3a=Newly registered services need to be attached to a business. Either enter a new business name.
+pages.serviceimport.content.step3a=Newly registered services need to be attached to a business. Either enter a new business name, an existing business key, or use the Picker to select an existing business key.
 navbar.create.serviceimport.tooltip.wadl=Based on the UDDI TC, Using WSDL in a UDDI Registry, but adapted for WADL
 navbar.advanced=Advanced
 actions.submit=Submit

Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties Wed Jan 29 23:16:07 2014
@@ -350,7 +350,7 @@ pages.serviceimport.content.step1a.wadl=
 items.optional=(Opcional)
 items.ignoresslerror=Ignorar errores SSL
 items.businesskeyorname=Llave de negocios o Nombre
-pages.serviceimport.content.step3a=Servicios recientemente registrados deben fijarse a un negocio. O introduzca un nuevo nombre comercial.
+pages.serviceimport.content.step3a=Servicios de nueva matriculaci\u00f3n necesitan estar conectados a un negocio. Introducir un nuevo nombre comercial, una clave de negocio existente, o utilice el Selector para seleccionar una clave de negocio existente.
 navbar.create.serviceimport.tooltip.wadl=Basado en el UDDI TC, utilizando WSDL en un registro UDDI, pero adaptado para WADL
 navbar.advanced=Avanzado
 actions.submit=Entregar

Modified: juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp Wed Jan 29 23:16:07 2014
@@ -13,14 +13,26 @@ this page is meant to be included via js
       <h3><%=ResourceLoader.GetResource(session, "items.binding.chooser")%> </h3>
    </div>
    <div class="modal-body">
-
-      <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBinding"></span><br>
-      <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBinding"></span><br>
-      <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBinding">0</span><br>
-      <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBinding" class=""></span><br>
-
+      <table class="table-bordered table-striped">
+         <tr>
+            <td>
+               <table>
+                  <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsBinding"></span></td></tr>
+                  <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsBinding"></span></td></tr>
+                  <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetBinding">0</span></td></tr>
+               </table>
+            </td>
+            <td>
+               <table>
+
+                  <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_binding" value="%"></td></tr>
+                  <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_binding" value=""></td></tr>
+               </table>
+            </td>
+         </tr>
+      </table>
       <a href="javascript:pagedownChooserBinding();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBinding"></i></a>
-      <a href="javascript:reloadBinding();"><i class="icon-refresh icon-2x"></i></a>
+      <a href="javascript:reloadBindingModal();"><i class="icon-refresh icon-2x"></i></a>
       <a href="javascript:pageupChooserBinding();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBinding"></i></a>
 
       <div id="bindinglist">
@@ -30,16 +42,14 @@ this page is meant to be included via js
       <script type="text/javascript">
          $("#bindingChooser").keydown(function(e) {
             if (e.which == 37) { // left
-               pagedownChooserService();
+               pagedownChooserBinding();
             }
             else if (e.which == 39) { // right
-               pageupChooserService();
+               pageupChooserBinding();
             }
          });
          $('.edit').editable(function(value, settings) {
-            console.log(this);
-            console.log(value);
-            console.log(settings);
+            window.console && console.log(value + this + settings);
             reloadBindingModal();
             //  RenderTmodelListBySearch('%', offset, maxrecords);
             return(value);

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp Wed Jan 29 23:16:07 2014
@@ -9,40 +9,64 @@
 <%@include file="header-top.jsp" %>
 <div class="container">
 
-    <!-- Main hero unit for a primary marketing message or call to action -->
-    <div class="well" >
-        <h1><%=ResourceLoader.GetResource(session, "navbar.businesses")%></h1>
-    </div>
+   <!-- Main hero unit for a primary marketing message or call to action -->
+   <div class="well" >
+      <h1><%=ResourceLoader.GetResource(session, "navbar.businesses")%></h1>
+   </div>
 
-    <!-- Example row of columns -->
-    <div class="row">
-        <div class="span12" >
-            <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBusiness"></span><br>
-            <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBusiness"></span><br>
-            <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBusiness">0</span><br>
-            <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
-            <a href="javascript:pagedownBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
-            <a href="javascript:refreshBusinessList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
-            <a href="javascript:pageupBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
+   <!-- Example row of columns -->
+   <div class="row">
+      <div class="span12" >
+         <table class="table-bordered table-striped">
+            <tr>
+               <td>
+                  <table>
+                     <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsBusiness"></span></td></tr>
+                     <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsBusiness"></span></td></tr>
+                     <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetBusiness">0</span></td></tr>
+                  </table>
+               </td>
+               <td>
+                  <table>
+                     <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_business" value="%" tabindex="1"></td></tr>
+                     <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_business" tabindex="2"></td></tr>
+                  </table>
+               </td>
+            </tr>
+         </table>
+         <a href="javascript:pagedownBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
+         <a href="javascript:refreshBusinessList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
+         <a href="javascript:pageupBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
 
-            <div id="businesslist">
-                <img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
-            </div>
+         <div id="businesslist">
+            <img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
+         </div>
 
-            <script src="js/businesssearch.js"></script>
-            <script type="text/javascript">
-                
-                $('.edit').editable(function(value, settings) { 
-                    console.log(this);
-                    console.log(value);
-                    console.log(settings);
-                    RenderBusinessListBySearch('%', offset, maxrecords);
-                    return(value);
-                }, { 
-                    type    : 'text',
-                    submit  : i18n_ok
-                });
-            </script>
-        </div>
-    </div>
-    <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+         <script src="js/businesssearch.js"></script>
+         <script type="text/javascript">
+
+            $('.edit').editable(function(value, settings) {
+               window.console && console.log(value + this + settings);
+               RenderBusinessListBySearch('%', offset, maxrecords);
+               return(value);
+            }, {
+               type: 'text',
+               submit: i18n_ok
+            });
+            /*
+            var now=+new Date();
+            $("name_business").keydown(function(e) {
+               
+               var newnow = + new Date();
+               window.console && console.log(newnow + " " + now + " refreshing business list (search as you type)");
+               if (newnow-now > 500 )
+               {
+                  refreshBusinessList();
+                  window.console && console.log(newnow + " " + now + " refreshing business list (search as you type)");
+               }
+               return false;
+            });*/
+         </script>
+      </div>
+   </div>
+   <%@include file="header-bottom.jsp" %>
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp Wed Jan 29 23:16:07 2014
@@ -13,14 +13,25 @@ this page is meant to be included via js
       <h3><%=ResourceLoader.GetResource(session, "items.business.chooser")%> </h3>
    </div>
    <div class="modal-body">
-
-      <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBusiness"></span><br>
-      <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBusiness"></span><br>
-      <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBusiness">0</span><br>
-      <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBusiness" class=""></span><br>
-
+      <table class="table-bordered table-striped">
+         <tr>
+            <td>
+               <table>
+                  <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsBusiness"></span></td></tr>
+                  <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsBusiness"></span></td></tr>
+                  <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetBusiness">0</span></td></tr>
+               </table>
+            </td>
+            <td>
+               <table>
+                  <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_business" value="%" ></td></tr>
+                  <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_business" ></td></tr>
+               </table>
+            </td>
+         </tr>
+      </table>
       <a href="javascript:pagedownChooserBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
-      <a href="javascript:reloadBusiness();"><i class="icon-refresh icon-2x"></i></a>
+      <a href="javascript:reloadBusinessModal();"><i class="icon-refresh icon-2x"></i></a>
       <a href="javascript:pageupChooserBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
 
       <div id="businesslist">
@@ -39,9 +50,7 @@ this page is meant to be included via js
 
          });
          $('.edit').editable(function(value, settings) {
-            console.log(this);
-            console.log(value);
-            console.log(settings);
+            window.console && console.log(value + this + settings);
             reloadBusinessModal();
             //  RenderTmodelListBySearch('%', offset, maxrecords);
             return(value);

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js Wed Jan 29 23:16:07 2014
@@ -7,169 +7,178 @@
 
 function reloadBindingModal()
 {
-    RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
-                      
+   RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
+
 }
 
 
 
-var offsetBinding=0; //start at the begining
-var maxrecordsBinding=10;  //record 20 at a time
-var langBinding="en";  //langauge english
-var totalrecordsBinding=0;
+var offsetBinding = 0; //start at the begining
+var maxrecordsBinding = 10;  //record 20 at a time
+var langBinding = "en";  //langauge english
+var totalrecordsBinding = 0;
 
 RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
 
 function pagedownChooserBinding()
 {
-    offsetBinding = $("#offsetBinding").text();
-    //alert(offset);
-    var newoffset = offsetBinding - maxrecordsBinding;
-    if (newoffset < 0)
-        return;
-    //alert(newoffset);
-    if (newoffset != offsetBinding)
-        RenderBindingListBySearch('%', newoffset, maxrecordsBinding, true);
+   offsetBinding = $("#offsetBinding").text();
+   //alert(offset);
+   var newoffset = offsetBinding - maxrecordsBinding;
+   if (newoffset < 0)
+      return;
+   //alert(newoffset);
+   if (newoffset != offsetBinding)
+      RenderBindingListBySearch('%', newoffset, maxrecordsBinding, true);
 }
 function pageupChooserBinding()
 {
-    offsetBinding = $("#offsetBinding").text();
-    //alert(offset);
-    var fetch = maxrecordsBinding;
-    if ((parseInt(offsetBinding) + parseInt(maxrecordsBinding))  > totalrecordsBinding)
-        //fetch = maxrecords - offset;
-        return;
-    else 
-        fetch = (parseInt(offsetBinding) + parseInt(maxrecordsBinding));    
-    //alert(fetch);
-    offsetBinding = fetch;
-    RenderBindingListBySearch('%', fetch, maxrecordsBinding, true);
+   offsetBinding = $("#offsetBinding").text();
+   //alert(offset);
+   var fetch = maxrecordsBinding;
+   if ((parseInt(offsetBinding) + parseInt(maxrecordsBinding)) > totalrecordsBinding)
+      //fetch = maxrecords - offset;
+      return;
+   else
+      fetch = (parseInt(offsetBinding) + parseInt(maxrecordsBinding));
+   //alert(fetch);
+   offsetBinding = fetch;
+   RenderBindingListBySearch('%', fetch, maxrecordsBinding, true);
 }
 
 
-var selectedItemBinding=null;
+var selectedItemBinding = null;
 
 //offset, maxrecords, keyword
 function RenderBindingListBySearch(keyword1, offset1, maxrecords1, isForChooser)
 {
-    if (keyword1 === "%")
-        keyword1 = "%25";
-    var lang = $("#langBinding").text();
-    $("#bindinglist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
-    var request=   $.ajax({
-        url: 'ajax/bindingsearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
-        type:"GET",
-        cache: false
-    });
-                  
-    request.done(function(msg) {
-        window.console && console.log('postback done ');                
-        $("#bindinglist").html(msg);
-    });
-
-    request.fail(function(jqXHR, textStatus) {
-        window.console && console.log('postback failed ');                                
-        $("#bindinglist").html("An error occured! " + jqXHR.responseText + textStatus);
-    });
+   var keyword=$("#name_binding").val();
+   var lang = $("#lang_binding").val();
+   if (lang == undefined)
+      lang = "";
+   if (keyword == undefined)
+      keyword = "%";
+   lang = encodeURIComponent(lang);
+   keyword = encodeURIComponent(keyword);
+   offset1 = encodeURIComponent(offset1);
+   maxrecords1 = encodeURIComponent(maxrecords1);
+
+
+   $("#bindinglist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+   var request = $.ajax({
+      url: 'ajax/bindingsearch.jsp?keyword=' + keyword + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
+      type: "GET",
+      cache: false
+   });
+
+   request.done(function(msg) {
+      window.console && console.log('postback done ');
+      $("#bindinglist").html(msg);
+   });
+
+   request.fail(function(jqXHR, textStatus) {
+      window.console && console.log('postback failed ');
+      $("#bindinglist").html("An error occured! " + jqXHR.responseText + textStatus);
+   });
 }
 
 function refreshBinding()
 {
-    var displayrecords = $("#displayrecords").text();
-    if (displayrecords == totalrecordsBinding)
-    {
-        $("#pageupBinding").addClass("disabled");
-        $("#pagedownBinding").addClass("disabled");
-    }
-    else if (offsetBinding + maxrecordsBinding > totalrecordsBinding)
-    {
-        $("#pageupBinding").addClass("disabled");    
-    }
-    else if (offsetBinding ==0)
-    {
-        $("#pagedownBinding").removeClass("disabled");        
-    }
-    else
-    {
-        $("#pagedownBinding").removeClass("disabled");        
-        $("#pageupBinding").removeClass("disabled");        
-    }
+   var displayrecords = $("#displayrecords").text();
+   if (displayrecords == totalrecordsBinding)
+   {
+      $("#pageupBinding").addClass("disabled");
+      $("#pagedownBinding").addClass("disabled");
+   }
+   else if (offsetBinding + maxrecordsBinding > totalrecordsBinding)
+   {
+      $("#pageupBinding").addClass("disabled");
+   }
+   else if (offsetBinding == 0)
+   {
+      $("#pagedownBinding").removeClass("disabled");
+   }
+   else
+   {
+      $("#pagedownBinding").removeClass("disabled");
+      $("#pageupBinding").removeClass("disabled");
+   }
 }
 
 /**
  *This launches the tModel model div, upon return (and if not abprted), the contents of the div parameter will be replaced with the 
  *first selected tModel
  */
-function bindingModal(div, type){
+function bindingModal(div, type) {
    $(div).focus();
-    //reset the form in case it was lanucheed more than once per page view
-    reloadBindingModal();
-    
-    $.dialogBinding.confirm({
-        callback: function(success, result) {
-            if (!success)
-            {
+   //reset the form in case it was lanucheed more than once per page view
+   reloadBindingModal();
+
+   $.dialogBinding.confirm({
+      callback: function(success, result) {
+         if (!success)
+         {
             //  alert("aborted!");    
-            }
-                
-            else{
-                if (type=='val')
-                    $("#" + div).val(result[0]);
-                else if (type=='html')
-                    $("#" + div).html(result[0]);
-            }
-        //     return false;
-        }
-    });
+         }
+
+         else {
+            if (type == 'val')
+               $("#" + div).val(result[0]);
+            else if (type == 'html')
+               $("#" + div).html(result[0]);
+         }
+         //     return false;
+      }
+   });
 // return false;
 }
-            
-            
+
+
 function bindingCancel()
 {
-    $(".modalableBinding").each(function()
-    {
-        $(this).prop('checked', false);
-    }); 
-    $('#bindingChooser').modal('hide');
-                
+   $(".modalableBinding").each(function()
+   {
+      $(this).prop('checked', false);
+   });
+   $('#bindingChooser').modal('hide');
+
 }
-            
+
 /**
  *returns an array of selected tmodel keys
- */            
+ */
 $.dialogBinding = {
-    confirm: function(options) {
-        var $modal = $('#bindingChooser');
-        //$modal.find('.modal-body').text(options.message);
-        
-        $modal.off('click.dialog', '.btn, .close')
-        .off('hidden')
-        .on('click.dialog', '.btn, .close', function() {
-            $(this).addClass('modal-result');
-        }).on('hidden', function() {
-            var result = $(this).find('.modal-result').filter('.btn-primary').length > 0;
-            $(this).find('.modal-result').removeClass('modal-result');
-            /**
-                         * find the result from the model (the selected key)
-                         */
-            var selectedtmodels =  new Array();
-            $(".modalableBinding").each(function()
-            {
-                var id=$(this).attr("id");
-                if ($(this).is(':checked')) {
-                    selectedtmodels.push(
-                        id
-                        );
-                }
-            }); 
-            
-            options.callback(result ,selectedtmodels);
-        //  $modal.modal('hide');
-        });
-        //callback = options.callback;
-        
-        $modal.modal();
-    }        
+   confirm: function(options) {
+      var $modal = $('#bindingChooser');
+      //$modal.find('.modal-body').text(options.message);
+
+      $modal.off('click.dialog', '.btn, .close')
+              .off('hidden')
+              .on('click.dialog', '.btn, .close', function() {
+                 $(this).addClass('modal-result');
+              }).on('hidden', function() {
+         var result = $(this).find('.modal-result').filter('.btn-primary').length > 0;
+         $(this).find('.modal-result').removeClass('modal-result');
+         /**
+          * find the result from the model (the selected key)
+          */
+         var selectedtmodels = new Array();
+         $(".modalableBinding").each(function()
+         {
+            var id = $(this).attr("id");
+            if ($(this).is(':checked')) {
+               selectedtmodels.push(
+                       id
+                       );
+            }
+         });
+
+         options.callback(result, selectedtmodels);
+         //  $modal.modal('hide');
+      });
+      //callback = options.callback;
+
+      $modal.modal();
+   }
 };
 

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js Wed Jan 29 23:16:07 2014
@@ -7,176 +7,184 @@
 
 function reloadBusinessModal()
 {
-    var name=$("#nameBusiness").text();
-    RenderBusinessListBySearchModal(name, offsetBusiness, maxrecordsBusiness, true);
-                      
+   var name = $("#nameBusiness").text();
+   RenderBusinessListBySearchModal(name, offsetBusiness, maxrecordsBusiness, true);
+
 }
 
 
 
-var offsetBusiness=0; //start at the begining
-var maxrecordsBusiness=10;  //record 20 at a time
-var langBusiness="en";  //langauge english
-var totalrecordsBusiness=0;
+var offsetBusiness = 0; //start at the begining
+var maxrecordsBusiness = 10;  //record 20 at a time
+var langBusiness = "en";  //langauge english
+var totalrecordsBusiness = 0;
 
 RenderBusinessListBySearchModal('%', offsetBusiness, maxrecordsBusiness, true);
 
 function pagedownChooserBusiness()
 {
-    offsetBusiness = $("#offsetBusiness").text();
-    //alert(offset);
-    var newoffset = offsetBusiness - maxrecordsBusiness;
-    if (newoffset < 0)
-        return;
-    //alert(newoffset);
-    if (newoffset != offsetBusiness)
-        RenderBusinessListBySearchModal($("#nameBusiness").text(), newoffset, maxrecordsBusiness, true);
+   offsetBusiness = $("#offsetBusiness").text();
+   //alert(offset);
+   var newoffset = offsetBusiness - maxrecordsBusiness;
+   if (newoffset < 0)
+      return;
+   //alert(newoffset);
+   if (newoffset != offsetBusiness)
+      RenderBusinessListBySearchModal($("#nameBusiness").text(), newoffset, maxrecordsBusiness, true);
 }
 function pageupChooserBusiness()
 {
-    offsetBusiness = $("#offsetBusiness").text();
-    //alert(offset);
-    var fetch = maxrecordsBusiness;
-    if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness))  > totalrecordsBusiness)
-        //fetch = maxrecords - offset;
-        return;
-    else 
-        fetch = (parseInt(offsetBusiness) + parseInt(maxrecordsBusiness));    
-    //alert(fetch);
-    offsetBusiness = fetch;
-    RenderBusinessListBySearchModal($("#nameBusiness").text(), fetch, maxrecordsBusiness, true);
+   offsetBusiness = $("#offsetBusiness").text();
+   //alert(offset);
+   var fetch = maxrecordsBusiness;
+   if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness)) > totalrecordsBusiness)
+      //fetch = maxrecords - offset;
+      return;
+   else
+      fetch = (parseInt(offsetBusiness) + parseInt(maxrecordsBusiness));
+   //alert(fetch);
+   offsetBusiness = fetch;
+   RenderBusinessListBySearchModal($("#nameBusiness").text(), fetch, maxrecordsBusiness, true);
 }
 
 
-var selectedItemBusiness=null;
+var selectedItemBusiness = null;
 
 //offset, maxrecords, keyword
 function RenderBusinessListBySearchModal(keyword1, offset1, maxrecords1, isForChooser)
 {
-    if (keyword1 === "%")
-        keyword1 = "%25";
-    var lang = $("#langBusiness").text();
-    $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
-    var request=   $.ajax({
-        url: 'ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
-        type:"GET",
-        cache: false
-    });
-                  
-    request.done(function(msg) {
-        window.console && console.log('postback done ');                
-        $("#businesslist").html(msg);
-        
-    //refresh();
-    });
-
-    request.fail(function(jqXHR, textStatus) {
-        window.console && console.log('postback failed ');                                
-        $("#businesslist").html("An error occured! " + jqXHR.responseText + textStatus);
-    //refresh();
-    });
-/*
+
+   var lang = $("#lang_business").val();
+   var keyword2 = $("#name_business").val();
+   if (lang == undefined)
+      lang = "";
+   if (keyword2 == undefined)
+      keyword2 = "";
+   lang = encodeURIComponent(lang);
+   offset1 = encodeURIComponent(offset1);
+   maxrecords1 = encodeURIComponent(maxrecords1);
+   keyword2 = encodeURIComponent(keyword2);
+   $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+   var request = $.ajax({
+      url: 'ajax/businesssearch.jsp?keyword=' + keyword2 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
+      type: "GET",
+      cache: false
+   });
+
+   request.done(function(msg) {
+      window.console && console.log('postback done ');
+      $("#businesslist").html(msg);
+
+      //refresh();
+   });
+
+   request.fail(function(jqXHR, textStatus) {
+      window.console && console.log('postback failed ');
+      $("#businesslist").html("An error occured! " + jqXHR.responseText + textStatus);
+      //refresh();
+   });
+   /*
     $.get('ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang, function(data) {
-        $("#businesslist").html(data);
-        refresh();
+    $("#businesslist").html(data);
+    refresh();
     });*/
 }
 
 function refreshBusiness()
 {
-    var displayrecords = $("#displayrecords").text();
-    if (displayrecords == totalrecordsBusiness)
-    {
-        $("#pageupBusiness").addClass("disabled");
-        $("#pagedownBusiness").addClass("disabled");
-    }
-    else if (offsetBusiness + maxrecordsBusiness > totalrecordsBusiness)
-    {
-        $("#pageupBusiness").addClass("disabled");    
-    }
-    else if (offsetBusiness ==0)
-    {
-        $("#pagedownBusiness").removeClass("disabled");        
-    }
-    else
-    {
-        $("#pagedownBusiness").removeClass("disabled");        
-        $("#pageupBusiness").removeClass("disabled");        
-    }
+   var displayrecords = $("#displayrecords").text();
+   if (displayrecords == totalrecordsBusiness)
+   {
+      $("#pageupBusiness").addClass("disabled");
+      $("#pagedownBusiness").addClass("disabled");
+   }
+   else if (offsetBusiness + maxrecordsBusiness > totalrecordsBusiness)
+   {
+      $("#pageupBusiness").addClass("disabled");
+   }
+   else if (offsetBusiness == 0)
+   {
+      $("#pagedownBusiness").removeClass("disabled");
+   }
+   else
+   {
+      $("#pagedownBusiness").removeClass("disabled");
+      $("#pageupBusiness").removeClass("disabled");
+   }
 }
 
 /**
  *This launches the tModel model div, upon return (and if not abprted), the contents of the div parameter will be replaced with the 
  *first selected tModel
  */
-function businessModal(div){
+function businessModal(div) {
    $(div).focus();
-    //reset the form in case it was lanucheed more than once per page view
-    reloadBusinessModal();
-    
-    $.dialogBusiness.confirm({
-        callback: function(success, result) {
-            if (!success)
-            {
-              //  alert("aborted!");    
-            }
-                
-            else{
-               // alert('Result: ' + result.join());
-                $("#" + div).html(result[0]);
-            }
-       //     return false;
-        }
-    });
+   //reset the form in case it was lanucheed more than once per page view
+   reloadBusinessModal();
+
+   $.dialogBusiness.confirm({
+      callback: function(success, result) {
+         if (!success)
+         {
+            //  alert("aborted!");    
+         }
+
+         else {
+            // alert('Result: ' + result.join());
+            $("#" + div).html(result[0]);
+         }
+         //     return false;
+      }
+   });
    // return false;
 }
-            
-            
+
+
 function businessCancel()
 {
-    $(".modalableBusinessChooser").each(function()
-    {
-        $(this).prop('checked', false);
-    }); 
-    $('#businessChooser').modal('hide');
-                
+   $(".modalableBusinessChooser").each(function()
+   {
+      $(this).prop('checked', false);
+   });
+   $('#businessChooser').modal('hide');
+
 }
-            
+
 /**
  *returns an array of selected tmodel keys
- */            
+ */
 $.dialogBusiness = {
-    confirm: function(options) {
-        var $modal = $('#businessChooser');
-        //$modal.find('.modal-body').text(options.message);
-        
-        $modal.off('click.dialog', '.btn, .close')
-        .off('hidden')
-        .on('click.dialog', '.btn, .close', function() {
-            $(this).addClass('modal-result');
-        }).on('hidden', function() {
-            var result = $(this).find('.modal-result').filter('.btn-primary').length > 0;
-            $(this).find('.modal-result').removeClass('modal-result');
-            /**
-                         * find the result from the model (the selected key)
-                         */
-            var selectedtmodels =  new Array();
-            $(".modalableBusinessChooser").each(function()
-            {
-                var id=$(this).attr("id");
-                if ($(this).is(':checked')) {
-                    selectedtmodels.push(
-                        id
-                        );
-                }
-            }); 
-            
-            options.callback(result ,selectedtmodels);
-        //  $modal.modal('hide');
-        });
-        //callback = options.callback;
-        
-        $modal.modal();
-    }        
+   confirm: function(options) {
+      var $modal = $('#businessChooser');
+      //$modal.find('.modal-body').text(options.message);
+
+      $modal.off('click.dialog', '.btn, .close')
+              .off('hidden')
+              .on('click.dialog', '.btn, .close', function() {
+                 $(this).addClass('modal-result');
+              }).on('hidden', function() {
+         var result = $(this).find('.modal-result').filter('.btn-primary').length > 0;
+         $(this).find('.modal-result').removeClass('modal-result');
+         /**
+          * find the result from the model (the selected key)
+          */
+         var selectedtmodels = new Array();
+         $(".modalableBusinessChooser").each(function()
+         {
+            var id = $(this).attr("id");
+            if ($(this).is(':checked')) {
+               selectedtmodels.push(
+                       id
+                       );
+            }
+         });
+
+         options.callback(result, selectedtmodels);
+         //  $modal.modal('hide');
+      });
+      //callback = options.callback;
+
+      $modal.modal();
+   }
 };
 

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businesssearch.js Wed Jan 29 23:16:07 2014
@@ -55,12 +55,20 @@ function pageupBusiness()
 //offset, maxrecords, keyword
 function RenderBusinessListBySearch(keyword1, offset1, maxrecords1)
 {
-    if (keyword1 === "%")
-        keyword1 = "%25";
-    var lang = $("#lang").text();
+   var    keyword =$("#name_business").val();
+    var lang = $("#lang_business").text();
+    if (lang==undefined)
+       lang = "";
+    if (keyword==undefined)
+       keyword = "";
+    lang = encodeURIComponent(lang);
+    keyword = encodeURIComponent(keyword);
+    offset1 = encodeURIComponent(offset1);
+    maxrecords1 = encodeURIComponent(maxrecords1);
+    
     $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
     var request=   $.ajax({
-        url: 'ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang,
+        url: 'ajax/businesssearch.jsp?keyword=' + keyword + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang,
         type:"GET",
         cache: false
     });

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/main.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/main.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/main.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/main.js Wed Jan 29 23:16:07 2014
@@ -111,7 +111,8 @@ function RefreshLoginPage()
 //source http://totaldev.com/content/escaping-characters-get-valid-jquery-id
 function jqSelector(str)
 {
-    return str.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+    return str.replace(/([ #;?&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+    //return str.replace(/([ #;?&,.+*~\':"!^$[\]()=>|\/@])/g,'\\$1');
 }
 
 function ShowServicesByBusinessKey(bizid)
@@ -124,7 +125,7 @@ function ShowServicesByBusinessKey(bizid
     });
 
     request.done(function(msg) {
-        window.console && console.log(msg);
+//        window.console && console.log(msg);
         window.console && console.log('postback done to div ' + bizid);
         $("#" + jqSelector(bizid)).html(msg);
         //refresh();

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceBrowse.js Wed Jan 29 23:16:07 2014
@@ -26,7 +26,7 @@ function refreshServiceList()
 RenderServiceListBySearch('%', offsetService, maxrecordsService);
 //offset += maxrecords;
 function pagedownService()
-{
+{                                            
     offsetService = $("#offsetService").text();
     //alert(offset);
     var newoffset = offsetService - maxrecordsService;
@@ -53,12 +53,20 @@ function pageupService()
 
 function RenderServiceListBySearch(keyword, offset, maxrecords)
 {
-    if (keyword === "%")
-        keyword = "%25";
-    var lang = $("#lang").text();
+    var    keyword2 = $("#name_service_search").val();
+   
+    var lang = $("#lang_service_search").val();
+    if (lang==undefined)
+       lang="";
+     if (keyword2==undefined)
+       keyword2="";
+    lang = encodeURIComponent(lang);
+    offset = encodeURIComponent(offset);
+    maxrecords = encodeURIComponent(maxrecords);
+    keyword2 = encodeURIComponent(keyword2);
     $("#serviceBrowserListing").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
     var request=   $.ajax({
-        url: 'ajax/servicesearch.jsp?keyword=' + keyword + "&offset=" + offset + "&maxrecords=" + maxrecords + "&lang=" + lang,
+        url: 'ajax/servicesearch.jsp?keyword=' + keyword2 + "&offset=" + offset + "&maxrecords=" + maxrecords + "&lang=" + lang,
         type:"GET",
         cache: false
     });



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


Mime
View raw message