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/01/30 00:16:08 UTC
svn commit: r1562631 [2/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...
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js Wed Jan 29 23:16:07 2014
@@ -8,176 +8,187 @@
function reloadServiceModal()
{
// var name=$("#nameService").text();
- RenderServiceListBySearchModal('%', offsetService, maxrecordsService, true);
-
+ RenderServiceListBySearchModal('%', offsetService, maxrecordsService, true);
+
}
-var offsetService=0; //start at the begining
-var maxrecordsService=10; //record 20 at a time
-var langService="en"; //langauge english
-var totalrecordsService=0;
+var offsetService = 0; //start at the begining
+var maxrecordsService = 10; //record 20 at a time
+var langService = "en"; //langauge english
+var totalrecordsService = 0;
RenderServiceListBySearchModal('%', offsetService, maxrecordsService, true);
function pagedownChooserService()
{
- offsetService = $("#offsetService").text();
- //alert(offset);
- var newoffset = offsetService - maxrecordsService;
- if (newoffset < 0)
- return;
- //alert(newoffset);
- if (newoffset != offsetService)
- RenderServiceListBySearchModal($("#nameService").text(), newoffset, maxrecordsService, true);
+ offsetService = $("#offsetService").text();
+ //alert(offset);
+ var newoffset = offsetService - maxrecordsService;
+ if (newoffset < 0)
+ return;
+ //alert(newoffset);
+ if (newoffset != offsetService)
+ RenderServiceListBySearchModal($("#nameService").text(), newoffset, maxrecordsService, true);
}
function pageupChooserService()
{
- offsetService = $("#offsetService").text();
- //alert(offset);
- var fetch = maxrecordsService;
- if ((parseInt(offsetService) + parseInt(maxrecordsService)) > totalrecordsService)
- //fetch = maxrecords - offset;
- return;
- else
- fetch = (parseInt(offsetService) + parseInt(maxrecordsService));
- //alert(fetch);
- offsetService = fetch;
- RenderServiceListBySearchModal($("#nameService").text(), fetch, maxrecordsService, true);
+ offsetService = $("#offsetService").text();
+ //alert(offset);
+ var fetch = maxrecordsService;
+ if ((parseInt(offsetService) + parseInt(maxrecordsService)) > totalrecordsService)
+ //fetch = maxrecords - offset;
+ return;
+ else
+ fetch = (parseInt(offsetService) + parseInt(maxrecordsService));
+ //alert(fetch);
+ offsetService = fetch;
+ RenderServiceListBySearchModal($("#nameService").text(), fetch, maxrecordsService, true);
}
-var selectedItemService=null;
+var selectedItemService = null;
//offset, maxrecords, keyword
function RenderServiceListBySearchModal(keyword1, offset1, maxrecords1, isForChooser)
{
- if (keyword1 === "%")
- keyword1 = "%25";
- var lang = $("#langService").text();
- $("#servicelist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
- var fq = "approximateMatch";
- var request= $.ajax({
- url: 'ajax/servicesearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser + "&findqualifier=" + fq,
- type:"GET",
- cache: false
- });
-
- request.done(function(msg) {
- window.console && console.log('postback done ');
- $("#servicelist").html(msg);
-
- //refresh();
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ');
- $("#servicelist").html("An error occured! " + jqXHR.responseText + textStatus);
- //refresh();
- });
-/*
+ //if (keyword1 === "%")
+ // keyword1 = "%25";
+
+ var keyword = $("#name_Service").val();
+ var lang = $("#lang_Service").val();
+ if (lang == undefined)
+ lang = "";
+ if (keyword == undefined)
+ keyword = "";
+ lang = encodeURIComponent(lang);
+ offset1 = encodeURIComponent(offset1);
+ maxrecords1 = encodeURIComponent(maxrecords1);
+ keyword = encodeURIComponent(keyword);
+ isForChooser = encodeURIComponent(isForChooser);
+ $("#servicelist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+ var fq = "approximateMatch";
+ var request = $.ajax({
+ url: 'ajax/servicesearch.jsp?keyword=' + keyword + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser + "&findqualifier=" + fq,
+ type: "GET",
+ cache: false
+ });
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ');
+ $("#servicelist").html(msg);
+
+ //refresh();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ');
+ $("#servicelist").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 refreshService()
{
- var displayrecords = $("#displayrecords").text();
- if (displayrecords == totalrecordsService)
- {
- $("#pageupService").addClass("disabled");
- $("#pagedownService").addClass("disabled");
- }
- else if (offsetService + maxrecordsService > totalrecordsService)
- {
- $("#pageupService").addClass("disabled");
- }
- else if (offsetService ==0)
- {
- $("#pagedownService").removeClass("disabled");
- }
- else
- {
- $("#pagedownService").removeClass("disabled");
- $("#pageupService").removeClass("disabled");
- }
+ var displayrecords = $("#displayrecords").text();
+ if (displayrecords == totalrecordsService)
+ {
+ $("#pageupService").addClass("disabled");
+ $("#pagedownService").addClass("disabled");
+ }
+ else if (offsetService + maxrecordsService > totalrecordsService)
+ {
+ $("#pageupService").addClass("disabled");
+ }
+ else if (offsetService == 0)
+ {
+ $("#pagedownService").removeClass("disabled");
+ }
+ else
+ {
+ $("#pagedownService").removeClass("disabled");
+ $("#pageupService").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 serviceModal(div){
+function serviceModal(div) {
$(div).focus();
- //reset the form in case it was lanucheed more than once per page view
- reloadServiceModal();
-
- $.dialogService.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
+ reloadServiceModal();
+
+ $.dialogService.confirm({
+ callback: function(success, result) {
+ if (!success)
+ {
+ // alert("aborted!");
+ }
+
+ else {
+ // alert('Result: ' + result.join());
+ $("#" + div).html(result[0]);
+ }
+ // return false;
+ }
+ });
// return false;
}
-
-
+
+
function serviceCancel()
{
- $(".modalableServiceChooser").each(function()
- {
- $(this).prop('checked', false);
- });
- $('#serviceChooser').modal('hide');
-
+ $(".modalableServiceChooser").each(function()
+ {
+ $(this).prop('checked', false);
+ });
+ $('#serviceChooser').modal('hide');
+
}
-
+
/**
*returns an array of selected tmodel keys
- */
+ */
$.dialogService = {
- confirm: function(options) {
- var $modal = $('#serviceChooser');
- //$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();
- $(".modalableServiceChooser").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 = $('#serviceChooser');
+ //$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();
+ $(".modalableServiceChooser").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/tmodelsearch.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/tmodelsearch.js Wed Jan 29 23:16:07 2014
@@ -63,12 +63,21 @@ var selectedItem=null;
//offset, maxrecords, keyword
function RenderTmodelListBySearch(keyword1, offset1, maxrecords1, isForChooser)
{
- if (keyword1 === "%")
- keyword1 = "%25";
- var lang = $("#lang").text();
+
+ var keyword =$("#name_tmodel").val();
+ var lang = $("#lang_tmodel").val();
+ if (lang==undefined)
+ lang = "";
+ if (keyword==undefined)
+ keyword = "";
+ lang = encodeURIComponent(lang);
+ keyword = encodeURIComponent(keyword);
+ offset1 = encodeURIComponent(offset1);
+ maxrecords1 = encodeURIComponent(maxrecords1);
+ isForChooser = encodeURIComponent(isForChooser);
$("#tmodellist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
var request= $.ajax({
- url: 'ajax/tmodelsearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
+ url: 'ajax/tmodelsearch.jsp?keyword=' + keyword + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
type:"GET",
cache: false
});
Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp Wed Jan 29 23:16:07 2014
@@ -10,43 +10,53 @@
<%@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.services")%></h1>
- </div>
-
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <div id="businesslist">
- <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsService"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsService"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetService">0</span><br>
- <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
-
- <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageupService"></i></a>
- <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
- <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedownService"></i></a>
-
- <div id="serviceBrowserListings">
- <img src="img/bigrollergreen.gif" title="Loading"/>
- </div>
- <script src="js/serviceBrowse.js"></script>
- <script type="text/javascript">
-
- $('.edit').editable(function(value, settings) {
- console.log(this);
- console.log(value);
- console.log(settings);
- RenderServiceListBySearch('%', offset, maxrecords);
- return(value);
- }, {
- type : 'text',
- submit : i18n_ok
- });
- </script>
+ <!-- Main hero unit for a primary marketing message or call to action -->
+ <div class="well" >
+ <h1><%=ResourceLoader.GetResource(session, "navbar.services")%></h1>
+ </div>
+
+ <!-- Example row of columns -->
+ <div class="row">
+ <div class="span12" >
+ <div id="businesslist">
+ <table class="table-striped table-bordered">
+ <tr><td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsService"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsService"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetService">0</span></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_service_search" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_service_search" value=""></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageupService"></i></a>
+ <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
+ <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedownService"></i></a>
+
+ <div id="serviceBrowserListings">
+ <img src="img/bigrollergreen.gif" title="Loading"/>
</div>
+ <script src="js/serviceBrowse.js"></script>
+ <script type="text/javascript">
+
+ $('.edit').editable(function(value, settings) {
+ window.console && console.log(value + this + settings);
+ RenderServiceListBySearch('%', offset, maxrecords);
+ return(value);
+ }, {
+ type: 'text',
+ submit: i18n_ok
+ });
+ </script>
+ </div>
- </div>
- </div>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ </div>
+ </div>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp Wed Jan 29 23:16:07 2014
@@ -13,15 +13,26 @@
<h3><%=ResourceLoader.GetResource(session, "items.service.chooser")%> </h3>
</div>
<div class="modal-body">
-
- <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsService"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsService"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetService">0</span><br>
- <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="langService" class="edit"></span><br>
- <% //=ResourceLoader.GetResource(session, "items.name"): <span id="nameService" class="edit">%</span><br>%>
+ <table class="table-bordered table-condensed">
+ <tr>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsService"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsService"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetService">0</span></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_Service" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_Service" ></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
<a href="javascript:pagedownChooserService();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupService"></i></a>
- <a href="javascript:reloadService();"><i class="icon-refresh icon-2x"></i></a>
+ <a href="javascript:reloadServiceModal();"><i class="icon-refresh icon-2x"></i></a>
<a href="javascript:pageupChooserService();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownService"></i></a>
<div id="servicelist">
@@ -38,9 +49,7 @@
}
});
$('.edit').editable(function(value, settings) {
- console.log(this);
- console.log(value);
- console.log(settings);
+ window.console && console.log(value + this + settings);
reloadServiceModal();
// RenderTmodelListBySearch('%', offset, maxrecords);
return(value);
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=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Wed Jan 29 23:16:07 2014
@@ -67,6 +67,7 @@
//we can't make a new service without a business to reference
response.sendRedirect("index.jsp");
+ return;
}
%>
<%@include file="header-top.jsp" %>
Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp Wed Jan 29 23:16:07 2014
@@ -10,46 +10,57 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="well" >
- <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
- </div>
+ <!-- Main hero unit for a primary marketing message or call to action -->
+ <div class="well" >
+ <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
+ </div>
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
- <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
+ <!-- Example row of columns -->
+ <div class="row">
+ <div class="span12" >
+ <table class="table-striped table-bordered">
+ <tr>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offset">0</span></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
+ </table>
+ </td>
+ </tr>
- <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
- <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
- <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
+ </table>
+ <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
+ <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
+ <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
- <div id="tmodellist">
- <img src="img/bigrollergreen.gif" title="Loading"/>
- </div>
- <script src="js/tmodelsearch.js"></script>
- <script type="text/javascript">
-
- function reload()
- {
- RenderTmodelListBySearch('%', offset, maxrecords, false);
- }
- $('.edit').editable(function(value, settings) {
- console.log(this);
- console.log(value);
- console.log(settings);
- reload();
- // RenderTmodelListBySearch('%', offset, maxrecords);
- return(value);
- }, {
- type : 'text',
- submit : i18n_ok
- });
- reload();
- </script>
- </div>
- </div>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ <div id="tmodellist">
+ <img src="img/bigrollergreen.gif" title="Loading"/>
+ </div>
+ <script src="js/tmodelsearch.js"></script>
+ <script type="text/javascript">
+
+ function reload()
+ {
+ RenderTmodelListBySearch('%', offset, maxrecords, false);
+ }
+ $('.edit').editable(function(value, settings) {
+ window.console && console.log(value + this + settings);
+ reload();
+ // RenderTmodelListBySearch('%', offset, maxrecords);
+ return(value);
+ }, {
+ type: 'text',
+ submit: i18n_ok
+ });
+ reload();
+ </script>
+ </div>
+ </div>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp Wed Jan 29 23:16:07 2014
@@ -14,13 +14,27 @@ this page is meant to be included via js
</div>
<div class="modal-body">
- <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
- <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
+ <table class="table-bordered table-condensed">
+ <tr>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offset">0</span></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
+ </table>
+ </td>
+
+ </tr>
+ </table>
<a href="javascript:pagedownChooserTmodel();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageup"></i></a>
- <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
+ <a href="javascript:reloadTmodelModal();"><i class="icon-refresh icon-2x"></i></a>
<a href="javascript:pageupChooserTmodel();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedown"></i></a>
<div id="tmodellist">
@@ -42,9 +56,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);
reloadTmodelModal();
// RenderTmodelListBySearch('%', offset, maxrecords);
return(value);
Modified: juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java (original)
+++ juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Common.java Wed Jan 29 23:16:07 2014
@@ -40,6 +40,8 @@ public class Common {
OperationalInfos operationalInfo = null;
try {
operationalInfo = inquiry.getOperationalInfo(goi);
+ if (operationalInfo!=null && operationalInfo.getOperationalInfo()!=null &&
+ !operationalInfo.getOperationalInfo().isEmpty())
return operationalInfo.getOperationalInfo().get(0).getAuthorizedName();
} catch (Exception ex) {
ex.printStackTrace();
Modified: juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java?rev=1562631&r1=1562630&r2=1562631&view=diff
==============================================================================
--- juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java (original)
+++ juddi/trunk/uddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java Wed Jan 29 23:16:07 2014
@@ -111,15 +111,13 @@ public class Export {
username = clerk.getPublisher();
pass = clerk.getPassword();
}
- if (username != null && pass != null
- || username.length() != 0 && pass.length() != 0) {
+ if (username == null || pass==null) {
+ System.out.println("No credentials are available. This will probably fail spectacularly");
+ } else {
GetAuthToken getAuthTokenRoot = new GetAuthToken();
getAuthTokenRoot.setUserID(username);
getAuthTokenRoot.setCred(pass);
token = security.getAuthToken(getAuthTokenRoot).getAuthInfo();
- } else {
- System.out.println("No credentials are available. This will probably fail spectacularly");
-
}
@@ -147,7 +145,7 @@ public class Export {
req.setFindQualifiers(new FindQualifiers());
req.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
int offset = 0;
- int maxrows = 20;
+ int maxrows = 100;
req.setMaxRows(maxrows);
req.setListHead(offset);
@@ -159,7 +157,7 @@ public class Export {
for (int i = 0; i < findTModel.getBusinessInfos().getBusinessInfo().size(); i++) {
boolean go = true;
String owner = Common.GetOwner(findTModel.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(), token, inquiry);
- if (!usernames.contains(owner)) {
+ if (owner!=null && !usernames.contains(owner)) {
usernames.add(owner);
}
if (myitemsonly) {
@@ -169,8 +167,9 @@ public class Export {
}
}
if (go) {
+ if (owner!=null)
mapping.setProperty(findTModel.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(), owner);
- System.out.println("Exporting " + findTModel.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey());
+ System.out.println("Exporting " + findTModel.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey() + " owner " + owner);
sb.getBusinessEntity().add(GetBusiness(findTModel.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(), token));
}
}
@@ -179,7 +178,7 @@ public class Export {
offset = offset + maxrows;
req.setListHead(offset);
- } while (findTModel.getListDescription().getIncludeCount() > 0);
+ } while (false);//findTModel.getListDescription().getIncludeCount() > 0 );
if (stripSig) {
int x=0;
@@ -207,7 +206,7 @@ public class Export {
System.out.println("Saving to disk");
JAXB.marshal(sb, fos);
fos.close();
- System.out.println("Done with businesses");
+ System.out.println("Done with businesses. Export count: " + sb.getBusinessEntity().size());
}
private void ExportTmodels() throws Exception {
@@ -218,7 +217,7 @@ public class Export {
req.setFindQualifiers(new FindQualifiers());
req.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
int offset = 0;
- int maxrows = 20;
+ int maxrows = 100;
req.setMaxRows(maxrows);
req.setListHead(offset);
@@ -230,7 +229,7 @@ public class Export {
for (int i = 0; i < findTModel.getTModelInfos().getTModelInfo().size(); i++) {
boolean go = true;
String owner = Common.GetOwner(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey(), token, inquiry);
- if (!usernames.contains(owner)) {
+ if (owner!=null && !usernames.contains(owner)) {
usernames.add(owner);
}
if (myitemsonly) {
@@ -239,15 +238,16 @@ public class Export {
}
}
if (go) {
- mapping.setProperty(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey(), owner);
- System.out.println("Exporting " + findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey());
+ if (owner!=null)
+ mapping.setProperty(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey(), owner);
+ System.out.println("Exporting " + findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey() + " owner " + owner);
stm.getTModel().add(GetTmodel(findTModel.getTModelInfos().getTModelInfo().get(i), token));
}
}
}
offset = offset + maxrows;
req.setListHead(offset);
- } while (findTModel.getListDescription().getIncludeCount() > 0);
+ } while (false);//findTModel.getListDescription().getIncludeCount() > 0);
if (stripSig) {
int x=0;
@@ -261,7 +261,7 @@ public class Export {
System.out.println("Storing to disk ");
JAXB.marshal(stm, fos);
fos.close();
- System.out.println("Done with tModels");
+ System.out.println("Done with tModels. Export count: " + stm.getTModel().size());
}
private TModel GetTmodel(TModelInfo get, String token) throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org