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/11/02 01:17:12 UTC
[1/3] git commit: JUDDI-887 done and documented
Repository: juddi
Updated Branches:
refs/heads/master b72eba072 -> 36e9b7fe6
JUDDI-887 done and documented
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/fdbf5a07
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/fdbf5a07
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/fdbf5a07
Branch: refs/heads/master
Commit: fdbf5a0786e9c0f7e96902b1de08c2be1e270f35
Parents: b72eba0
Author: alexoree <al...@apache.org>
Authored: Sat Nov 1 19:30:47 2014 -0400
Committer: alexoree <al...@apache.org>
Committed: Sat Nov 1 19:30:47 2014 -0400
----------------------------------------------------------------------
.../en-US/GuideConfigurationServer.asciidoc | 12 ++++
.../apache/juddi/api/impl/UDDIInquiryImpl.java | 64 +++++++++++++++++---
.../src/main/webapp/WEB-INF/classes/juddiv3.xml | 4 ++
3 files changed, 70 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/fdbf5a07/docs/asciidoc/Guide/en-US/GuideConfigurationServer.asciidoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/Guide/en-US/GuideConfigurationServer.asciidoc b/docs/asciidoc/Guide/en-US/GuideConfigurationServer.asciidoc
index 0edeac4..fbe195e 100644
--- a/docs/asciidoc/Guide/en-US/GuideConfigurationServer.asciidoc
+++ b/docs/asciidoc/Guide/en-US/GuideConfigurationServer.asciidoc
@@ -145,6 +145,18 @@ RMI Proxy properties that can be referenced in the _juddiv3.xml_ file and is onl
|===========================================================================================
+=== Logging
+
+.These properties are used to enable additional logging capabilities.
+
+Logging properties that can be referenced in the _juddiv3.xml_ file.
+[options="header"]
+|===========================================================================================
+|Property Name |Description |Required |Default Value or [Example Value]
+|_juddi/logging/logInquirySearchPayloads| Enables request payload logging for the Inquiry Find apis |N| false
+|===========================================================================================
+
+
=== Deploying two or more jUDDI server on the same application server
http://git-wip-us.apache.org/repos/asf/juddi/blob/fdbf5a07/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
index 416185e..ee0627b 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
@@ -17,25 +17,22 @@
package org.apache.juddi.api.impl;
+import java.io.File;
+import java.io.FileOutputStream;
import java.util.List;
-import java.util.UUID;
-
import javax.jws.WebService;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
-
+import javax.xml.bind.JAXB;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api.util.InquiryQuery;
-import org.apache.juddi.api.util.PublicationQuery;
import org.apache.juddi.api.util.QueryStatus;
import org.apache.juddi.config.AppConfig;
import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.config.Property;
import org.apache.juddi.mapping.MappingModelToApi;
-import org.apache.juddi.model.TempKey;
-import org.apache.juddi.query.util.FindQualifiers;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.InvalidKeyPassedException;
import org.apache.juddi.validation.ValidateInquiry;
@@ -73,13 +70,58 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry
private static Log log = LogFactory.getLog(UDDIInquiryImpl.class);
+
+ private static boolean isLogRequestPayloads() {
+ boolean result = false;
+ try {
+ result = AppConfig.getConfiguration().getBoolean(Property.JUDDI_LOGGING_FindApiCalls, false);
+ } catch (ConfigurationException e) {
+ log.error("Configuration exception occurred retrieving: " + Property.JUDDI_LOGGING_FindApiCalls, e);
+ }
+ return result;
+ }
private UDDIServiceCounter serviceCounter;
public UDDIInquiryImpl() {
super();
serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIInquiryImpl.class);
}
-
+
+
+ private static void LogFindRelatedBusinessRequest(FindRelatedBusinesses request) {
+ request.setAuthInfo(null);
+ LogRequest(request);
+ }
+ private static void LogFindBindingRequest(FindBinding request) {
+ request.setAuthInfo(null);
+ LogRequest(request);
+ }
+ private static void LogFindTModelRequest(FindTModel request) {
+ request.setAuthInfo(null);
+ LogRequest(request);
+ }
+ private static void LogFindServiceRequest(FindService request) {
+ request.setAuthInfo(null);
+ LogRequest(request);
+ }
+ private static void LogFindBusinessRequest(FindBusiness request) {
+ request.setAuthInfo(null);
+ LogRequest(request);
+ }
+ private static synchronized void LogRequest(Object request) {
+ if (isLogRequestPayloads())
+ try {
+ File f = new File(System.currentTimeMillis()+".xml");
+ FileOutputStream fos = new FileOutputStream(f);
+ JAXB.marshal(request, fos);
+ fos.close();
+ f = null;
+ } catch (Exception ex) {
+ logger.warn("Unable to log request payload", ex);
+ }
+ }
+
+
public BindingDetail findBinding(FindBinding body)
throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
@@ -99,6 +141,7 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry
if (isAuthenticated())
this.getEntityPublisher(em, body.getAuthInfo());
+ LogFindBindingRequest(body);
org.apache.juddi.query.util.FindQualifiers findQualifiers = new org.apache.juddi.query.util.FindQualifiers();
findQualifiers.mapApiFindQualifiers(body.getFindQualifiers());
@@ -151,7 +194,7 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry
if (isAuthenticated())
this.getEntityPublisher(em, body.getAuthInfo());
-
+ LogFindBusinessRequest(body);
org.apache.juddi.query.util.FindQualifiers findQualifiers = new org.apache.juddi.query.util.FindQualifiers();
findQualifiers.mapApiFindQualifiers(body.getFindQualifiers());
@@ -191,6 +234,7 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry
if (isAuthenticated())
this.getEntityPublisher(em, body.getAuthInfo());
+ LogFindRelatedBusinessRequest(body);
// TODO: findQualifiers aren't really used for this call, except maybe for sorting. Sorting must be done in Java due to the retrieval method used. Right now
// no sorting is performed.
@@ -231,7 +275,7 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry
if (isAuthenticated())
this.getEntityPublisher(em, body.getAuthInfo());
-
+ LogFindServiceRequest(body);
org.apache.juddi.query.util.FindQualifiers findQualifiers = new org.apache.juddi.query.util.FindQualifiers();
findQualifiers.mapApiFindQualifiers(body.getFindQualifiers());
@@ -286,7 +330,7 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry
if (isAuthenticated())
this.getEntityPublisher(em, body.getAuthInfo());
-
+ LogFindTModelRequest(body);
org.apache.juddi.query.util.FindQualifiers findQualifiers = new org.apache.juddi.query.util.FindQualifiers();
findQualifiers.mapApiFindQualifiers(body.getFindQualifiers());
http://git-wip-us.apache.org/repos/asf/juddi/blob/fdbf5a07/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
index 330f71d..3468b3d 100644
--- a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
+++ b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
@@ -189,5 +189,9 @@
<password encrypted="false">pass</password>-->
</smtp>
</mail>
+
+ <logging>
+ <logInquirySearchPayloads>false</logInquirySearchPayloads>
+ </logging>
</juddi>
</config>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[2/3] git commit: JUDDI-887 fixed (again)
Posted by al...@apache.org.
JUDDI-887 fixed (again)
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/618fa4b8
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/618fa4b8
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/618fa4b8
Branch: refs/heads/master
Commit: 618fa4b80639262238905f1625d9f27c33d8719a
Parents: fdbf5a0
Author: alexoree <al...@apache.org>
Authored: Sat Nov 1 19:32:44 2014 -0400
Committer: alexoree <al...@apache.org>
Committed: Sat Nov 1 19:32:44 2014 -0400
----------------------------------------------------------------------
juddi-core/src/main/java/org/apache/juddi/config/Property.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/618fa4b8/juddi-core/src/main/java/org/apache/juddi/config/Property.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Property.java b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
index 358da8d..18d15a6 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/Property.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
@@ -184,4 +184,10 @@ public interface Property {
* @since 3.2.1
*/
public static final String JUDDI_AUTHENTICATOR_HTTP_HEADER_NAME="juddi.auth.authenticator.header";
+
+ /**
+ * Records inquiry find* requests to disk, sans auth token
+ * @since 3.2.1
+ */
+ public final static String JUDDI_LOGGING_FindApiCalls = "juddi.logging.logInquirySearchPayloads";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[3/3] git commit: JUDDI-885 fixed
Posted by al...@apache.org.
JUDDI-885 fixed
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/36e9b7fe
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/36e9b7fe
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/36e9b7fe
Branch: refs/heads/master
Commit: 36e9b7fe6fdfefe169d8182e0310d189102c7d3b
Parents: 618fa4b
Author: alexoree <al...@apache.org>
Authored: Sat Nov 1 20:16:59 2014 -0400
Committer: alexoree <al...@apache.org>
Committed: Sat Nov 1 20:16:59 2014 -0400
----------------------------------------------------------------------
.../org/apache/juddi/webconsole/resources/web.properties | 1 +
.../org/apache/juddi/webconsole/resources/web_es.properties | 1 +
juddi-gui/src/main/webapp/ajax/deletebinding.jsp | 4 ++++
juddi-gui/src/main/webapp/bindingEditor.jsp | 8 +++++++-
4 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
index 81a2dcf..106e855 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
@@ -436,3 +436,4 @@ items.business.noservice=Please save the business first, then you can add servic
actions.popout=Popout
items.categorizations=Categorizations
items.categorizations.uddi=UDDI Categorizations
+actions.return=Return
http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
index 61ebda9..31a64b3 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
@@ -439,3 +439,4 @@ items.business.noservice=Por favor, guarde el negocio en primer lugar, a continu
actions.popout=Salir
items.categorizations=Categorizaciones
items.categorizations.uddi=UDDI Categorizaciones
+actions.return=Volver
http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/ajax/deletebinding.jsp b/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
index 66452df..2cc21dd 100644
--- a/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
+++ b/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -14,10 +15,13 @@
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, request.getSession());
String msg = (x.deleteBinding(request.getParameter("id")));
+ String svcid = ((request.getParameter("svcid")));
if (msg.contains(ResourceLoader.GetResource(session, "errors.generic"))) {
response.setStatus(406);
}
out.write(msg);
+ if (svcid!=null)
+ out.write("<a href=\"serviceEditor.jsp?id=" + StringEscapeUtils.escapeHtml(svcid.trim()) + "\">" +ResourceLoader.GetResource(session, "actions.return") +"</a>");
}
%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/webapp/bindingEditor.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/bindingEditor.jsp b/juddi-gui/src/main/webapp/bindingEditor.jsp
index a4e1983..a0699c7 100644
--- a/juddi-gui/src/main/webapp/bindingEditor.jsp
+++ b/juddi-gui/src/main/webapp/bindingEditor.jsp
@@ -682,8 +682,14 @@
var postbackdata = new Array();
postbackdata.push({
name: "id",
- value: $("#" + "<%=PostBackConstants.BINDINGKEY%>").text()
+ value: $("#" + "<%=PostBackConstants.BINDINGKEY%>").text().trim()
});
+ postbackdata.push({
+ name: "svcid",
+ value: $("#" + "<%=PostBackConstants.SERVICEKEY %>").text().trim()
+ });
+
+
postbackdata.push({
name: "nonce",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org