Menu
▾
▴
[Exist-commits] SF.net SVN: exist:[9599] trunk/eXist/src/org/exist/xquery/functions
|
From: <ix...@us...> - 2009-07-31 05:46:46
|
Revision: 9599
http://exist.svn.sourceforge.net/exist/?rev=9599&view=rev
Author: ixitar
Date: 2009-07-31 05:46:38 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
[ignore] removing all of the logger calls for entering and exiting from the function modules.
Modified Paths:
--------------
trunk/eXist/src/org/exist/xquery/functions/request/GetContextPath.java
trunk/eXist/src/org/exist/xquery/functions/request/GetCookieNames.java
trunk/eXist/src/org/exist/xquery/functions/request/GetCookieValue.java
trunk/eXist/src/org/exist/xquery/functions/request/GetData.java
trunk/eXist/src/org/exist/xquery/functions/request/GetExists.java
trunk/eXist/src/org/exist/xquery/functions/request/GetHeader.java
trunk/eXist/src/org/exist/xquery/functions/request/GetHeaderNames.java
trunk/eXist/src/org/exist/xquery/functions/request/GetHostname.java
trunk/eXist/src/org/exist/xquery/functions/request/GetMethod.java
trunk/eXist/src/org/exist/xquery/functions/request/GetParameter.java
trunk/eXist/src/org/exist/xquery/functions/request/GetParameterNames.java
trunk/eXist/src/org/exist/xquery/functions/request/GetPathInfo.java
trunk/eXist/src/org/exist/xquery/functions/request/GetQueryString.java
trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteAddr.java
trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteHost.java
trunk/eXist/src/org/exist/xquery/functions/request/GetRemotePort.java
trunk/eXist/src/org/exist/xquery/functions/request/GetRequestAttribute.java
trunk/eXist/src/org/exist/xquery/functions/request/GetServerName.java
trunk/eXist/src/org/exist/xquery/functions/request/GetServerPort.java
trunk/eXist/src/org/exist/xquery/functions/request/GetURI.java
trunk/eXist/src/org/exist/xquery/functions/request/GetURL.java
trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFile.java
trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileName.java
trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileSize.java
trunk/eXist/src/org/exist/xquery/functions/request/SetAttribute.java
trunk/eXist/src/org/exist/xquery/functions/session/Clear.java
trunk/eXist/src/org/exist/xquery/functions/session/Create.java
trunk/eXist/src/org/exist/xquery/functions/session/EncodeURL.java
trunk/eXist/src/org/exist/xquery/functions/session/GetAttribute.java
trunk/eXist/src/org/exist/xquery/functions/session/GetAttributeNames.java
trunk/eXist/src/org/exist/xquery/functions/session/GetExists.java
trunk/eXist/src/org/exist/xquery/functions/session/GetID.java
trunk/eXist/src/org/exist/xquery/functions/session/Invalidate.java
trunk/eXist/src/org/exist/xquery/functions/session/RemoveAttribute.java
trunk/eXist/src/org/exist/xquery/functions/session/SetAttribute.java
trunk/eXist/src/org/exist/xquery/functions/session/SetCurrentUser.java
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetContextPath.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetContextPath.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetContextPath.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -63,8 +63,7 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
-
+
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
// request object is read from global variable $request
@@ -76,7 +75,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
if (isCalledAs("get-context-path"))
return new StringValue(((RequestWrapper) value.getObject()).getContextPath());
else
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetCookieNames.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetCookieNames.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetCookieNames.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -67,14 +67,11 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException
{
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
-
RequestModule myModule = (RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
// request object is read from global variable $request
Variable var = myModule.resolveVariable(RequestModule.REQUEST_VAR);
if (var == null || var.getValue() == null || var.getValue().getItemType() != Type.JAVA_OBJECT) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
@@ -93,11 +90,9 @@
names.add(new StringValue(cookies[c].getName()));
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return names;
}
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
else
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetCookieValue.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetCookieValue.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetCookieValue.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -70,14 +70,11 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException
{
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
-
RequestModule myModule = (RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
// request object is read from global variable $request
Variable var = myModule.resolveVariable(RequestModule.REQUEST_VAR);
if (var == null || var.getValue() == null || var.getValue().getItemType() != Type.JAVA_OBJECT) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
@@ -94,13 +91,11 @@
{
if(cookies[c].getName().equals(cookieName))
{
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(cookies[c].getValue());
}
}
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
else
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetData.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetData.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetData.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -94,7 +94,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)throws XPathException
{
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -156,7 +155,6 @@
if(!mimeType.isXMLType())
{
//binary data
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new Base64Binary(bufRequestData);
}
}
@@ -178,7 +176,6 @@
reader.setContentHandler(receiver);
reader.parse(src);
Document doc = receiver.getDocument();
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return (NodeValue)doc.getDocumentElement();
}
catch(ParserConfigurationException e)
@@ -207,7 +204,6 @@
try
{
String s = new String(bufRequestData, encoding);
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(s);
}
catch (IOException e)
@@ -218,7 +214,6 @@
else
{
//no post data
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
}
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetExists.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetExists.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetExists.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -65,7 +65,6 @@
public Sequence eval( Sequence[] args, Sequence contextSequence ) throws XPathException
{
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
BooleanValue exists = BooleanValue.TRUE;
@@ -78,7 +77,6 @@
exists = BooleanValue.FALSE;
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return( exists );
}
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetHeader.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetHeader.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetHeader.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -72,7 +72,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule) context
.getModule(RequestModule.NAMESPACE_URI);
@@ -91,7 +90,6 @@
if (value.getObject() instanceof RequestWrapper) {
String headerValue = ((RequestWrapper) value.getObject())
.getHeader(param);
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
if (headerValue == null) {
return Sequence.EMPTY_SEQUENCE;
} else {
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetHeaderNames.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetHeaderNames.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetHeaderNames.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -72,7 +72,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -92,7 +91,6 @@
String param = (String) e.nextElement();
result.add(new StringValue(param));
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return result;
}
else
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetHostname.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetHostname.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetHostname.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -72,7 +72,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -86,7 +85,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(((RequestWrapper) value.getObject()).getRemoteHost());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetMethod.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetMethod.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetMethod.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -63,7 +63,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -76,7 +75,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(((RequestWrapper) value.getObject()).getMethod());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetParameter.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetParameter.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetParameter.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -105,7 +105,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -122,7 +121,6 @@
if( failOnError ) {
throw new XPathException(this, "Variable $request is not bound to an Java object.");
} else {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return args[1];
}
}
@@ -133,7 +131,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
String[] values = ((RequestWrapper)value.getObject()).getParameterValues(param);
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
if (values == null || values.length == 0) {
return args[1];
}
@@ -146,7 +143,6 @@
if( failOnError ) {
throw new XPathException(this, "Variable $request is not bound to a Request object.");
} else {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return args[1];
}
}
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetParameterNames.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetParameterNames.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetParameterNames.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -79,7 +79,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -100,7 +99,6 @@
String param = (String) e.nextElement();
result.add(new StringValue(param));
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return result;
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetPathInfo.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetPathInfo.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetPathInfo.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -64,7 +64,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -78,7 +77,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
String path = ((RequestWrapper) value.getObject()).getPathInfo();
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(path == null ? "" : path);
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetQueryString.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetQueryString.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetQueryString.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -64,7 +64,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -79,7 +78,6 @@
if (value.getObject() instanceof RequestWrapper)
{
String queryString = ((RequestWrapper) value.getObject()).getQueryString();
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
if(queryString != null)
{
return new StringValue(queryString);
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteAddr.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteAddr.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteAddr.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -63,7 +63,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -77,7 +76,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(((RequestWrapper) value.getObject()).getRemoteAddr());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteHost.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteHost.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetRemoteHost.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -63,7 +63,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -76,7 +75,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(((RequestWrapper) value.getObject()).getRemoteHost());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetRemotePort.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetRemotePort.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetRemotePort.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -63,7 +63,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -76,7 +75,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new IntegerValue(((RequestWrapper) value.getObject()).getRemotePort());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetRequestAttribute.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetRequestAttribute.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetRequestAttribute.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -68,7 +68,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
String name = args[0].getStringValue();
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -83,7 +82,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
Object attrib = ((RequestWrapper) value.getObject()).getAttribute(name);
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return attrib == null ? Sequence.EMPTY_SEQUENCE : XPathUtil.javaObjectToXPath(attrib, context);
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetServerName.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetServerName.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetServerName.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -72,7 +72,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -85,7 +84,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(((RequestWrapper) value.getObject()).getServerName());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetServerPort.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetServerPort.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetServerPort.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -72,7 +72,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -85,7 +84,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new IntegerValue(((RequestWrapper) value.getObject()).getServerPort());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetURI.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetURI.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetURI.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -71,7 +71,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -85,7 +84,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new AnyURIValue(((RequestWrapper) value.getObject()).getRequestURI());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetURL.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetURL.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetURL.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -63,7 +63,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -77,7 +76,6 @@
JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
if (value.getObject() instanceof RequestWrapper) {
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new StringValue(((RequestWrapper) value.getObject()).getRequestURL().toString());
} else
throw new XPathException(this, "Variable $request is not bound to a Request object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFile.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFile.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFile.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -90,7 +90,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -110,10 +109,10 @@
RequestWrapper request = (RequestWrapper)value.getObject();
File file = request.getFileUploadParam(uploadParamName);
if(file == null) {
- LOG.debug("File param not found: " + uploadParamName);
+ logger.debug("File param not found: " + uploadParamName);
return Sequence.EMPTY_SEQUENCE;
} else
- LOG.debug("Uploaded file: " + file.getAbsolutePath());
+ logger.debug("Uploaded file: " + file.getAbsolutePath());
if(isCalledAs("get-uploaded-file-data"))
@@ -130,7 +129,6 @@
baos.write(buf, 0, read);
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new Base64Binary(baos.toByteArray());
}
@@ -152,14 +150,13 @@
}
catch (IOException ioe)
{
- LOG.warn(ioe.getMessage(), ioe);
+ logger.warn(ioe.getMessage(), ioe);
}
}
}
}
else
{
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
return new JavaObjectValue(file);
}
}
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileName.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileName.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileName.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -67,7 +67,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -86,7 +85,6 @@
if (value.getObject() instanceof RequestWrapper) {
RequestWrapper request = (RequestWrapper)value.getObject();
String fname = request.getUploadedFileName(uploadParamName);
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
if(fname == null) {
return Sequence.EMPTY_SEQUENCE;
}
Modified: trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileSize.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileSize.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/GetUploadedFileSize.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -69,7 +69,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule =
(RequestModule) context.getModule(RequestModule.NAMESPACE_URI);
@@ -88,7 +87,6 @@
if (value.getObject() instanceof RequestWrapper) {
RequestWrapper request = (RequestWrapper)value.getObject();
File file = request.getFileUploadParam(uploadParamName);
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
if(file == null) {
return Sequence.EMPTY_SEQUENCE;
}
Modified: trunk/eXist/src/org/exist/xquery/functions/request/SetAttribute.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/request/SetAttribute.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/request/SetAttribute.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -69,8 +69,6 @@
*/
public Sequence eval (Sequence contextSequence, Item contextItem ) throws XPathException
{
- logger.info("Entering " + RequestModule.PREFIX + ":" + getName().getLocalName());
-
if( context.getProfiler().isEnabled() ) {
context.getProfiler().start( this );
context.getProfiler().message( this, Profiler.DEPENDENCIES, "DEPENDENCIES", Dependency.getDependenciesName( this.getDependencies() ) );
@@ -109,8 +107,6 @@
throw( new XPathException( this, "Type error: variable $request is not bound to a request object" ) );
}
- logger.info("Exiting " + RequestModule.PREFIX + ":" + getName().getLocalName());
-
return( Sequence.EMPTY_SEQUENCE );
}
}
Modified: trunk/eXist/src/org/exist/xquery/functions/session/Clear.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/Clear.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/Clear.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -65,7 +65,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
SessionModule myModule = (SessionModule) context.getModule(SessionModule.NAMESPACE_URI);
@@ -85,7 +84,6 @@
String attribName = (String) e.nextElement();
sessionWrapper.removeAttribute(attribName);
}
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
else
Modified: trunk/eXist/src/org/exist/xquery/functions/session/Create.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/Create.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/Create.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -71,10 +71,8 @@
*/
public Sequence eval( Sequence[] args, Sequence contextSequence ) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
SessionModule.createSession( context, this );
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return( Sequence.EMPTY_SEQUENCE );
}
Modified: trunk/eXist/src/org/exist/xquery/functions/session/EncodeURL.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/EncodeURL.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/EncodeURL.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -80,8 +80,6 @@
Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
-
ResponseModule myModule = (ResponseModule)context.getModule(ResponseModule.NAMESPACE_URI);
// request object is read from global variable $response
@@ -99,7 +97,6 @@
JavaObjectValue value = (JavaObjectValue)
var.getValue().itemAt(0);
if(value.getObject() instanceof ResponseWrapper) {
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return new AnyURIValue(((ResponseWrapper)value.getObject()).encodeURL(url));
} else {
throw new XPathException(this, "Variable $response is not bound to a Response object.");
Modified: trunk/eXist/src/org/exist/xquery/functions/session/GetAttribute.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/GetAttribute.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/GetAttribute.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -83,7 +83,6 @@
*/
public Sequence eval( Sequence contextSequence, Item contextItem ) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
SessionModule myModule = (SessionModule)context.getModule(SessionModule.NAMESPACE_URI);
@@ -92,7 +91,6 @@
if( var == null || var.getValue() == null ) {
// throw( new XPathException( this, "Session not set" ) );
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return( Sequence.EMPTY_SEQUENCE );
}
@@ -108,7 +106,6 @@
if( session.getObject() instanceof SessionWrapper ) {
try {
Object o = ( (SessionWrapper)session.getObject() ).getAttribute( attribName );
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
if( o == null ) {
return( Sequence.EMPTY_SEQUENCE );
}
@@ -125,7 +122,6 @@
//log.error(ise.getStackTrace());
//throw new XPathException(this, "Session has an IllegalStateException for getAttribute() - " + ise.getStackTrace() + System.getProperty("line.separator") + System.getProperty("line.separator") + "Did you perhaps call session:invalidate() previously?");
- logger.error("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName(), ise);
return( Sequence.EMPTY_SEQUENCE );
}
} else {
Modified: trunk/eXist/src/org/exist/xquery/functions/session/GetAttributeNames.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/GetAttributeNames.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/GetAttributeNames.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -78,7 +78,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
SessionModule myModule = (SessionModule) context.getModule(SessionModule.NAMESPACE_URI);
@@ -99,7 +98,6 @@
String attribName = (String) e.nextElement();
result.add(new StringValue(attribName));
}
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return result;
}
else
Modified: trunk/eXist/src/org/exist/xquery/functions/session/GetExists.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/GetExists.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/GetExists.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -66,7 +66,6 @@
public Sequence eval( Sequence[] args, Sequence contextSequence ) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
BooleanValue exists = BooleanValue.TRUE;
SessionModule myModule = (SessionModule)context.getModule( SessionModule.NAMESPACE_URI );
@@ -78,7 +77,6 @@
exists = BooleanValue.FALSE;
}
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return( exists );
}
Modified: trunk/eXist/src/org/exist/xquery/functions/session/GetID.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/GetID.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/GetID.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -75,7 +75,6 @@
*/
public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
SessionModule myModule = (SessionModule)context.getModule(SessionModule.NAMESPACE_URI);
/* session object is read from global variable $session */
@@ -89,7 +88,6 @@
if(session.getObject() instanceof SessionWrapper)
{
String id = ((SessionWrapper)session.getObject()).getId();
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
if (id == null)
return Sequence.EMPTY_SEQUENCE;
return(new StringValue(id));
Modified: trunk/eXist/src/org/exist/xquery/functions/session/Invalidate.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/Invalidate.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/Invalidate.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -72,7 +72,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence)
throws XPathException {
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
SessionModule myModule = (SessionModule)context.getModule(SessionModule.NAMESPACE_URI);
// session object is read from global variable $session
@@ -81,7 +80,6 @@
//Always called as "invalidate") because the translation is made at compile time
if (!isCalledAs("invalidate"))
throw new XPathException(this, SessionModule.SESSION_VAR + " not set");
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
}
if(var.getValue().getItemType() != Type.JAVA_OBJECT)
@@ -90,7 +88,6 @@
if(value.getObject() instanceof SessionWrapper) {
SessionWrapper session = (SessionWrapper)value.getObject();
session.invalidate();
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return Sequence.EMPTY_SEQUENCE;
} else
throw new XPathException(this, SessionModule.SESSION_VAR + " is not bound to a session object");
Modified: trunk/eXist/src/org/exist/xquery/functions/session/RemoveAttribute.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/RemoveAttribute.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/RemoveAttribute.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -66,8 +66,6 @@
*/
public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathException {
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
-
if (context.getProfiler().isEnabled()) {
context.getProfiler().start(this);
context.getProfiler().message(this, Profiler.DEPENDENCIES, "DEPENDENCIES", Dependency.getDependenciesName(this.getDependencies()));
@@ -93,7 +91,7 @@
((SessionWrapper)session.getObject()).removeAttribute(attrib);
else
throw new XPathException(this, "Type error: variable $session is not bound to a session object");
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
+
return Sequence.EMPTY_SEQUENCE;
}
}
Modified: trunk/eXist/src/org/exist/xquery/functions/session/SetAttribute.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/SetAttribute.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/SetAttribute.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -69,8 +69,7 @@
*/
public Sequence eval( Sequence contextSequence, Item contextItem ) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
-
+
JavaObjectValue session;
if( context.getProfiler().isEnabled() ) {
@@ -110,7 +109,6 @@
throw( new XPathException( this, "Type error: variable $session is not bound to a session object" ) );
}
- logger.info("Exiting " + SessionModule.PREFIX + ":" + getName().getLocalName());
return( Sequence.EMPTY_SEQUENCE );
}
}
Modified: trunk/eXist/src/org/exist/xquery/functions/session/SetCurrentUser.java
===================================================================
--- trunk/eXist/src/org/exist/xquery/functions/session/SetCurrentUser.java 2009-07-31 05:45:57 UTC (rev 9598)
+++ trunk/eXist/src/org/exist/xquery/functions/session/SetCurrentUser.java 2009-07-31 05:46:38 UTC (rev 9599)
@@ -84,7 +84,6 @@
*/
public Sequence eval(Sequence[] args, Sequence contextSequence) throws XPathException
{
- logger.info("Entering " + SessionModule.PREFIX + ":" + getName().getLocalName());
RequestModule myModule = (RequestModule)context.getModule(RequestModule.NAMESPACE_URI);
@@ -120,7 +119,7 @@
}
else
{
- LOG.warn("Could not validate user " + userName);
+ logger.warn("Could not validate user " + userName);
return BooleanValue.FALSE;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|