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/11 01:30:25 UTC
svn commit: r1557292 [1/2] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-gui/src/main/resources/META-INF/
juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/
juddi-gui/src/main/webapp/ juddi-gui/...
Author: alexoree
Date: Sat Jan 11 00:30:24 2014
New Revision: 1557292
URL: http://svn.apache.org/r1557292
Log:
JUDDI-775 done
Added:
juddi/trunk/juddi-gui/src/test/
juddi/trunk/juddi-gui/src/test/java/
juddi/trunk/uddi-tck-base/src/main/resources/keystore.jks (with props)
juddi/trunk/uddi-tck-base/src/main/resources/truststore.jks (with props)
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
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/WEB-INF/web.xml
juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp
juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp
juddi/trunk/juddi-gui/src/main/webapp/settings.jsp
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Sat Jan 11 00:30:24 2014
@@ -86,7 +86,7 @@ public class ClientConfig
Iterator<String> keys = this.config.getKeys();
while (keys.hasNext()){
String key = keys.next();
- if (key.startsWith("client"))
+ if (key.startsWith("client") || key.startsWith("config"))
{
cc.setProperty(key, config.getProperty(key));
}
Modified: juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml Sat Jan 11 00:30:24 2014
@@ -126,7 +126,7 @@ It currently does not use the ValueSet,
<duration>900000</duration>
</automaticLogouts>
<!--#node, this is the node defined in uddi.xml that the jUDDI-GUI will use for connections-->
- <node>default-ssl</node>
+ <node>default</node>
<!-- controls remote access to the settings/configuration page -->
<configLocalHostOnly>true</configLocalHostOnly>
</props>
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=1557292&r1=1557291&r2=1557292&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 Sat Jan 11 00:30:24 2014
@@ -395,3 +395,4 @@ pages.subscription.aboutkeys=About Subsc
errors.subscriptionfeed.nosubs=No subscriptions are defined.
items.maxitems=Maximum Items
items.deliverymech=Delivery Mechanism
+form.missing.information=Sorry, but you forgot to fill out some required information. Add it, then try again.
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=1557292&r1=1557291&r2=1557292&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 Sat Jan 11 00:30:24 2014
@@ -397,3 +397,4 @@ pages.subscription.aboutkeys=Acerca de s
errors.subscriptionfeed.nosubs=No hay suscripciones se definen.
items.maxitems=n\u00famero m\u00e1ximo de elementos
items.deliverymech=Mecanismo de entrega
+form.missing.information=Lo sentimos, pero usted se olvid\u00f3 de llenar algunos datos requeridos. A\u00f1ade que, a continuaci\u00f3n, int\u00e9ntelo de nuevo.
Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Sat Jan 11 00:30:24 2014
@@ -1,73 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <display-name>jUDDI Graphical User Interface (juddi-gui)</display-name>
- <description>This is an end user web application for an implementation of OASIS's UDDI v3 specification</description>
- <!-- This may cause issues in some containers, if it complains about a non serializable object, comment this out
- <distributable /> -->
-
- <listener>
- <!-- this class setups the encryption key for the session-->
- <listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
- </listener>
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
- <mime-mapping>
- <!-- this is added for the Font Awesome extension for bootstrap (cooler, scalable icons)-->
- <extension>woff</extension>
- <mime-type>application/x-font-woff</mime-type>
- </mime-mapping>
+ <display-name>jUDDI Graphical User Interface (juddi-gui)</display-name>
+ <description>This is an end user web application for an implementation of OASIS's UDDI v3 specification</description>
+ <!-- This may cause issues in some containers, if it complains about a non serializable object, comment this out
+ <distributable /> -->
+
+ <filter>
+ <filter-name>noCacheFilter</filter-name>
+ <filter-class>org.apache.juddi.webconsole.NoCacheFilter</filter-class>
+ </filter>
+ <filter>
+ <filter-name>YesCacheFilter</filter-name>
+ <filter-class>org.apache.juddi.webconsole.YesCacheFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>noCacheFilter</filter-name>
+ <url-pattern>*.jsp</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>YesCacheFilter</filter-name>
+ <url-pattern>*.png</url-pattern>
+ <url-pattern>*.jpg</url-pattern>
+ <url-pattern>*.gif</url-pattern>
+ <url-pattern>*.js</url-pattern>
+ <url-pattern>*.css</url-pattern>
+ <url-pattern>*.otf</url-pattern>
+ <url-pattern>*.eot</url-pattern>
+ <url-pattern>*.sbg</url-pattern>
+ <url-pattern>*.ttf</url-pattern>
+ <url-pattern>*.woff</url-pattern>
+ </filter-mapping>
+
+
+ <listener>
+ <!-- this class setups the encryption key for the session-->
+ <listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
+ </listener>
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+ <mime-mapping>
+ <!-- this is added for the Font Awesome extension for bootstrap (cooler, scalable icons)-->
+ <extension>woff</extension>
+ <mime-type>application/x-font-woff</mime-type>
+ </mime-mapping>
- <!--<error-page>
- <description>Missing login</description>
- <error-code>401</error-code>
- <location>/error.jsp</location>
- </error-page>-->
- <error-page>
- <!-- <description>Forbidden directory listing</description> -->
- <error-code>403</error-code>
- <location>/error.jsp</location>
- </error-page>
- <error-page>
- <!-- <description>Uncaught exception</description> -->
- <error-code>500</error-code>
- <location>/error.jsp</location>
- </error-page>
- <error-page>
- <!-- <description>Unsupported servlet method</description> -->
- <error-code>503</error-code>
- <location>/error.jsp</location>
- </error-page>
+ <!--<error-page>
+ <description>Missing login</description>
+ <error-code>401</error-code>
+ <location>/error.jsp</location>
+ </error-page>-->
+ <error-page>
+ <!-- <description>Forbidden directory listing</description> -->
+ <error-code>403</error-code>
+ <location>/error.jsp</location>
+ </error-page>
+ <error-page>
+ <!-- <description>Uncaught exception</description> -->
+ <error-code>500</error-code>
+ <location>/error.jsp</location>
+ </error-page>
+ <error-page>
+ <!-- <description>Unsupported servlet method</description> -->
+ <error-code>503</error-code>
+ <location>/error.jsp</location>
+ </error-page>
- <security-constraint>
- <display-name>jUDDI Admin content</display-name>
- <web-resource-collection>
- <web-resource-name>admin</web-resource-name>
- <url-pattern>/settings.jsp</url-pattern>
- <url-pattern>/ajax/settings.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>uddiadmin</role-name>
- </auth-constraint>
- <!-- uncomment to require SSL <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- -->
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details -->
- <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name>
- </login-config>
- <security-role>
- <role-name>uddiadmin</role-name>
- </security-role>
+ <security-constraint>
+ <display-name>jUDDI Admin content</display-name>
+ <web-resource-collection>
+ <web-resource-name>admin</web-resource-name>
+ <url-pattern>/settings.jsp</url-pattern>
+ <url-pattern>/ajax/settings.jsp</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>uddiadmin</role-name>
+ </auth-constraint>
+ <!-- uncomment to require SSL <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ -->
+ </security-constraint>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <!-- you should consider NOT using BASIC is favor of something more secure, see your web app servers documentation for details -->
+ <realm-name>Apache jUDDI - Make sure you're using HTTPS!</realm-name>
+ </login-config>
+ <security-role>
+ <role-name>uddiadmin</role-name>
+ </security-role>
+
+
+
+
</web-app>
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp Sat Jan 11 00:30:24 2014
@@ -50,6 +50,7 @@
}
try {
x.GetJuddiClientConfig().saveConfig();
+ out.write("Saved!");
} catch (Exception ex) {
response.setStatus(500);
out.write("Error saving Juddi Client Config" + ex.getMessage());
Modified: juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp Sat Jan 11 00:30:24 2014
@@ -14,254 +14,266 @@
<%@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.create.serviceimport.wadl")%></h1>
-
- </div>
-
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.wadl")%>
- <Br>
- <br>
-
- <div class="accordion" id="accordion2">
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse1">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1.wadl")%>
- </a>
- </div>
- <div id="collapse1" class="accordion-body collapse in">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1a.wadl")%><br>
- <input type="text" id="wsdlurl" placeholder="http://localhost:8080/services/myService?wadl" style="width:100%" ><br>
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1b")%><br>
- <%
- if (!request.isSecure()) {
- %>
- <div class="alert alert-error">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <h4><i class="icon-warning-sign"></i> <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.sslwarning")%></h4>
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.usessl")%>
-
- </div>
- <% }
- %>
- <input type="text" id="wsdlusername" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.username")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
- <input type="text" id="wsdlpassword" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.password")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
- <input type="checkbox" id="wsdlignoressl" > <%=ResourceLoader.GetResource(session, "items.ignoresslerror")%><br>
- </div>
- </div>
- </div>
- <script type="text/javascript">
-
- //by James Padolsey
- //http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
- function parseURL(url) {
- var a = document.createElement('a');
- a.href = url;
- return {
- source: url,
- protocol: a.protocol.replace(':', ''),
- host: a.hostname,
- port: a.port,
- query: a.search,
- params: (function() {
- var ret = {},
- seg = a.search.replace(/^\?/, '').split('&'),
- len = seg.length, i = 0, s;
- for (; i < len; i++) {
- if (!seg[i]) {
- continue;
- }
- s = seg[i].split('=');
- ret[s[0]] = s[1];
- }
- return ret;
- })(),
- file: (a.pathname.match(/\/([^\/?#]+)$/i) || [, ''])[1],
- hash: a.hash.replace('#', ''),
- path: a.pathname.replace(/^([^\/])/, '/$1'),
- relative: (a.href.match(/tps?:\/\/[^\/]+(.+)/) || [, ''])[1],
- segments: a.pathname.replace(/^\//, '').split('/')
- };
- }
-
- //after is entered, fetch the wsdl, parse the key domain
- var trigger1_triggered = false;
- //considerations, if its an ip address? what about localhost
- function trigger1()
- {
- if (!trigger1_triggered) {
- var l = parseURL($("#wsdlurl").val());
- $("#keydomain").val(l.host);
- $("#collapse1").collapse('hide');
- $("#collapse2").collapse('show');
- var trigger1_triggered = true;
- }
- }
-
- function save(preview)
- {
- var postbackdata = new Array();
- var url = 'ajax/importFromWadl.jsp';
- postbackdata.push({
- name: "nonce",
- value: $("#nonce").val()
- });
- if (preview) {
- postbackdata.push({
- name: "formaction",
- value: "preview"
- });
- }
- else
- {
- postbackdata.push({
- name: "formaction",
- value: "save"
- });
- }
- postbackdata.push({
- name: "wsdlusername",
- value: $("#wsdlusername").val()
- });
- postbackdata.push({
- name: "wsdlpassword",
- value: $("#wsdlpassword").val()
- });
- postbackdata.push({
- name: "wsdlurl",
- value: $("#wsdlurl").val()
- });
- if ($('#wsdlignoressl').is(':checked')) {
- postbackdata.push({
- name: "ignoressl",
- value: true
- });
- }
- else
- {
- postbackdata.push({
- name: "ignoressl",
- value: false
- });
- }
- postbackdata.push({
- name: "businessname",
- value: $("#businessname").val()
- });
-
- postbackdata.push({
- name: "keydomain",
- value: $("#keydomain").val()
- });
-
-
-
-
- var request = $.ajax({
- url: url,
- type: "POST",
- // dataType: "html",
- cache: false,
- // processData: false,f
- data: postbackdata
- });
-
-
- request.done(function(msg) {
- window.console && console.log('postback done ' + url);
- $("#preview").html(msg);
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#preview").html(jqXHR + textStatus);
-
- });
- }
-
- </script>
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse2" onclick="trigger1();">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2")%>
- </a>
- </div>
- <div id="collapse2" class="accordion-body collapse">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2a")%>
- <br>
- <input type="text" id="keydomain" placeholder="<%=ResourceLoader.GetResource(session, "items.import.autofill")%>">
- </div>
- </div>
- </div>
+ <!-- Main hero unit for a primary marketing message or call to action -->
+ <div class="well" >
+ <h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.wadl")%></h1>
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse3">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3")%>
-
- </a>
- </div>
- <div id="collapse3" class="accordion-body collapse">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3a")%><br>
- <a href="javascript:loadBusinessModel();"><i class="icon-list-alt icon-large"></i> <%=ResourceLoader.GetResource(session, "items.picker")%></a>
-
- <script type="text/javascript">
- function loadBusinessModel()
- {
- reloadBusinessModal();
- $.dialogBusiness.confirm({
- callback: function(success, result) {
- if (success)
- {
- for (var i = 0; i < result.length; i++) {
- $("#businessname").val(result[i]);
- //if ($("#keylist option[value='"+result[i]+"']").length == 0)
- //$("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
- }
-
- }
- }
- });
- }
- </script>
- <input type="text" id="businessname" placeholder="<%=ResourceLoader.GetResource(session, "items.import.bizname")%>">
- </div>
- </div>
- </div>
+ </div>
+ <!-- Example row of columns -->
+ <div class="row">
+ <div class="span12" >
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.wadl")%>
+ <Br>
+ <br>
+
+ <div class="accordion" id="accordion2">
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse1">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1.wadl")%>
+ </a>
+ </div>
+ <div id="collapse1" class="accordion-body collapse in">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1a.wadl")%><br>
+ <input type="text" id="wsdlurl" placeholder="http://localhost:8080/services/myService?wadl" style="width:100%" ><br>
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1b")%><br>
+ <%
+ if (!request.isSecure()) {
+ %>
+ <div class="alert alert-error">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <h4><i class="icon-warning-sign"></i> <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.sslwarning")%></h4>
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.usessl")%>
+
+ </div>
+ <% }
+ %>
+ <input type="text" id="wsdlusername" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.username")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
+ <input type="text" id="wsdlpassword" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.password")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
+ <input type="checkbox" id="wsdlignoressl" > <%=ResourceLoader.GetResource(session, "items.ignoresslerror")%><br>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+
+ //by James Padolsey
+ //http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+ function parseURL(url) {
+ var a = document.createElement('a');
+ a.href = url;
+ return {
+ source: url,
+ protocol: a.protocol.replace(':', ''),
+ host: a.hostname,
+ port: a.port,
+ query: a.search,
+ params: (function() {
+ var ret = {},
+ seg = a.search.replace(/^\?/, '').split('&'),
+ len = seg.length, i = 0, s;
+ for (; i < len; i++) {
+ if (!seg[i]) {
+ continue;
+ }
+ s = seg[i].split('=');
+ ret[s[0]] = s[1];
+ }
+ return ret;
+ })(),
+ file: (a.pathname.match(/\/([^\/?#]+)$/i) || [, ''])[1],
+ hash: a.hash.replace('#', ''),
+ path: a.pathname.replace(/^([^\/])/, '/$1'),
+ relative: (a.href.match(/tps?:\/\/[^\/]+(.+)/) || [, ''])[1],
+ segments: a.pathname.replace(/^\//, '').split('/')
+ };
+ }
+
+ //after is entered, fetch the wsdl, parse the key domain
+ var trigger1_triggered = false;
+ //considerations, if its an ip address? what about localhost
+ function trigger1()
+ {
+ if (!trigger1_triggered) {
+ var l = parseURL($("#wsdlurl").val());
+ $("#keydomain").val(l.host);
+ $("#collapse1").collapse('hide');
+ $("#collapse2").collapse('show');
+ var trigger1_triggered = true;
+ }
+ }
+
+ function save(preview)
+ {
+ var ok = true;
+ var postbackdata = new Array();
+ var url = 'ajax/importFromWadl.jsp';
+ postbackdata.push({
+ name: "nonce",
+ value: $("#nonce").val()
+ });
+ if (preview) {
+ postbackdata.push({
+ name: "formaction",
+ value: "preview"
+ });
+ }
+ else
+ {
+ postbackdata.push({
+ name: "formaction",
+ value: "save"
+ });
+ }
+ postbackdata.push({
+ name: "wsdlusername",
+ value: $("#wsdlusername").val()
+ });
+ postbackdata.push({
+ name: "wsdlpassword",
+ value: $("#wsdlpassword").val()
+ });
+ postbackdata.push({
+ name: "wsdlurl",
+ value: $("#wsdlurl").val()
+ });
+ if ($("#wsdlurl").val() === "")
+ ok = false;
+ if ($('#wsdlignoressl').is(':checked')) {
+ postbackdata.push({
+ name: "ignoressl",
+ value: true
+ });
+ }
+ else
+ {
+ postbackdata.push({
+ name: "ignoressl",
+ value: false
+ });
+ }
+ if ($("#businessname").val() === "")
+ ok = false;
+ postbackdata.push({
+ name: "businessname",
+ value: $("#businessname").val()
+ });
+
+ postbackdata.push({
+ name: "keydomain",
+ value: $("#keydomain").val()
+ });
+
+
+ if ($("#keydomain").val() === "")
+ ok = false;
+ if (!ok)
+ {
+ alert('<%=ResourceLoader.GetResource(session, "form.missing.information")%>');
+ return;
+ }
+
+
+ var request = $.ajax({
+ url: url,
+ type: "POST",
+ // dataType: "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+ $("#preview").html(msg);
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#preview").html(jqXHR + textStatus);
+
+ });
+ }
+
+ </script>
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse2" onclick="trigger1();">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2")%>
+ </a>
+ </div>
+ <div id="collapse2" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2a")%>
+ <br>
+ <input type="text" id="keydomain" placeholder="<%=ResourceLoader.GetResource(session, "items.import.autofill")%>">
+ </div>
+ </div>
+ </div>
+
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse3">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3")%>
+
+ </a>
+ </div>
+ <div id="collapse3" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3a")%><br>
+ <a href="javascript:loadBusinessModel();"><i class="icon-list-alt icon-large"></i> <%=ResourceLoader.GetResource(session, "items.picker")%></a>
+
+ <script type="text/javascript">
+ function loadBusinessModel()
+ {
+ reloadBusinessModal();
+ $.dialogBusiness.confirm({
+ callback: function(success, result) {
+ if (success)
+ {
+ for (var i = 0; i < result.length; i++) {
+ $("#businessname").val(result[i]);
+ //if ($("#keylist option[value='"+result[i]+"']").length == 0)
+ //$("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+ }
+
+ }
+ }
+ });
+ }
+ </script>
+ <input type="text" id="businessname" placeholder="<%=ResourceLoader.GetResource(session, "items.import.bizname")%>">
+ </div>
+ </div>
+ </div>
+
+
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse4">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4")%>
+ </a>
+ </div>
+ <div id="collapse4" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4a")%>
+
+ <Br><br>
+ <div id="preview"></div>
+ <a class="btn btn-info" onclick="save(true);"><i class="icon-eye-open icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.preview")%></a>
+ <a class="btn btn-primary" onclick="save(false);"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
+ </div>
+ </div>
+ </div>
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse4">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4")%>
- </a>
- </div>
- <div id="collapse4" class="accordion-body collapse">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4a")%>
-
- <Br><br>
- <div id="preview"></div>
- <a class="btn btn-info" onclick="save(true);"><i class="icon-eye-open icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.preview")%></a>
- <a class="btn btn-primary" onclick="save(false);"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
</div>
- </div>
- </div>
-
- </div>
+ </div>
</div>
- </div>
- <%@include file="businessChooser.jsp" %>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ <%@include file="businessChooser.jsp" %>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp Sat Jan 11 00:30:24 2014
@@ -14,255 +14,267 @@
<%@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.create.serviceimport")%></h1>
-
- </div>
-
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content")%>
- <Br>
- <br>
-
- <div class="accordion" id="accordion2">
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse1">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1")%>
- </a>
- </div>
- <div id="collapse1" class="accordion-body collapse in">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1a")%><br>
- <input type="text" id="wsdlurl" placeholder="http://localhost:8080/services/myService?wsdl" style="width:100%" ><br>
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1b")%><br>
- <%
- if (!request.isSecure()) {
- %>
- <div class="alert alert-error">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <h4><i class="icon-warning-sign"></i> <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.sslwarning")%></h4>
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.usessl")%>
-
- </div>
- <% }
- %>
- <input type="text" id="wsdlusername" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.username")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
- <input type="text" id="wsdlpassword" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.password")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
- <input type="checkbox" id="wsdlignoressl" > <%=ResourceLoader.GetResource(session, "items.ignoresslerror")%><br>
- </div>
- </div>
- </div>
- <script type="text/javascript">
-
- //by James Padolsey
- //http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
- function parseURL(url) {
- var a = document.createElement('a');
- a.href = url;
- return {
- source: url,
- protocol: a.protocol.replace(':', ''),
- host: a.hostname,
- port: a.port,
- query: a.search,
- params: (function() {
- var ret = {},
- seg = a.search.replace(/^\?/, '').split('&'),
- len = seg.length, i = 0, s;
- for (; i < len; i++) {
- if (!seg[i]) {
- continue;
- }
- s = seg[i].split('=');
- ret[s[0]] = s[1];
- }
- return ret;
- })(),
- file: (a.pathname.match(/\/([^\/?#]+)$/i) || [, ''])[1],
- hash: a.hash.replace('#', ''),
- path: a.pathname.replace(/^([^\/])/, '/$1'),
- relative: (a.href.match(/tps?:\/\/[^\/]+(.+)/) || [, ''])[1],
- segments: a.pathname.replace(/^\//, '').split('/')
- };
- }
-
- //after is entered, fetch the wsdl, parse the key domain
- var trigger1_triggered = false;
- //considerations, if its an ip address? what about localhost
- function trigger1()
- {
- if (!trigger1_triggered)
- {
- var l = parseURL($("#wsdlurl").val());
- $("#keydomain").val(l.host);
- $("#collapse1").collapse('hide');
- $("#collapse2").collapse('show');
- trigger1_triggered = true;
- }
- }
-
- function save(preview)
- {
- var postbackdata = new Array();
- var url = 'ajax/importFromWsdl.jsp';
- postbackdata.push({
- name: "nonce",
- value: $("#nonce").val()
- });
- if (preview) {
- postbackdata.push({
- name: "formaction",
- value: "preview"
- });
- }
- else
- {
- postbackdata.push({
- name: "formaction",
- value: "save"
- });
- }
- postbackdata.push({
- name: "wsdlusername",
- value: $("#wsdlusername").val()
- });
- postbackdata.push({
- name: "wsdlpassword",
- value: $("#wsdlpassword").val()
- });
- postbackdata.push({
- name: "wsdlurl",
- value: $("#wsdlurl").val()
- });
- if ($('#wsdlignoressl').is(':checked')) {
- postbackdata.push({
- name: "ignoressl",
- value: true
- });
- }
- else
- {
- postbackdata.push({
- name: "ignoressl",
- value: false
- });
- }
- postbackdata.push({
- name: "businessname",
- value: $("#businessname").val()
- });
-
- postbackdata.push({
- name: "keydomain",
- value: $("#keydomain").val()
- });
-
-
-
-
- var request = $.ajax({
- url: url,
- type: "POST",
- // dataType: "html",
- cache: false,
- // processData: false,f
- data: postbackdata
- });
-
-
- request.done(function(msg) {
- window.console && console.log('postback done ' + url);
- $("#preview").html(msg);
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#preview").html(jqXHR + textStatus);
-
- });
- }
-
- </script>
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse2" onclick="trigger1();">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2")%>
- </a>
- </div>
- <div id="collapse2" class="accordion-body collapse">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2a")%>
- <br>
- <input type="text" id="keydomain" placeholder="<%=ResourceLoader.GetResource(session, "items.import.autofill")%>">
- </div>
- </div>
- </div>
+ <!-- Main hero unit for a primary marketing message or call to action -->
+ <div class="well" >
+ <h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport")%></h1>
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse3">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3")%>
-
- </a>
- </div>
- <div id="collapse3" class="accordion-body collapse">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3a")%><br>
- <a href="javascript:loadBusinessModel();"><i class="icon-list-alt icon-large"></i> <%=ResourceLoader.GetResource(session, "items.picker")%></a>
-
- <script type="text/javascript">
- function loadBusinessModel()
- {
- reloadBusinessModal();
- $.dialogBusiness.confirm({
- callback: function(success, result) {
- if (success)
- {
- for (var i = 0; i < result.length; i++) {
- $("#businessname").val(result[i]);
- //if ($("#keylist option[value='"+result[i]+"']").length == 0)
- //$("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
- }
-
- }
- }
- });
- }
- </script>
- <input type="text" id="businessname" placeholder="<%=ResourceLoader.GetResource(session, "items.import.bizname")%>">
- </div>
- </div>
- </div>
+ </div>
+ <!-- Example row of columns -->
+ <div class="row">
+ <div class="span12" >
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content")%>
+ <Br>
+ <br>
+
+ <div class="accordion" id="accordion2">
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse1">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1")%>
+ </a>
+ </div>
+ <div id="collapse1" class="accordion-body collapse in">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1a")%><br>
+ <input type="text" id="wsdlurl" placeholder="http://localhost:8080/services/myService?wsdl" style="width:100%" ><br>
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step1b")%><br>
+ <%
+ if (!request.isSecure()) {
+ %>
+ <div class="alert alert-error">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <h4><i class="icon-warning-sign"></i> <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.sslwarning")%></h4>
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.usessl")%>
+
+ </div>
+ <% }
+ %>
+ <input type="text" id="wsdlusername" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.username")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
+ <input type="text" id="wsdlpassword" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.password")%> <%=ResourceLoader.GetResource(session, "items.optional")%>" ><br>
+ <input type="checkbox" id="wsdlignoressl" > <%=ResourceLoader.GetResource(session, "items.ignoresslerror")%><br>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+
+ //by James Padolsey
+ //http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+ function parseURL(url) {
+ var a = document.createElement('a');
+ a.href = url;
+ return {
+ source: url,
+ protocol: a.protocol.replace(':', ''),
+ host: a.hostname,
+ port: a.port,
+ query: a.search,
+ params: (function() {
+ var ret = {},
+ seg = a.search.replace(/^\?/, '').split('&'),
+ len = seg.length, i = 0, s;
+ for (; i < len; i++) {
+ if (!seg[i]) {
+ continue;
+ }
+ s = seg[i].split('=');
+ ret[s[0]] = s[1];
+ }
+ return ret;
+ })(),
+ file: (a.pathname.match(/\/([^\/?#]+)$/i) || [, ''])[1],
+ hash: a.hash.replace('#', ''),
+ path: a.pathname.replace(/^([^\/])/, '/$1'),
+ relative: (a.href.match(/tps?:\/\/[^\/]+(.+)/) || [, ''])[1],
+ segments: a.pathname.replace(/^\//, '').split('/')
+ };
+ }
+
+ //after is entered, fetch the wsdl, parse the key domain
+ var trigger1_triggered = false;
+ //considerations, if its an ip address? what about localhost
+ function trigger1()
+ {
+ if (!trigger1_triggered)
+ {
+ var l = parseURL($("#wsdlurl").val());
+ $("#keydomain").val(l.host);
+ $("#collapse1").collapse('hide');
+ $("#collapse2").collapse('show');
+ trigger1_triggered = true;
+ }
+ }
+
+ function save(preview)
+ {
+ var ok = true;
+ var postbackdata = new Array();
+ var url = 'ajax/importFromWsdl.jsp';
+ postbackdata.push({
+ name: "nonce",
+ value: $("#nonce").val()
+ });
+ if (preview) {
+ postbackdata.push({
+ name: "formaction",
+ value: "preview"
+ });
+ }
+ else
+ {
+ postbackdata.push({
+ name: "formaction",
+ value: "save"
+ });
+ }
+ postbackdata.push({
+ name: "wsdlusername",
+ value: $("#wsdlusername").val()
+ });
+ postbackdata.push({
+ name: "wsdlpassword",
+ value: $("#wsdlpassword").val()
+ });
+ postbackdata.push({
+ name: "wsdlurl",
+ value: $("#wsdlurl").val()
+ });
+ if ($("#wsdlurl").val() === "")
+ ok = false;
+ if ($('#wsdlignoressl').is(':checked')) {
+ postbackdata.push({
+ name: "ignoressl",
+ value: true
+ });
+ }
+ else
+ {
+ postbackdata.push({
+ name: "ignoressl",
+ value: false
+ });
+ }
+ postbackdata.push({
+ name: "businessname",
+ value: $("#businessname").val()
+ });
+ if ($("#businessname").val() === "")
+ ok = false;
+ postbackdata.push({
+ name: "keydomain",
+ value: $("#keydomain").val()
+ });
+
+ if ($("#keydomain").val() === "")
+ ok = false;
+ if (!ok)
+ {
+ alert('<%=ResourceLoader.GetResource(session, "form.missing.information")%>');
+ return;
+ }
+
+
+
+
+ var request = $.ajax({
+ url: url,
+ type: "POST",
+ // dataType: "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+ $("#preview").html(msg);
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#preview").html(jqXHR + textStatus);
+
+ });
+ }
+
+ </script>
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse2" onclick="trigger1();">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2")%>
+ </a>
+ </div>
+ <div id="collapse2" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2a")%>
+ <br>
+ <input type="text" id="keydomain" placeholder="<%=ResourceLoader.GetResource(session, "items.import.autofill")%>">
+ </div>
+ </div>
+ </div>
+
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse3">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3")%>
+
+ </a>
+ </div>
+ <div id="collapse3" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step3a")%><br>
+ <a href="javascript:loadBusinessModel();"><i class="icon-list-alt icon-large"></i> <%=ResourceLoader.GetResource(session, "items.picker")%></a>
+
+ <script type="text/javascript">
+ function loadBusinessModel()
+ {
+ reloadBusinessModal();
+ $.dialogBusiness.confirm({
+ callback: function(success, result) {
+ if (success)
+ {
+ for (var i = 0; i < result.length; i++) {
+ $("#businessname").val(result[i]);
+ //if ($("#keylist option[value='"+result[i]+"']").length == 0)
+ //$("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+ }
+
+ }
+ }
+ });
+ }
+ </script>
+ <input type="text" id="businessname" placeholder="<%=ResourceLoader.GetResource(session, "items.import.bizname")%>">
+ </div>
+ </div>
+ </div>
+
+
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse4">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4")%>
+ </a>
+ </div>
+ <div id="collapse4" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4a")%>
+
+ <Br><br>
+ <div id="preview"></div>
+ <a class="btn btn-info" onclick="javascript:save(true);"><i class="icon-eye-open icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.preview")%></a>
+ <a class="btn btn-primary" onclick="javascript:save(false);"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
+ </div>
+ </div>
+ </div>
- <div class="accordion-group">
- <div class="accordion-heading">
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse4">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4")%>
- </a>
- </div>
- <div id="collapse4" class="accordion-body collapse">
- <div class="accordion-inner">
- <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step4a")%>
-
- <Br><br>
- <div id="preview"></div>
- <a class="btn btn-info" onclick="javascript:save(true);"><i class="icon-eye-open icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.preview")%></a>
- <a class="btn btn-primary" onclick="javascript:save(false);"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
</div>
- </div>
- </div>
-
- </div>
+ </div>
</div>
- </div>
- <%@include file="businessChooser.jsp" %>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ <%@include file="businessChooser.jsp" %>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/settings.jsp?rev=1557292&r1=1557291&r2=1557292&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/settings.jsp Sat Jan 11 00:30:24 2014
@@ -53,7 +53,7 @@
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 ");
- if (key.startsWith("client") && !key.startsWith("client.nodes")) {
+ if ((key.startsWith("client") && !key.startsWith("client.nodes")) || key.startsWith("config.props")) {
out.write("class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\"");
}
out.write(">");
Added: juddi/trunk/uddi-tck-base/src/main/resources/keystore.jks
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/keystore.jks?rev=1557292&view=auto
==============================================================================
Binary file - no diff available.
Propchange: juddi/trunk/uddi-tck-base/src/main/resources/keystore.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: juddi/trunk/uddi-tck-base/src/main/resources/truststore.jks
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/truststore.jks?rev=1557292&view=auto
==============================================================================
Binary file - no diff available.
Propchange: juddi/trunk/uddi-tck-base/src/main/resources/truststore.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org