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 2014/02/09 22:52:04 UTC
svn commit: r1566437 - in /juddi/trunk:
juddi-core/src/main/resources/juddi_install_data/
juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/
juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/
juddi-gui/src/main/resources/org/apache/juddi/web...
Author: alexoree
Date: Sun Feb 9 21:52:04 2014
New Revision: 1566437
URL: http://svn.apache.org/r1566437
Log:
JUDDI-821 adding canned items for all referable items, additional baseline tmodels
JUDDI-806 updated signer applet for binding types, added delete binding functions
Added:
juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
- copied, changed from r1566211, juddi/trunk/juddi-gui/src/main/webapp/ajax/savebinding.jsp
Modified:
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.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/bindingEditor.jsp
juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js
juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AccessPoint.java
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=1566437&r1=1566436&r2=1566437&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 Sun Feb 9 21:52:04 2014
@@ -254,13 +254,38 @@
<keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
</categoryBag>
</tModel>
+
+ <tModel tModelKey="uddi:uddi.org:identifier:taxid">
+ <name>Tax ID</name>
+ <description>The Tax Identifier for this business
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc515847032
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:identifier" keyValue="identifier" 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:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+
+ <keyedReference keyName="entityKeyValues" keyValue="businessKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+
+ <keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ </categoryBag>
+ </tModel>
+
+
<tModel tModelKey="uddi:uddi.org:categorization:validatedby">
<name>uddi-org:validatedBy</name>
- <description>Category system used to point a value set or
+ <description xml:lang="en">Category system used to point a value set or
category
group system tModel to associated value set Web service
implementations.
</description>
+ <description xml:lang="en">This is typically used on tModels to validate tModel Instances via the Value Set Validation service. The keyValue
+ should be an existing binding key pointing to that service.
+ </description>
<overviewDoc>
<overviewURL useType="text">
http://uddi.org/pubs/uddi_v3.htm#validatedBy
@@ -1371,7 +1396,47 @@
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:ubr:categorizationGroup:wgs84">
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:unspsc_geo3166">
+ <name>United Nations Standard Products and Services Code with ISO 3166 Grouping</name>
+ <description xml:lang="en">Grouping of the category systems for UNSPSC and ISO 3166. As a consequence, keyedReferenceGroups that reference this tModel describe countries or regions where a product category is offered.</description>
+ <overviewDoc>
+ <overviewURL>
+ http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc535251470
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL>
+ http://www.unspsc.org/
+ </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"/>
+ </categoryBag>
+ </tModel>
+
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:keygenerator">
+ <name>World Geodetic System Key Generator</name>
+ <description xml:lang="en">Key Generator for Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84">
<name>World Geodetic System</name>
<description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
<overviewDoc>
@@ -1384,6 +1449,49 @@
</categoryBag>
</tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:latitude">
+ <name>WGS Latitude</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:longitude">
+ <name>WGS Longitude</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="org:ubr:categorization:geo_precision">
+ <name xml:lang="en">WGS Geographic Precision</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+
+
<tModel tModelKey="uddi:uddi.org:ubr:keygenerator">
<name>Universal Business Registry Key Generator</name>
<description>UBR domain key generator</description>
@@ -1485,13 +1593,19 @@
</tModel>
<tModel tModelKey="uddi:uddi.org:ubr:categorization:unspsc">
- <name>UBR Categorization Unspecified</name>
- <description xml:lang="en">Unspecified Categorization in a UBR</description>
+ <name>UBR Categorization United Nations Standard Products and Services Code</name>
+ <description xml:lang="en">UNSPSC Categorization in a UBR</description>
<overviewDoc>
<overviewURL useType="text">
http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
</overviewURL>
</overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://www.unspsc.org/
+ </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"/>
Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml Sun Feb 9 21:52:04 2014
@@ -48,7 +48,7 @@ See below for other fields that you may
<discoveryURL useType="homepage">${juddi.server.baseurl}</discoveryURL>
</discoveryURLs>
<categoryBag>
- <keyedReference tModelKey="uddi:uddi.org:categorization:nodes" keyValue="node" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:nodes" keyValue="node" keyName="uddi.org:categorization:nodes"/>
</categoryBag>
<businessServices>
<!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
Modified: juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java (original)
+++ juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java Sun Feb 9 21:52:04 2014
@@ -501,7 +501,7 @@ public class XmlSigApplet2 extends java.
} catch (Exception ex) {
}
}
- if (objecttype.equalsIgnoreCase("binding")) {
+ if (objecttype.equalsIgnoreCase("bindingTemplate")) {
try {
StringReader sr = new StringReader(xml.trim());
j = (BindingTemplate) JAXB.unmarshal(sr, BindingTemplate.class);
@@ -558,6 +558,7 @@ public class XmlSigApplet2 extends java.
signedXml = "Sorry I couldn't sign the data. " + ex.getMessage();
}
} else {
+ error=true;
signedXml = "Unable to determine which type of object that we're signing";
}
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=1566437&r1=1566436&r2=1566437&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 Sun Feb 9 21:52:04 2014
@@ -947,7 +947,7 @@ public class UddiHub implements Serializ
if (isExceptionExpiration(ex)) {
token = null;
sb.setAuthInfo(GetToken());
- publish.saveBinding(sb);
+ saveBinding = publish.saveBinding(sb);
} else {
throw ex;
@@ -1165,6 +1165,34 @@ public class UddiHub implements Serializ
return "<div class=\"alert alert-error\"><i class=\"icon-warning-sign icon-large\"></i> " + HandleException + "</div>";
}
+ private String deleteBinding(List<String> serviceId) {
+
+ if (serviceId == null || serviceId.isEmpty()) {
+ return ResourceLoader.GetResource(session, "errors.noinput");
+ }
+ DeleteBinding db = new DeleteBinding();
+ db.setAuthInfo(GetToken());
+ db.getBindingKey().addAll(serviceId);
+ try {
+ try {
+ publish.deleteBinding(db);
+ } catch (Exception ex) {
+ if (isExceptionExpiration(ex)) {
+ token = null;
+ db.setAuthInfo(GetToken());
+ publish.deleteBinding(db);
+
+ } else {
+ throw ex;
+ }
+ }
+ } catch (Exception ex) {
+ return HandleException(ex);
+ }
+ return ResourceLoader.GetResource(session, "actions.delete.binding");
+
+ }
+
/**
* AuthStyles for the Hub to use, default is UDDI_AUTH
*/
@@ -3882,4 +3910,14 @@ public class UddiHub implements Serializ
//JAXB.marshal(be, System.out);
return SaveBindingTemplate(be);
}
+
+ public String deleteBinding(String id){
+
+ if (id == null || id.length() == 0) {
+ return ResourceLoader.GetResource(session, "errors.noinput");
+ }
+ List<String> x = new ArrayList<String>();
+ x.add(id.trim());
+ return deleteBinding(x);
+ }
}
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=1566437&r1=1566436&r2=1566437&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 Sun Feb 9 21:52:04 2014
@@ -408,3 +408,4 @@ errors.subscription.alerttypeinvalid=The
errors.subscription.alertcriteriainvalid=The alert type criteria is invalid. Make sure at least one of the search item buttons is highlighted in Step 2.
errors.subscription.relatedbiz=Related Business is not supported for single item subscriptions.
pages.bindingeditor.title=Binding Editor
+actions.delete.binding=Binding deleted successfully.
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=1566437&r1=1566436&r2=1566437&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 Sun Feb 9 21:52:04 2014
@@ -411,3 +411,4 @@ errors.subscription.alerttypeinvalid=El
errors.subscription.alertcriteriainvalid=El criterio del tipo de alerta es v\u00e1lida. Aseg\u00farese de que al menos uno de los botones de elemento de b\u00fasqueda se resalta en el Paso 2.
errors.subscription.relatedbiz=Empresas relacionadas no se admite para las suscripciones de un solo art\u00edculo.
pages.bindingeditor.title=Encuadernaci\u00f3n Editor
+actions.delete.binding=Encuadernaci\u00f3n eliminado correctamente.
Copied: juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebinding.jsp (from r1566211, juddi/trunk/juddi-gui/src/main/webapp/ajax/savebinding.jsp)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebinding.jsp?p2=juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebinding.jsp&p1=juddi/trunk/juddi-gui/src/main/webapp/ajax/savebinding.jsp&r1=1566211&r2=1566437&rev=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/savebinding.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebinding.jsp Sun Feb 9 21:52:04 2014
@@ -12,7 +12,7 @@
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, request.getSession());
- String msg = (x.SaveBindingTemplate(request));
+ String msg = (x.deleteBinding(request.getParameter("id")));
if (msg.contains(ResourceLoader.GetResource(session, "errors.generic"))) {
response.setStatus(406);
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/bindingEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/bindingEditor.jsp?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/bindingEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/bindingEditor.jsp Sun Feb 9 21:52:04 2014
@@ -72,7 +72,7 @@
%>
<%@include file="header-top.jsp" %>
<div class="container">
-
+ <script type="text/javascript" src="js/bindingeditor.js"></script>
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.bindingeditor.title")%></h1>
@@ -246,6 +246,9 @@
<br><br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefcats")%>:</b><br>
<a href="javascript:AddCategoryKeyReference();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%> <Br>
+
+ <%@include file="quickref_catbag.jsp" %>
+
<div id="catContainer" style="border-width: 2px; border-style: solid;" >
<%
if (bd.getCategoryBag() == null) {
@@ -271,8 +274,9 @@
<br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefgroup")%></b><br>
<a href="javascript:AddCategoryKeyReferenceGroup();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefgroup.add")%><br>
+ <%@include file="quickref_krgrp.jsp" %>
<div id="catContainerGrp" style="border-width: 2px; border-style: solid;" >
-
+
<%
//div count good so far
@@ -349,6 +353,9 @@
<div class="tab-pane" id="instanceinfo">
<b><%=ResourceLoader.GetResource(session, "items.tmodelinstance.info")%></b> - <%=ResourceLoader.GetResource(session, "items.tmodelinstance.info.desc")%> <br>
<a href="javascript:AddTmodelInstance('<%=PostBackConstants.TMODELINSTANCE%>');"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.tmodelinstance.add")%><br>
+
+ <%@include file="quickref_tmodelinstance.jsp" %>
+
<div id="<%=PostBackConstants.TMODELINSTANCE%>" >
<%
if (bd.getTModelInstanceDetails() != null) {
@@ -549,7 +556,7 @@
if (!newitem) {
%>
-
+|
<a class="btn btn-danger " href="javascript:deleteBinding();"><i class="icon-trash icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
<a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getBindingKey(), "UTF-8")%>&type=bindingTemplate"><i class="icon-pencil icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
<a class="btn btn-info " href="editSubscription.jsp?bindingTemplate=<%=URLEncoder.encode(bd.getBindingKey(), "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
@@ -671,6 +678,38 @@
}
function deleteBinding() {
+ var url = 'ajax/deletebinding.jsp';
+ var postbackdata = new Array();
+ postbackdata.push({
+ name: "id",
+ value: $("#" + "<%=PostBackConstants.BINDINGKEY%>").text()
+ });
+
+ postbackdata.push({
+ name: "nonce",
+ value: $("#nonce").val()
+ });
+
+ var request = $.ajax({
+ url: url,
+ type: "POST",
+ // data" + i18n_type + ": "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
</script>
Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Sun Feb 9 21:52:04 2014
@@ -373,6 +373,7 @@
<br><br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefcats")%>:</b><br>
<a href="javascript:AddCategoryKeyReference();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%> <Br>
+ <%@include file="quickref_catbag.jsp" %>
<div id="catContainer" style="border-width: 2px; border-style: solid;" >
@@ -402,6 +403,7 @@
<br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefgroup")%>:</b><br>
<a href="javascript:AddCategoryKeyReferenceGroup();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefgroup.add")%><br>
+ <%@include file="quickref_krgrp.jsp" %>
<div id="catContainerGrp" style="border-width: 2px; border-style: solid;" >
@@ -448,6 +450,7 @@
<Br>
<a href="javascript:AddIdentKeyReference();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%> <Br>
+ <%@include file="quickref_ident.jsp" %>
<div id="identContainer" style="border-width: 2px; border-style: solid;" >
<%
for (int i = 0; i < bd.getIdentifierBag().getKeyedReference().size(); i++) {
@@ -464,7 +467,9 @@
out.write("</div>");
}
%>
+
</div>
+ <br><br>
</div>
<div class="tab-pane " id="services">
<b><%=ResourceLoader.GetResource(session, "pages.businesseditor.businesslist")%> </b>-
Modified: juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Sun Feb 9 21:52:04 2014
@@ -66,6 +66,9 @@
padding-top: 60px;
padding-bottom: 40px;
}
+ .tab-content {
+ overflow: visible;
+ }
</style>
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
<link href="css/bootstrap-modal.css" rel="stylesheet">
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js Sun Feb 9 21:52:04 2014
@@ -246,6 +246,25 @@ function AddContactAddressLine(contactid
}
+function AddCategoryKeyReferenceParam(tmodelkey, keyname, keyvalue)
+{
+ currentcatkeyref++;
+ var i=currentcatkeyref;
+
+ $("<div id=\"catbagkeyref" + i + "\" style=\"border-width:1px; border-style:solid\">"+
+ "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
+ "<div style=\"float:left\">" + i18n_key +" (<a href=\"javascript:tModelModal('catbagkeyref" + i + "Value')\" ><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div>"
+ + "<div class=\"edit\" id=\"catbagkeyref" + i + "Value\">" + tmodelkey + "</div>"
+ +"<div style=\"float:left\">" + i18n_name + ": </div>"
+ + "<div class=\"edit\" id=\"catbagkeyref" + i + "KeyName\">" + keyname + "</div>"
+ +"<div style=\"float:left\">" + i18n_value + ": </div>"
+ + "<div class=\"edit\" id=\"catbagkeyref" + i + "KeyValue\">" + keyvalue + "</div>"
+ +"</div>").appendTo("#catContainer");
+ Reedit();
+}
+
+
+
function AddCategoryKeyReference()
{
currentcatkeyref++;
@@ -283,6 +302,49 @@ function AddCategoryKeyReferenceGroup()
+"</div>").appendTo("#catContainerGrp");
Reedit();
}
+
+
+function AddCategoryKeyReferenceGroupParam(tmodelkey)
+{
+ currentcatkeyrefgrp++;
+ var i=currentcatkeyrefgrp;
+
+ $("<div id=\"catbaggrpkeyref" + i + "\" style=\"border-width:2px; border-style:solid\">"+
+ "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
+ "<div style=\"float:left\">" + i18n_key + " (<a href=\"javascript:tModelModal('catbaggrpkeyref" + i + "Value')\"><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div>"
+ + "<div class=\"edit\" id=\"catbaggrpkeyref" + i + "Value\">" + tmodelkey + "</div>"
+
+ + "<div id=\"catbaggrpkeyref" + i + "keyref\" style=\"border-width:1px; border-style:solid\">"
+ + "<div style=\"float:left;height:100%\"><a href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('catbaggrpkeyref" + i + "');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
+
+ +i18n_addrefcat
+ + "</div>"
+
+ +"</div>").appendTo("#catContainerGrp");
+ Reedit();
+ return "catbaggrpkeyref"+i;
+}
+
+function AddWGS1894(){
+ var div=AddCategoryKeyReferenceGroupParam("uddi:uddi.org:ubr:categorizationGroup:wgs84");
+ AddCategoryKeyReferenceGroupKeyRef(div, "uddi:uddi.org:ubr:categorizationGroup:wgs84:latitude",
+ "WGS 84 Latitude", "0.0");
+ AddCategoryKeyReferenceGroupKeyRef(div, "uddi:uddi.org:ubr:categorizationGroup:wgs84:longitude",
+ "WGS 84 Longitude", "0.0");
+ AddCategoryKeyReferenceGroupKeyRef(div, "uddi:uddi.org:ubr:categorization:geo_precision",
+ "Center of Street", "0900");
+}
+
+function AddISO3166UNSPSC(){
+ var div=AddCategoryKeyReferenceGroupParam("uddi:uddi.org:ubr:categorizationgroup:unspsc_geo3166");
+ AddCategoryKeyReferenceGroupKeyRef(div, "uddi:uddi.org:ubr:categorization:unspsc",
+ "UNSPSC:", "0.0");
+ AddCategoryKeyReferenceGroupKeyRef(div, "uddi:uddi.org:ubr:categorization:iso3166",
+ "GEO:United States", "US");
+}
+
+
+
var currentcatkeyrefgrpitems=0;
function AddCategoryKeyReferenceGroupKeyRef(div)
{
@@ -302,6 +364,28 @@ function AddCategoryKeyReferenceGroupKey
+"</div>").appendTo("#" + div);
Reedit();
}
+
+
+function AddCategoryKeyReferenceGroupKeyRef(div, tmodelkey, keyname, keyval)
+{
+ var i=currentcatkeyrefgrp;
+ currentcatkeyrefgrpitems++;
+ var k=currentcatkeyrefgrpitems;
+
+ $("<div id=\"" + div + "keyref" + k + "\" style=\"border-width:1px; border-style:solid\">"+
+ "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + div + "keyref" + k+
+ "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
+ "<div style=\"float:left\">" + i18n_key + " (<a href=\"javascript:tModelModal('" + div +"keyref" + k+ "Value')\"><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div>"
+ + "<div class=\"edit\" id=\"" + div +"keyref" + k+ "Value\">" + tmodelkey + "</div>"
+ +"<div style=\"float:left\">" + i18n_name + ": </div>"
+ + "<div class=\"edit\" id=\"" + div +"keyref" + k+ "KeyName\">" + keyname + "</div>"
+ +"<div style=\"float:left\">" + i18n_value + ": </div>"
+ + "<div class=\"edit\" id=\""+ div +"keyref" + k+ "KeyValue\">" + keyval + "</div>"
+ +"</div>").appendTo("#" + div);
+ Reedit();
+}
+
+
function AddIdentKeyReference()
{
currentident++;
@@ -319,6 +403,23 @@ function AddIdentKeyReference()
Reedit();
}
+function AddIdentKeyReferenceParam(tmodelkey, keyname, keyvalue)
+{
+ currentident++;
+ var i=currentident;
+
+ $("<div id=\"identbagkeyref" + i + "\" style=\"border-width:1px; border-style:solid\">"+
+ "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('identbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
+ "<div style=\"float:left\">" + i18n_key + " (<a href=\"javascript:tModelModal('identbagkeyref" + i + "Value')\"><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div>"
+ + "<div class=\"edit\" id=\"identbagkeyref" + i + "Value\">" + tmodelkey + "</div>"
+ +"<div style=\"float:left\">" + i18n_name + ": </div>"
+ + "<div class=\"edit\" id=\"identbagkeyref" + i + "KeyName\">" + keyname + "</div>"
+ +"<div style=\"float:left\">" + i18n_value + ": </div>"
+ + "<div class=\"edit\" id=\"identbagkeyref" + i + "KeyValue\">"+keyvalue+"</div>"
+ +"</div>").insertAfter("#identContainer");
+ Reedit();
+}
+
function RemoveName(id)
{
var x=$("#" + id).remove();
Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Sun Feb 9 21:52:04 2014
@@ -273,6 +273,7 @@
<br><br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefcats")%>:</b><br>
<a href="javascript:AddCategoryKeyReference();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%> <Br>
+ <%@include file="quickref_catbag.jsp" %>
<div id="catContainer" style="border-width: 2px; border-style: solid;" >
<%
if (bd.getCategoryBag() == null) {
@@ -298,6 +299,7 @@
<br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefgroup")%></b><br>
<a href="javascript:AddCategoryKeyReferenceGroup();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefgroup.add")%><br>
+ <%@include file="quickref_krgrp.jsp" %>
<div id="catContainerGrp" style="border-width: 2px; border-style: solid;" >
Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Sun Feb 9 21:52:04 2014
@@ -245,6 +245,7 @@
<b><%=ResourceLoader.GetResource(session, "items.keyrefcats")%>:</b><br>
<a href="javascript:AddCategoryKeyReference();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%> <Br>
+ <%@include file="quickref_catbag.jsp" %>
<div id="catContainer" style="border-width: 2px; border-style: solid;" >
<%
if (bd.getCategoryBag() == null) {
@@ -271,6 +272,7 @@
<br>
<b><%=ResourceLoader.GetResource(session, "items.keyrefgroup")%>:</b><br>
<a href="javascript:AddCategoryKeyReferenceGroup();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefgroup.add")%><br>
+ <%@include file="quickref_krgrp.jsp" %>
<div id="catContainerGrp" style="border-width: 2px; border-style: solid;" >
@@ -315,6 +317,7 @@
<div class="tab-pane " id="identifiers">
<b><%=ResourceLoader.GetResource(session, "items.identifiers")%></b> - <%=ResourceLoader.GetResource(session, "items.identifiers.description")%><Br>
<a href="javascript:AddIdentKeyReference();"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%><Br>
+ <%@include file="quickref_ident.jsp" %>
<div id="identContainer" style="border-width: 2px; border-style: solid;" >
<%
if (bd.getIdentifierBag() == null) {
Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AccessPoint.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AccessPoint.java?rev=1566437&r1=1566436&r2=1566437&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AccessPoint.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/AccessPoint.java Sun Feb 9 21:52:04 2014
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
+import org.apache.juddi.api_v3.AccessPointType;
/**
@@ -365,7 +366,7 @@ public class AccessPoint implements Seri
* @param value
* allowed object is
* {@link String }
- *
+ * @see AccessPointType for spec defined values
*/
public void setValue(String value) {
this.value = value;
@@ -378,6 +379,7 @@ public class AccessPoint implements Seri
* possible object is
* {@link String }
*
+ * @see AccessPointType for spec defined values
*/
public String getUseType() {
if (useType == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org