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/19 00:18:49 UTC
svn commit: r1559432 [2/2] - in /juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/v3/auth/
juddi-core/src/main/java/org/apache/juddi/validation/
juddi-core/src/test/java/org/apache/juddi/api/imp...
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp Sat Jan 18 23:18:48 2014
@@ -23,7 +23,7 @@
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="well">
- <h1>Administration</h1>
+ <h1><%=ResourceLoader.GetResource(session, "pages.home.admin")%></h1>
</div>
@@ -32,14 +32,10 @@
<div class="span12">
- <% UddiAdminHub x = UddiAdminHub.getInstance(application, session);
-
-
+ <% UddiAdminHub x = UddiAdminHub.getInstance(application, session);
%>
- This page lets you access the jUDDI Web Service.
- Its functions are outside the scope of the UDDI specification and provide basic administrative functions
- for managing your UDDI node. <br><br><b>You'll need to be logged (top right) in order to do anything.</b><br>
- Please select an item from the drop down menu.<br>
+ <%=ResourceLoader.GetResource(session, "pages.admin.content")%>
+ <br>
<select onchange="toggledivs();" id="divselector">
<option>adminDelete_tmodel</option>
<option>delete_ClientSubscriptionInfo</option>
@@ -47,9 +43,9 @@
<option>getAllPublisherDetail</option>
<option>get_publisherDetail</option>
<option>invoke_SyncSubscription</option>
- <!-- <option>save_Clerk</option>-->
+ <option>save_Clerk</option>
<option>save_ClientSubscriptionInfo</option>
- <!--<option>save_Node</option>-->
+ <option>save_Node</option>
<option>save_publisher</option>
</select>
@@ -61,33 +57,62 @@
<input type="text" id="delete_ClientSubscriptionInfoKEY" class="forminput" placeholder="Enter subscription Key">
</div>
<div id="invoke_SyncSubscription" style="display:none">
- Leave the auth token blank!*<br>
+ <%=ResourceLoader.GetResource(session, "items.noauthtoken")%> <br>
<textarea rows="4" cols="80" id="invokeSyncSubscriptionXML" class="forminput" placeholder="Enter subscription XML"></textarea>
</div>
<div id="delete_publisher" style="display:none">
<input type="text" class="forminput" id="delete_publisherKEY" placeholder="Enter publisher id">
</div>
<div id="getAllPublisherDetail" style="display:none">
- no input required.
+ <%=ResourceLoader.GetResource(session, "items.noinput")%>
</div>
<div id="get_publisherDetail" style="display:none">
<input type="text" id="get_publisherDetailKEY" class="forminput" placeholder="Enter publisher id">
</div>
<div id="save_ClientSubscriptionInfo" style="display:none">
- Leave the auth token blank!*<br>
+ <%=ResourceLoader.GetResource(session, "items.noauthtoken")%><br>
<textarea rows="4" cols="80" id="ClientSubscriptionInfoDetailXML" class="forminput" placeholder="Enter subscription XML"></textarea>
</div>
<div id="save_publisher" style="display:none">
- Name<input type="text" id="savePublisherNAME" class="forminput" placeholder="Enter name"><br>
- Email<input type="text" id="savePublisherEMAIL" class="forminput" placeholder="Enter email"><br>
- Authorized Name (username) <input type="text" id="savePublisherAuthorizedName" class="forminput" placeholder="Enter Authorized Name"><br>
- Is Admin <input type="checkbox" id="savePublisherIsAdmin" class="forminput" ><br>
- Is Enabled <input type="checkbox" id="savePublisherIsEnabled" class="forminput"><br>
- Max bindings per service <input type="text" id="savePublisherMaxBindings" placeholder="100" class="forminput"><br>
- Max Services Per Business <input type="text" id="savePublisherMaxServices" placeholder="1000" class="forminput"><br>
- Max Business <input type="text" id="savePublisherMaxBusiness" placeholder="1000" class="forminput"><br>
- Max TModels <input type="text" id="savePublisherMaxTModels" placeholder="1000" class="forminput"><br>
+ <%=ResourceLoader.GetResource(session, "items.name")%> <input type="text" id="savePublisherNAME" class="forminput" placeholder="Enter name"><br>
+ <%=ResourceLoader.GetResource(session, "items.email")%> <input type="text" id="savePublisherEMAIL" class="forminput" placeholder="Enter email"><br>
+ <%=ResourceLoader.GetResource(session, "items.authorizedname")%> <input type="text" id="savePublisherAuthorizedName" class="forminput" placeholder="Enter Authorized Name (username)"><br>
+ <%=ResourceLoader.GetResource(session, "items.publisher.admin")%> <input type="checkbox" id="savePublisherIsAdmin" class="forminput" ><br>
+ <%=ResourceLoader.GetResource(session, "items.enable")%> <input type="checkbox" id="savePublisherIsEnabled" class="forminput"><br>
+ <%=ResourceLoader.GetResource(session, "max.bindings.per.service")%> <input type="text" id="savePublisherMaxBindings" placeholder="100" class="forminput"><br>
+ <%=ResourceLoader.GetResource(session, "max.services.per.business")%> <input type="text" id="savePublisherMaxServices" placeholder="1000" class="forminput"><br>
+ <%=ResourceLoader.GetResource(session, "max.business")%> <input type="text" id="savePublisherMaxBusiness" placeholder="1000" class="forminput"><br>
+ <%=ResourceLoader.GetResource(session, "max.tmodel")%> <input type="text" id="savePublisherMaxTModels" placeholder="1000" class="forminput"><br>
+ <br>
+ <%=ResourceLoader.GetResource(session, "pages.admin.max")%>
+ </div>
+ <div id="save_Node" style="display:none">
+
+ <%=ResourceLoader.GetResource(session, "items.clientname")%> <input type="text" id="NODEsetClientName" class="forminput" placeholder="Client Name"><br>
+ <%=ResourceLoader.GetResource(session, "items.name")%> <input type="text" id="NODEsetName" class="forminput" placeholder="Enter name"><br>
+
+ <%=ResourceLoader.GetResource(session, "items.description")%> <input type="text" id="NODEsetDescription" class="forminput" placeholder="Enter description"><br>
+ Factory Initial <input type="text" id="NODEsetFactoryInitial" class="forminput" placeholder="only needed for RMI transport"><br>
+ Factory URL Packages <input type="text" id="NODEsetFactoryURLPkgs" class="forminput" placeholder="only needed for RMI transport"><br>
+ Factory Naming Provider <input type="text" id="NODEsetFactoryNamingProvider" class="forminput" placeholder="only needed for RMI transport"><br>
+ <%=ResourceLoader.GetResource(session, "items.transport")%> <input type="text" id="NODEsetProxyTransport" class="forminput" placeholder="org.apache.juddi.v3.client.transport.JAXWSTransport" value="org.apache.juddi.v3.client.transport.JAXWSTransport"><br>
+ <%=ResourceLoader.GetResource(session, "items.inquiry")%> <input type="text" id="NODEsetInquiryUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/inquiry" value="http://localhost:8080/juddiv3/services/inquiry"><br>
+ <%=ResourceLoader.GetResource(session, "items.publish")%> <input type="text" id="NODEsetPublishUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/publish" value="http://localhost:8080/juddiv3/services/publish"><br>
+ <%=ResourceLoader.GetResource(session, "items.security")%> <input type="text" id="NODEsetSecurityUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/security" value="http://localhost:8080/juddiv3/services/security"><br>
+ <%=ResourceLoader.GetResource(session, "items.subscription.list")%> <input type="text" id="NODEsetSubscriptionListenerUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/subscription-listener" value="http://localhost:8080/juddiv3/services/subscription-listener"><br>
+ <%=ResourceLoader.GetResource(session, "items.subscription")%> <input type="text" id="NODEsetSubscriptionUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/subscription" value="http://localhost:8080/juddiv3/services/subscription"><br>
+ <%=ResourceLoader.GetResource(session, "items.custodytransfer")%> <input type="text" id="NODEsetCustodyTransferUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/custody-transfer" value="http://localhost:8080/juddiv3/services/custody-transfer"><br>
+ <%=ResourceLoader.GetResource(session, "items.replication")%> <input type="text" id="NODEsetReplicationUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/replication" value="http://localhost:8080/juddiv3/services/replication"><br>
+ jUDDI API <input type="text" id="NODEsetJuddiApiUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/juddi-api" value="http://localhost:8080/juddiv3/services/juddi-api"><br>
+ </div>
+ <div id="save_Clerk" style="display:none">
+ <%=ResourceLoader.GetResource(session, "items.name")%> <input type="text" id="CLERKsetName" class="forminput" placeholder="Enter name"><br>
+ Node Name <input type="text" id="CLERKsetNode" class="forminput" placeholder="Enter node name"><br>
+ <%=ResourceLoader.GetResource(session, "items.authorizedname")%> <input type="text" id="CLERKsetPublisher" class="forminput" placeholder="Enter Authorized Name (username)"><br>
+ <%=ResourceLoader.GetResource(session, "navbar.login.password")%> <input type="password" id="CLERKsetPassword" class="forminput" placeholder="Enter password"><br>
+
</div>
+
</div>
<script type="text/javascript">
function toggledivs()
@@ -102,8 +127,8 @@
$("#invoke_SyncSubscription").hide();
$("#save_ClientSubscriptionInfo").hide();
$("#save_publisher").hide();
-
-
+ $("#save_Clerk").hide();
+ $("#save_Node").hide();
$("#" + x).show();
}
toggledivs();//run when the page loads
@@ -127,7 +152,7 @@
{
var id = $(this).attr("id");
var value = $(this).text();
- if (value===null || value=="" || value==undefined)
+ if (value === null || value == "" || value == undefined)
value = $(this).val();
postbackdata.push({
name: id,
@@ -161,8 +186,10 @@
}
</script>
<br>
- * For items that require XML input, leave the UDDI authentication token blank. It will be populated automatically.
- <a href="javascript:submitform();" class="btn btn-primary">Go!</a>
+ <%=ResourceLoader.GetResource(session, "pages.admin.notes")%>
+
+ <br>
+ <a href="javascript:submitform();" class="btn btn-primary"><%=ResourceLoader.GetResource(session, "actions.go")%></a>
</div>
</div>
@@ -170,7 +197,7 @@
<div class="modal hide fade container " id="adminresultsmodal">
<div class="modal-header">
<a href="javascript:$('#adminresultsmodal').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">×</a>
- <h3>Results</h3>
+ <h3><%=ResourceLoader.GetResource(session, "items.results")%></h3>
</div>
<div class="modal-body" align="center">
<div id="adminresults"></div>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp Sat Jan 18 23:18:48 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="java.util.Enumeration"%>
@@ -21,7 +22,7 @@
out.write("<br>"+s+"="+ request.getParameter(s));
}*/
} catch (Exception ex) {
- out.write("<i class=\"icon-thumbs-down icon-2x\"> Save Failed!<br>" + StringEscapeUtils.escapeHtml(ex.getMessage()));
+ out.write("<i class=\"icon-thumbs-down icon-2x\"> " + ResourceLoader.GetResource(session, "pages.config.savefailed") +"<br>" + StringEscapeUtils.escapeHtml(ex.getMessage()));
}
}
%>
\ No newline at end of file
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp Sat Jan 18 23:18:48 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="org.apache.juddi.config.AppConfig"%>
<%@page import="org.apache.commons.configuration.Configuration"%>
@@ -71,9 +72,9 @@
UddiAdminHub.getInstance(application, session).GetJuddiClientConfig().saveConfig();
//note server config is autosave.
}
- out.write("<i class=\"icon-thumbs-up icon-2x\"> Saved!");
+ out.write("<i class=\"icon-thumbs-up icon-2x\"> " + ResourceLoader.GetResource(session, "actions.saved"));
} catch (Exception ex) {
- out.write("<i class=\"icon-thumbs-down icon-2x\"> Save Failed!<br>" + StringEscapeUtils.escapeHtml(ex.getMessage()));
+ out.write("<i class=\"icon-thumbs-down icon-2x\"> " + ResourceLoader.GetResource(session, "pages.config.savefailed") +"<br>" + StringEscapeUtils.escapeHtml(ex.getMessage()));
}
}
}
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp Sat Jan 18 23:18:48 2014
@@ -17,8 +17,9 @@
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="well">
- <h1>Configure jUDDI</h1>
- Just click to edit each field, then click save when you are done. (Not all fields can be modified)
+ <h1><%=ResourceLoader.GetResource(session, "pages.home.config")%></h1>
+ <%=ResourceLoader.GetResource(session, "pages.configure.info")%>
+
</div>
<!-- Example row of columns -->
@@ -34,9 +35,9 @@
out.write("Loaded from: (location unknown)<br>");
}
%>
- <h2>Server Config</h2>
+ <h2><%=ResourceLoader.GetResource(session, "pages.configure.server")%></h2>
<table class="table table-hover">
- <tr><th>Field</th><th>Value</th></tr>
+ <tr><th><%=ResourceLoader.GetResource(session, "items.key")%></th><th><%=ResourceLoader.GetResource(session, "items.value")%></th></tr>
<%
Iterator it = AppConfig.getConfiguration().getKeys();
@@ -68,13 +69,13 @@
%>
</table>
- <h2>Admin Console Config (this web site)</h2>
+ <h2><%=ResourceLoader.GetResource(session, "pages.configure.admin")%></h2>
<%
UddiAdminHub ahub = UddiAdminHub.getInstance(application, session);
out.write("Loaded from: " + StringEscapeUtils.escapeHtml(ahub.GetJuddiClientConfig().getConfigurationFile()) + "<br>");
%>
<table class="table table-hover" id="configtable">
- <tr><th>Field</th><th>Value</th></tr>
+ <tr><th><%=ResourceLoader.GetResource(session, "items.key")%></th><th><%=ResourceLoader.GetResource(session, "items.value")%></th></tr>
<%
try {
@@ -176,6 +177,42 @@
out.write("class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\">");
out.write(StringEscapeUtils.escapeHtml(cfg2.getString(key)));
out.write("</div></td></tr>");
+
+ key = "client.nodes.node(" + i + ").subscriptionListenerUrl";
+ out.write("<tr id=\"" + StringEscapeUtils.escapeHtml(key) + "ROW\"><td>");
+ out.write("<a href=\"javascript:removeKey('" + StringEscapeUtils.escapeJavaScript(key) + "');\"><i class=\"icon-trash icon-large\"></i></a>");
+ out.write(StringEscapeUtils.escapeHtml(key));
+ out.write("</td><td><div ");
+ out.write("class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\">");
+ out.write(StringEscapeUtils.escapeHtml(cfg2.getString(key)));
+ out.write("</div></td></tr>");
+
+ key = "client.nodes.node(" + i + ").juddiApiUrl";
+ out.write("<tr id=\"" + StringEscapeUtils.escapeHtml(key) + "ROW\"><td>");
+ out.write("<a href=\"javascript:removeKey('" + StringEscapeUtils.escapeJavaScript(key) + "');\"><i class=\"icon-trash icon-large\"></i></a>");
+ out.write(StringEscapeUtils.escapeHtml(key));
+ out.write("</td><td><div ");
+ out.write("class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\">");
+ out.write(StringEscapeUtils.escapeHtml(cfg2.getString(key)));
+ out.write("</div></td></tr>");
+
+ key = "client.nodes.node(" + i + ").inquiryRESTUrl";
+ out.write("<tr id=\"" + StringEscapeUtils.escapeHtml(key) + "ROW\"><td>");
+ out.write("<a href=\"javascript:removeKey('" + StringEscapeUtils.escapeJavaScript(key) + "');\"><i class=\"icon-trash icon-large\"></i></a>");
+ out.write(StringEscapeUtils.escapeHtml(key));
+ out.write("</td><td><div ");
+ out.write("class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\">");
+ out.write(StringEscapeUtils.escapeHtml(cfg2.getString(key)));
+ out.write("</div></td></tr>");
+
+ key = "client.nodes.node(" + i + ").replicationUrl";
+ out.write("<tr id=\"" + StringEscapeUtils.escapeHtml(key) + "ROW\"><td>");
+ out.write("<a href=\"javascript:removeKey('" + StringEscapeUtils.escapeJavaScript(key) + "');\"><i class=\"icon-trash icon-large\"></i></a>");
+ out.write(StringEscapeUtils.escapeHtml(key));
+ out.write("</td><td><div ");
+ out.write("class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\">");
+ out.write(StringEscapeUtils.escapeHtml(cfg2.getString(key)));
+ out.write("</div></td></tr>");
}
@@ -190,7 +227,6 @@
<script type="text/javascript">
function save()
{
- //alert("hi");
var url = 'ajax/saveconfig.jsp';
var postbackdata = new Array();
$("div.edit").each(function()
@@ -234,8 +270,8 @@
Reedit();
</script>
- <a class="btn btn-primary" href="javascript:newItem();"><i class="icon-large icon-plus-sign"></i> Add</a>
- <a class="btn btn-primary" href="javascript:save();">Save</a><br><br>
+ <a class="btn btn-primary" href="javascript:newItem();"><i class="icon-large icon-plus-sign"></i> <%=ResourceLoader.GetResource(session, "actions.add")%></a>
+ <a class="btn btn-primary" href="javascript:save();"><%=ResourceLoader.GetResource(session, "actions.save")%></a><br><br>
<div id="saveConfigresultBar" class="well-small"></div>
@@ -246,10 +282,10 @@
}
</script>
- <a class="btn " href="javascript:showDebug();"><i class="icon-large icon-arrow-down"></i> Show Debug Info</a>
+ <a class="btn " href="javascript:showDebug();"><i class="icon-large icon-arrow-down"></i> <%=ResourceLoader.GetResource(session, "page.config.debug")%></a>
<div id="debugtable" class="hide">
<table class="table table-hover">
- <tr><th>Field</th><th>Value</th></tr>
+ <tr><th><%=ResourceLoader.GetResource(session, "items.key")%></th><th><%=ResourceLoader.GetResource(session, "items.value")%></th></tr>
<%
try {
@@ -308,16 +344,16 @@
<div class="modal hide fade container" id="newItemModal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3>Add a new setting</h3>
+ <h3><%=ResourceLoader.GetResource(session, "pages.config.add")%></h3>
</div>
<div class="modal-body">
- Note: the key must start with either client., config.props, or juddi.<br>
- Key: <input type="text" id="newItemKey" placeholder="client."><br>
- Value: <input type="text" id="newItemValue" placeholder="value"><br>
+ <%=ResourceLoader.GetResource(session, "pages.config.add.note")%><br>
+ <%=ResourceLoader.GetResource(session, "items.key")%>: <input type="text" id="newItemKey" placeholder="client."><br>
+ <%=ResourceLoader.GetResource(session, "items.value")%>: <input type="text" id="newItemValue" placeholder="value"><br>
</div>
<div class="modal-footer">
- <a href="javascript:appendKey();" class="btn btn-primary">Add</a>
- <a href="javascript:$('#newItemModal').modal('hide');" class="btn">Close</a>
+ <a href="javascript:appendKey();" class="btn btn-primary"><%=ResourceLoader.GetResource(session, "actions.add")%></a>
+ <a href="javascript:$('#newItemModal').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/home.jsp Sat Jan 18 23:18:48 2014
@@ -11,7 +11,7 @@
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="hero-unit">
- <h1>jUDDI Administration</h1>
+ <h1><%=ResourceLoader.GetResource(session, "pages.home.title")%></h1>
</div>
@@ -20,19 +20,19 @@
<div class="span4">
- <h2>Configure jUDDI</h2>
- <p><% //=ResourceLoader.GetResource(session, "index.config")%>Configure jUDDI</p>
- <p><a class="btn" href="configure.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> »</a></p>
+ <h2><%=ResourceLoader.GetResource(session, "pages.home.config")%></h2>
+ <p><%=ResourceLoader.GetResource(session, "pages.home.config")%></p>
+ <p><a class="btn btn-primary" href="configure.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> »</a></p>
</div>
<div class="span4">
- <h2>Status and Statistics</h2>
- <p><% //=ResourceLoader.GetResource(session, "index.search")%>Find out how busy jUDDI is.</p>
- <p><a class="btn" href="stats.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> »</a></p>
+ <h2><%=ResourceLoader.GetResource(session, "pages.home.stats")%></h2>
+ <p><%=ResourceLoader.GetResource(session, "pages.home.stats.content")%></p>
+ <p><a class="btn btn-primary" href="stats.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> »</a></p>
</div>
<div class="span4">
- <h2>Administration</h2>
- <p><%//=ResourceLoader.GetResource(session, "index.learn")%>Administration options, such as deleting entities.</p>
- <p><a class="btn" href="admin.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> »</a></p>
+ <h2><%=ResourceLoader.GetResource(session, "pages.home.admin")%></h2>
+ <p><%=ResourceLoader.GetResource(session, "pages.home.admin.content")%>Administration options, such as deleting entities.</p>
+ <p><a class="btn btn-primary" href="admin.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> »</a></p>
</div>
</div>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/index.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/index.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/index.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/index.jsp Sat Jan 18 23:18:48 2014
@@ -56,9 +56,8 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Welcome to jUDDI</title>
- <meta charset="utf-8">
<title>Welcome to Apache jUDDI</title>
+ <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Apache jUDDI">
<meta name="author" content="Apache Software Foundation">
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp Sat Jan 18 23:18:48 2014
@@ -172,7 +172,7 @@
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="well">
- <h1>Status and Statistics</h1>
+ <h1><%=ResourceLoader.GetResource(session, "pages.home.stats")%></h1>
</div>
@@ -191,15 +191,15 @@
<ul class="nav nav-tabs" id="myTab" data-tabs="tabs">
- <li class="active"><a href="#status" data-toggle="tab">Status</a></li>
- <li><a href="#stats" data-toggle="tab">Statistics</a></li>
+ <li class="active"><a href="#status" data-toggle="tab"><%=ResourceLoader.GetResource(session, "items.status")%></a></li>
+ <li><a href="#stats" data-toggle="tab"><%=ResourceLoader.GetResource(session, "items.statistics")%></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="status">
- <h3>Happy jUDDI!</h3>
+ <h3><%=ResourceLoader.GetResource(session, "items.happyjuddi")%></h3>
<h4>jUDDI Version Information</h4>
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java?rev=1559432&r1=1559431&r2=1559432&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java Sat Jan 18 23:18:48 2014
@@ -139,7 +139,7 @@ public class JUDDI_200_GUI_IntegrationTe
runTest(baseurl + "index.jsp");
}
- @Test
+ //@Test
public void Test0016() throws Exception {
runTest(baseurl + "reginfo.jsp");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org