Author: alexoree
Date: Sat Nov 16 02:44:20 2013
New Revision: 1542452
URL: http://svn.apache.org/r1542452
Log:
JUDDI-710 updating the config page for the admin console. reducing build
logging from the TckBusiness
Modified:
juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml
juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
Modified: juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml?rev=1542452&r1=1542451&r2=1542452&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml Sat Nov 16
02:44:20 2013
@@ -17,6 +17,20 @@
<subscriptionListenerUrl>http://localhost:8080/juddiv3/services/subscription-listener</subscriptionListenerUrl>
<juddiApiUrl>http://localhost:8080/juddiv3/services/juddi-api</juddiApiUrl>
</node>
+ <node>
+ <!-- required 'default' node -->
+ <name>invm</name>
+ <description>This server</description>
+ <!-- JAX-WS Transport -->
+
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+
<securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+
<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+
<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ </node>
</nodes>
<signature>
<!-- signing stuff (not used)-->
@@ -75,7 +89,7 @@
<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>
</props>
</config>
</uddi>
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=1542452&r1=1542451&r2=1542452&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 Nov
16 02:44:20 2013
@@ -15,11 +15,22 @@
if (request.getMethod().equalsIgnoreCase("POST")) {
try {
Enumeration it = request.getParameterNames();
- Configuration cfg = AppConfig.getConfiguration();
+ Configuration cfg = null;
+ Configuration server = AppConfig.getConfiguration();
+ Configuration client = UddiAdminHub.getInstance(application,
session).GetJuddiClientConfig().getConfiguration();
while (it.hasMoreElements()) {
String key = (String) it.nextElement();
String val = request.getParameter(key);
if (key != "nonce") {
+ if (key.startsWith("config.props.") ||
key.startsWith("client.")) {
+ cfg = client;
+ }
+ if (key.startsWith("juddi.")) {
+ cfg = server;
+ }
+ if (cfg == null) {
+ continue;
+ }
boolean isbool = false;
boolean isint = false;
boolean boolval = false;
@@ -41,9 +52,11 @@
} else {
cfg.setProperty(key, val);
}
-
+ cfg = null;
}
+
UddiAdminHub.getInstance(application,session).GetJuddiClientConfig().saveConfig();
+ //note server config is autosave.
}
out.write("<i class=\"icon-thumbs-up icon-2x\"> Saved!");
} catch (Exception ex) {
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=1542452&r1=1542451&r2=1542452&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/configure.jsp Sat Nov 16
02:44:20 2013
@@ -40,16 +40,36 @@
Iterator it =
AppConfig.getConfiguration().getKeys();
while (it.hasNext()) {
String key = (String) it.next();
- if (!key.equalsIgnoreCase("nonce")) {
+ if (!key.equalsIgnoreCase("nonce")
+ && key.startsWith("juddi.")) {
out.write("<tr ><td>" +
StringEscapeUtils.escapeHtml(key) + "</td><td><div ");
- if (key.startsWith("juddi.")) {
- out.write(" id=\"" +
StringEscapeUtils.escapeHtml(key) + "\" class=\"edit\"");
- }
+ out.write(" id=\"" +
StringEscapeUtils.escapeHtml(key) + "\" class=\"edit\"");
out.write(">" +
StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getProperty(key).toString())
+ "</div></td></tr>");
}
}
%>
</table>
+
+ <h2>Admin Console Config (this web site)</h2>
+ <table class="table table-hover">
+ <tr><th>Field</th><th>Value</th></tr>
+ <%
+ UddiAdminHub ahub =
UddiAdminHub.getInstance(application, session);
+ it =
ahub.GetJuddiClientConfig().getConfiguration().getKeys();
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ if (!key.equalsIgnoreCase("nonce")
+ && (key.startsWith("config.props.")
+ || key.startsWith("client."))) {
+ out.write("<tr ><td>" +
StringEscapeUtils.escapeHtml(key) + "</td><td><div ");
+ out.write(" id=\"" +
StringEscapeUtils.escapeHtml(key) + "\" class=\"edit\"");
+ out.write(">" +
StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getProperty(key).toString())
+ "</div></td></tr>");
+ }
+ }
+ %>
+ </table>
+
+
<script type="text/javascript">
function save()
{
@@ -97,7 +117,30 @@
Reedit();
</script>
<a class="btn btn-primary"
href="javascript:save();">Save</a><br><br>
+
+
<div id="saveConfigresultBar" class="well-small"></div>
+
+ <h2>Debug Information</h2>
+ <table class="table table-hover">
+ <tr><th>Field</th><th>Value</th></tr>
+ <%
+
+ it = AppConfig.getConfiguration().getKeys();
+ while (it.hasNext()) {
+ String key = (String) it.next();
+
+ if (!key.equalsIgnoreCase("nonce")
+ && !key.startsWith("juddi.")
+ && !key.startsWith("client.")
+ && key.startsWith("config.props.")) {
+ out.write("<tr ><td>" +
StringEscapeUtils.escapeHtml(key) + "</td><td><div ");
+
+ out.write(">" +
StringEscapeUtils.escapeHtml(AppConfig.getConfiguration().getProperty(key).toString())
+ "</div></td></tr>");
+ }
+ }
+ %>
+ </table>
</div>
</div>
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1542452&r1=1542451&r2=1542452&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
Sat Nov 16 02:44:20 2013
@@ -15,7 +15,6 @@
package org.apache.juddi.v3.tck;
import java.io.File;
-import java.io.FileInputStream;
import java.net.URL;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
@@ -26,7 +25,6 @@ import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.Certificate;
-import java.util.Arrays;
import java.util.List;
import javax.xml.bind.JAXB;
import javax.xml.transform.dom.DOMResult;
@@ -38,12 +36,9 @@ import org.apache.juddi.jaxb.EntityCreat
import org.junit.Assert;
import org.uddi.api_v3.BusinessDetail;
import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.DeleteBusiness;
import org.uddi.api_v3.Description;
import org.uddi.api_v3.GetBusinessDetail;
-import org.uddi.api_v3.KeyedReference;
-import org.uddi.api_v3.KeyedReferenceGroup;
import org.uddi.api_v3.SaveBusiness;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
@@ -78,12 +73,16 @@ public class TckBusiness
private Log logger = LogFactory.getLog(this.getClass());
private UDDIPublicationPortType publication = null;
private UDDIInquiryPortType inquiry = null;
-
+ private boolean serialize=false;
public TckBusiness(UDDIPublicationPortType publication,
UDDIInquiryPortType inquiry) {
super();
this.publication = publication;
this.inquiry = inquiry;
+ serialize = false;
+ if (System.getProperty("debug")!=null &&
+ System.getProperty("debug").equalsIgnoreCase("true"))
+ serialize=true;
}
public void saveSamSyndicatorBusiness(String authInfoSam) {
@@ -113,7 +112,7 @@ public class TckBusiness
}
public void saveJoePublisherBusiness(String authInfoJoe) {
- saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY,
false);
+ saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY,
serialize);
}
public void saveCombineCatBagsPublisherBusiness(String authInfoJoe) {
@@ -299,7 +298,8 @@ public class TckBusiness
sb.getBusinessEntity().add(beIn);
BusinessDetail saveBusiness = publication.saveBusiness(sb);
logger.info("Business saved with key " +
saveBusiness.getBusinessEntity().get(0).getBusinessKey());
- JAXB.marshal(saveBusiness, System.out);
+ if (serialize)
+ JAXB.marshal(saveBusiness, System.out);
// Now get the entity and check the values
GetBusinessDetail gb = new GetBusinessDetail();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
