[Yanel-dev] Debug instead of Warning
Cedric Staub
cedric.staub at wyona.com
Mon Jan 31 15:09:32 CET 2011
On Fri, Jan 28, 2011 at 05:11:02PM +0000, Rob Adamson wrote:
> On 28 January 2011 07:09, basZero <baszero at gmail.com> wrote:
> > Hi,
> > another super simple patch.
> > I would actually wish that you would go through all yanel classes and check
> > all lines with log.warn and check whether these are really warnings for the
> > operators running a system in production.
>
> I second this :)
Ok guys, I wrote a shell script that goes through all Java source files
and replaces every occurence of lines like:
log.warn("DEBUG: ...");
log.error("DEBUG: ...");
With the more appropriate:
log.debug("...");
I ran the script on the latest revision of Yanel and the result is a
patch that you can find as an attachment to this email.
For reference, here's the script (but you need zsh to run it):
----------
for f in $(grep -l "log.error(\"DEBUG: " **/*.java); do
sed 's/log.error("DEBUG: /log.debug("/g' -i $f;
done
for f in $(grep -l "log.warn(\"DEBUG: " **/*.java); do
sed 's/log.warn("DEBUG: /log.debug("/g' -i $f;
done
----------
@Michael: Can we get this commited quickly? It makes the log files much
cleaner and therefore more useful.
Cheers,
Cedric
-------------- next part --------------
Index: src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java
===================================================================
--- src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java (revision 56388)
+++ src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java (working copy)
@@ -147,7 +147,7 @@
}
if (isBinaryRelease) {
//log("DEBUG: This is a binary release! (Resource: " + srcAttr + ")");
- //log.warn("DEBUG: This is a binary release!");
+ //log.debug("This is a binary release!");
if (copyDirNameAttr.equals("") && packageAttr.equals("")) {
log("INFO: Insert the package name of the resource '" + srcAttr + "' automatically.");
rtElement.setAttribute("package", getJavaPackageOfResourceType(srcAttr));
@@ -190,7 +190,7 @@
* @param globalResourceTypesConfig Copied resource types configuration file (see build/classes/resource-types.xml)
*/
private void insertPackageAttribute(File globalResourceTypesConfig) {
- log.warn("DEBUG: Patch file: " + globalResourceTypesConfig);
+ log.debug("Patch file: " + globalResourceTypesConfig);
try {
Document doc = XMLHelper.readDocument(new java.io.FileInputStream(globalResourceTypesConfig));
Element[] resourceTypeElements = XMLHelper.getChildElements(doc.getDocumentElement(), "resource-type", NAMESPACE);
@@ -198,12 +198,12 @@
if (!resourceTypeElements[i].hasAttribute("copy-dir-name")) {
if (!resourceTypeElements[i].hasAttribute("package")) {
String srcAttr = resourceTypeElements[i].getAttribute("src");
- log.warn("DEBUG: Set package automatically for resource type: " + srcAttr);
+ log.debug("Set package automatically for resource type: " + srcAttr);
resourceTypeElements[i].setAttribute("package", getJavaPackageOfResourceType(srcAttr));
}
}
}
- log.warn("DEBUG: Overwrite file: " + globalResourceTypesConfig);
+ log.debug("Overwrite file: " + globalResourceTypesConfig);
XMLHelper.writeDocument(doc, new java.io.FileOutputStream(globalResourceTypesConfig));
} catch(Exception e) {
log.error(e, e);
Index: src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java
===================================================================
--- src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java (revision 56388)
+++ src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java (working copy)
@@ -106,7 +106,7 @@
log.debug("Check if node is a collection: " + path);
if (repo.getNode(path.toString()).isCollection()) {
//if (repo.isCollection(path)) {
- log.error("DEBUG: Is collection within repo: " + path);
+ log.debug("Is collection within repo: " + path);
Path[] children = repo.getChildren(path);
for (int i = 0; i < children.length; i++) {
if (children[i].getName().indexOf(".yanel-rti") > 0) {
Index: src/impl/java/org/wyona/yanel/impl/resources/usecase/thread/UsecaseThread.java
===================================================================
--- src/impl/java/org/wyona/yanel/impl/resources/usecase/thread/UsecaseThread.java (revision 56388)
+++ src/impl/java/org/wyona/yanel/impl/resources/usecase/thread/UsecaseThread.java (working copy)
@@ -69,7 +69,7 @@
*/
public void attachThreadIDToRepository(org.wyona.yarep.core.Repository repository, String directoryPath) throws IllegalStateException, org.wyona.yarep.core.RepositoryException {
// Also see http://grizzly.java.net/
- log.warn("DEBUG: Java thread ID: " + getId());
+ log.debug("Java thread ID: " + getId());
String threadKey = getThreadKey(this.threadID);
String threadKeyPath = directoryPath + "/" + threadKey;
if (repository.existsNode(threadKeyPath)) {
Index: src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
===================================================================
--- src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java (revision 56388)
+++ src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java (working copy)
@@ -516,7 +516,7 @@
private void getSearchResults(Document document, Element rootElement, String searchTerm, int start) {
try {
Query query = Query.parse(searchTerm, configuration);
- //log.error("DEBUG: Query: " + query);
+ //log.debug("Query: " + query);
nutchBean = new NutchBean(configuration);
int hitsPerPage = 10;
if (request.getParameter("hitsPerPage") != null) hitsPerPage = Integer.parseInt(request.getParameter("hitsPerPage"));
Index: src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
===================================================================
--- src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java (revision 56388)
+++ src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java (working copy)
@@ -120,14 +120,14 @@
if (viewId != null && viewId.equals("get-xml")) {
if (getEnvironment().getRequest().getParameter("aggregate") != null && getEnvironment().getRequest().getParameter("aggregate").equals("true")) {
- log.warn("DEBUG: Get XML version of aggregated policy ...");
+ log.debug("Get XML version of aggregated policy ...");
sb.append(getAggregatedPolicyAsXML(getPath(), null, orderedBy, showParents));
} else {
- log.warn("DEBUG: Get XML version of policy ...");
+ log.debug("Get XML version of policy ...");
sb.append(getPoliciesAsXML(getPath(), null, orderedBy, showParents));
}
} else {
- log.warn("DEBUG: Get XHTML version of policy ...");
+ log.debug("Get XHTML version of policy ...");
sb.append(PolicyViewer.getXHTMLView(getRealm().getPolicyManager(), getRealm().getIdentityManager().getGroupManager(), getPath(), null, orderedBy, showParents, showTabs, showAbbreviatedLabels));
}
} else if (policyUsecase.equals("update")) {
@@ -163,7 +163,7 @@
String saveURL = backToRealm + getPath().substring(1) + "?" + PARAMETER_USECASE +"=update&post=policy"; // This doesn't seem to work with all browsers!
String cancelURL = getReferer(backToRealm);
- log.warn("DEBUG: Cancel URL: " + cancelURL);
+ log.debug("Cancel URL: " + cancelURL);
// TODO: i18n
String title = "Edit Access Policy of Node '" + policyPath + "'";
@@ -510,7 +510,7 @@
if(referer != null) {
java.net.URL url = new java.net.URL(referer);
String filenameQSWithoutLeadingSlash = url.getFile().substring(url.getFile().lastIndexOf("/") + 1);
- log.warn("DEBUG: Manipulated referer: '" + filenameQSWithoutLeadingSlash + "'");
+ log.debug("Manipulated referer: '" + filenameQSWithoutLeadingSlash + "'");
// IMPORTANT: The below might cause problems with certain reverse proxys, whereas with httpd and mod_proxy it seems to be fine. If this should be a problem, then either strip off the webapp and realm prefix, or use the host-page-url as base and submit a relative path using the filenameQSWithoutLeadingSlash
return replaceEntities(referer);
//return backToRealm + replaceEntities(url.getFile() + "?" + url.getQuery());
@@ -546,7 +546,7 @@
* @param showParents Show the policies of the parent nodes, which allows to figure out how the policy has been aggregated
*/
protected StringBuilder getPoliciesAsXML(String path, String contentItemId, int orderedBy, boolean showParents) throws Exception {
- log.warn("DEBUG: Get policies for path: " + path);
+ log.debug("Get policies for path: " + path);
StringBuilder sb = new StringBuilder();
sb.append("<?xml version=\"1.0\"?><policy-viewer xmlns=\"http://www.wyona.org/security/1.0\">");
@@ -607,7 +607,7 @@
* @param showParents Show the policies of the parent nodes, which allows to figure out how the policy has been aggregated
*/
protected StringBuilder getAggregatedPolicyAsXML(String path, String contentItemId, int orderedBy, boolean showParents) throws Exception {
- log.warn("DEBUG: Get aggregated policy for path: " + path);
+ log.debug("Get aggregated policy for path: " + path);
StringBuilder sb = new StringBuilder();
sb.append("<?xml version=\"1.0\"?><policy-viewer xmlns=\"http://www.wyona.org/security/1.0\">");
Index: src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
===================================================================
--- src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java (revision 56388)
+++ src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java (working copy)
@@ -139,7 +139,7 @@
if (request.getParameter("message") != null) transformer.setParameter("message", request.getParameter("message"));
}
} else {
- log.warn("DEBUG: Form not submitted yet!");
+ log.debug("Form not submitted yet!");
if (request.getParameter("message") != null) transformer.setParameter("message", request.getParameter("message"));
}
@@ -302,7 +302,7 @@
/*
File xsltFile = org.wyona.commons.io.FileUtil.file(rtd.getConfigFile().getParentFile().getAbsolutePath(), "xslt" + File.separator + "global.xsl");
- log.error("DEBUG: XSLT file: " + xsltFile);
+ log.debug("XSLT file: " + xsltFile);
return new StreamSource(xsltFile);
*/
}
Index: src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
===================================================================
--- src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java (revision 56388)
+++ src/contributions/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java (working copy)
@@ -93,7 +93,7 @@
}
//private String getNodeAsXML(com.hp.hpl.jena.rdf.model.Resource resource) {
- //log.error("DEBUG: Path: " + path);
+ //log.debug("Path: " + path);
Sitetree sitetree = getRealm().getRepoNavigation();
Node node = sitetree.getNode(getRealm(), path);
StringBuilder sb = new StringBuilder("");
Index: src/contributions/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java
===================================================================
--- src/contributions/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java (revision 56388)
+++ src/contributions/resources/atom-entry/src/java/org/wyona/yanel/impl/resources/AtomEntryResource.java (working copy)
@@ -194,7 +194,7 @@
org.apache.abdera.writer.Writer writer = abdera.getWriter();
writer.writeTo(entry, out);
- log.error("DEBUG: Atom entry has been written: " + getPath());
+ log.debug("Atom entry has been written: " + getPath());
}
/**
Index: src/contributions/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java
===================================================================
--- src/contributions/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java (revision 56388)
+++ src/contributions/resources/morelikethis/src/java/org/wyona/yanel/impl/resources/morelikethis/MoreLikeThisResource.java (working copy)
@@ -42,7 +42,7 @@
sb.append("</results>");
} else {
sb.append("<no-results/>");
- log.warn("DEBUG: No results for more like this: " + sourcePath);
+ log.debug("No results for more like this: " + sourcePath);
}
}
sb.append("</more-like-this>");
@@ -59,7 +59,7 @@
org.apache.lucene.search.similar.MoreLikeThis mlt = new org.apache.lucene.search.similar.MoreLikeThis(luceneIndexer.getIndexReader());
mlt.setFieldNames(new String[] {"_FULLTEXT"});
org.apache.lucene.search.Query query = mlt.like(repo.getNode(sourcePath).getInputStream());
- log.warn("DEBUG: Query: " + query);
+ log.debug("Query: " + query);
// Hits hits = is.search(query);
//org.wyona.yarep.impl.search.lucene.LuceneSearcher luceneSearcher = (org.wyona.yarep.impl.search.lucene.LuceneSearcher) repo.getSearcher();
return null;
Index: src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java
===================================================================
--- src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java (revision 56388)
+++ src/contributions/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResource.java (working copy)
@@ -196,7 +196,7 @@
* @see org.wyona.yanel.core.api.attributes.CreatableV1#getProperty(String)
*/
public Object getProperty(String name) {
- log.error("DEBUG: name: " + name);
+ log.debug("name: " + name);
return defaultHrefSetByCreator;
}
@@ -204,7 +204,7 @@
* @see org.wyona.yanel.core.api.attributes.CreatableV1#setProperty(String, Object)
*/
public void setProperty(String name, Object value) {
- log.error("DEBUG: name: " + name);
+ log.debug("name: " + name);
defaultHrefSetByCreator = (String) value;
}
Index: src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java
===================================================================
--- src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java (revision 56388)
+++ src/contributions/resources/wiki/src/java/org/wyona/yanel/impl/resources/WikiResource.java (working copy)
@@ -375,7 +375,7 @@
org.wyona.yarep.core.Path introspectionPath = new org.wyona.yarep.core.Path(newPath.getParent() + "/introspection-" + newPath.getName() + ".xml");
String introspectionContent = getWikiIntrospection(title, newPath.getName());
- log.error("DEBUG: Writing introspection into repository \"" + dataRepo.getName() + "\" with content:\n" + introspectionContent + "\nto path: " + introspectionPath);
+ log.debug("Writing introspection into repository \"" + dataRepo.getName() + "\" with content:\n" + introspectionContent + "\nto path: " + introspectionPath);
if (!dataRepo.existsNode(introspectionPath.toString())) {
//TODO: Add nodes recursively ...
dataRepo.getNode(introspectionPath.getParent().toString()).addNode(introspectionPath.getName(), org.wyona.yarep.core.NodeType.RESOURCE);
Index: src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java
===================================================================
--- src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java (revision 56388)
+++ src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/XHTMLBeanContentHandler.java (working copy)
@@ -37,11 +37,11 @@
*
*/
public void startDocument () throws SAXException {
- //log.warn("DEBUG: Hello from startDocument()!");
+ //log.debug("Hello from startDocument()!");
}
public void endDocument() throws SAXException {
- //log.warn("DEBUG: Hello from endDocument()!");
+ //log.debug("Hello from endDocument()!");
}
/**
@@ -49,8 +49,8 @@
*/
public void startPrefixMapping (String prefix, String uri) throws SAXException {
/*
- log.warn("DEBUG: Prefix: " + prefix);
- log.warn("DEBUG: uri: " + uri);
+ log.debug("Prefix: " + prefix);
+ log.debug("uri: " + uri);
*/
}
@@ -58,7 +58,7 @@
*
*/
public void endPrefixMapping (String prefix) throws SAXException {
- //log.warn("DEBUG: Prefix: " + prefix);
+ //log.debug("Prefix: " + prefix);
}
/**
@@ -66,9 +66,9 @@
*/
public void startElement (String uri, String localName, String qName, Attributes atts) throws SAXException {
/*
- log.warn("DEBUG: Local name: " + localName);
- log.warn("DEBUG: qName: " + qName);
- log.warn("DEBUG: uri: " + uri);
+ log.debug("Local name: " + localName);
+ log.debug("qName: " + qName);
+ log.debug("uri: " + uri);
*/
if (localName.equals("title")) {
insideTitle = true;
@@ -85,7 +85,7 @@
*
*/
public void endElement (String uri, String localName, String qName) throws SAXException {
- //log.warn("DEBUG: Local name: " + localName);
+ //log.debug("Local name: " + localName);
if (localName.equals("title")) {
insideTitle = false;
}
@@ -103,19 +103,19 @@
public void characters (char ch[], int start, int length) throws SAXException {
if (insideTitle) {
xhtmlBean.setTitle(new String(ch));
- //log.warn("DEBUG: Title: " + new String(ch));
+ //log.debug("Title: " + new String(ch));
}
if (insideMeta) {
- //log.warn("DEBUG: Meta: " + new String(ch));
+ //log.debug("Meta: " + new String(ch));
}
if (insidePara) {
- //log.warn("DEBUG: Paragraph: " + new String(ch));
+ //log.debug("Paragraph: " + new String(ch));
}
}
public void ignorableWhitespace (char ch[], int start, int length)
throws SAXException {
- //log.warn("DEBUG: Hello from ignorableWhitespace()!");
+ //log.debug("Hello from ignorableWhitespace()!");
}
public void processingInstruction (String target, String data)
Index: src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
===================================================================
--- src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java (revision 56388)
+++ src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java (working copy)
@@ -230,10 +230,10 @@
org.wyona.yarep.core.Node[] nodes = null;
String propertyName = getResourceConfigProperty("property-name");
if (propertyName != null) {
- log.warn("DEBUG: Search property '" + propertyName + "': " + query);
+ log.debug("Search property '" + propertyName + "': " + query);
nodes = getRealm().getRepository().getSearcher().searchProperty(propertyName, query, "/");
} else {
- log.warn("DEBUG: Search fulltext: " + query);
+ log.debug("Search fulltext: " + query);
nodes = getRealm().getRepository().getSearcher().search(query);
}
@@ -263,8 +263,8 @@
if (rs != null && rs.size() > 0) {
Result[] results = new Result[rs.size()];
for (int i = 0; i < rs.size(); i++) {
- //log.warn("DEBUG: Title: " + rs.get(i).title);
- //log.warn("DEBUG: Excerpt: " + rs.get(i).excerpt);
+ //log.debug("Title: " + rs.get(i).title);
+ //log.debug("Excerpt: " + rs.get(i).excerpt);
results[i] = new Result(rs.get(i).url.toString(), null, null, null, null);
//results[i] = new Result(rs.get(i).url.toString(), rs.get(i).title, rs.get(i).excerpt, null, null);
}
@@ -337,7 +337,7 @@
//parser.parse(in, new org.apache.tika.sax.WriteOutContentHandler(writer), tikaMetaData);
//String title = writer.toString().trim();
- log.warn("DEBUG: Keywords: " + tikaMetaData.get(org.apache.tika.metadata.Metadata.KEYWORDS));
+ log.debug("Keywords: " + tikaMetaData.get(org.apache.tika.metadata.Metadata.KEYWORDS));
String title = xhtmlBean.getTitle();
if (title != null && title.length() > 0) {
Index: src/contributions/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java
===================================================================
--- src/contributions/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java (revision 56388)
+++ src/contributions/resources/timeline/src/java/edu/mit/simile/yanel/impl/resources/timeline/TimelineResource.java (working copy)
@@ -32,7 +32,7 @@
public boolean exists() {
log.warn("Not really implemented yet! Needs to check if events XML exists.");
try {
- log.warn("DEBUG: Path: " + getPath() + "/" + getResourceConfigProperty("href"));
+ log.debug("Path: " + getPath() + "/" + getResourceConfigProperty("href"));
} catch(Exception e) {
log.error(e, e);
}
Index: src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java
===================================================================
--- src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java (revision 56388)
+++ src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java (working copy)
@@ -172,7 +172,7 @@
* @param requestID Request ID
*/
private User getUserForRequest(String requestID, long duration_hour) throws Exception {
- log.warn("DEBUG: Find user for request with ID: " + requestID);
+ log.debug("Find user for request with ID: " + requestID);
if (getRealm().getRepository().existsNode(getPersistentRequestPath(requestID))) {
Node requestNode = getRealm().getRepository().getNode(getPersistentRequestPath(requestID));
@@ -362,7 +362,7 @@
// TODO: Finish proxy settings replacement
String proxyHostName = realm.getProxyHostName();
- log.warn("DEBUG: Proxy host name: " + proxyHostName);
+ log.debug("Proxy host name: " + proxyHostName);
if (proxyHostName != null) {
url = new URL(url.getProtocol(), proxyHostName, url.getPort(), url.getFile());
}
Index: src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java
===================================================================
--- src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java (revision 56388)
+++ src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/calendar/CalendarResource.java (working copy)
@@ -109,12 +109,12 @@
Repository dataRepo = getRealm().getRepository();
if (dataRepo.existsNode(getPath()) && dataRepo.isResource(new org.wyona.yarep.core.Path(getPath()))) {
- log.warn("DEBUG: ICS exists: " + new org.wyona.yarep.core.Path(getPath()));
+ log.debug("ICS exists: " + new org.wyona.yarep.core.Path(getPath()));
if(viewId == null) {
View view = new View();
view.setMimeType(getMimeType(null));
view.setInputStream(dataRepo.getNode(getPath()).getInputStream());
- log.warn("DEBUG: Return ICS!");
+ log.debug("Return ICS!");
return view;
}
}
@@ -124,7 +124,7 @@
if (eventsPath == null) {
eventsPath = getPath();
}
- log.warn("DEBUG: Generate calendar from XML based events: " + eventsPath);
+ log.debug("Generate calendar from XML based events: " + eventsPath);
org.wyona.yarep.core.Path[] children = dataRepo.getChildren(new org.wyona.yarep.core.Path(eventsPath));
//org.wyona.yarep.core.Path[] children = dataRepo.search("categories", categories);
@@ -223,13 +223,13 @@
//java.io.BufferedReader br = new java.io.BufferedReader(new java.io.InputStreamReader(in));
String line;
CalendarEvent event = null;
- log.error("DEBUG: Parse ICS and write events as XML into repository ...");
+ log.debug("Parse ICS and write events as XML into repository ...");
while ((line = br.readLine()) != null) {
if (line.startsWith("BEGIN:VEVENT")) {
event = new CalendarEvent();
} else if (line.startsWith("END:VEVENT")) {
String eventPath = getResourceConfigProperty("events-path") + "/" + event.getUID() + ".xml";
- log.warn("DEBUG: Write event " + eventPath + ", " + event.toXML());
+ log.debug("Write event " + eventPath + ", " + event.toXML());
if (!dataRepo.existsNode(eventPath)) {
org.wyona.yarep.util.YarepUtil.addNodes(dataRepo, eventPath, org.wyona.yarep.core.NodeType.RESOURCE);
}
@@ -252,7 +252,7 @@
* Save/Write the actual ICS
*/
private InputStream writeICS(InputStream in) throws Exception {
- log.error("DEBUG: Write ICS as a whole to the repository: " + getPath());
+ log.debug("Write ICS as a whole to the repository: " + getPath());
org.wyona.yarep.core.Path path = new org.wyona.yarep.core.Path(getPath());
OutputStream out;
@@ -327,7 +327,7 @@
*/
public void create(HttpServletRequest request) {
String newPath = getPath();
- log.error("DEBUG: New path: " + newPath);
+ log.debug("New path: " + newPath);
}
/**
Index: src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
===================================================================
--- src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java (revision 56388)
+++ src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java (working copy)
@@ -81,10 +81,10 @@
} else if (usecase.equals("getuser")) {
sb.append(getUserAsXML(getEnvironment().getRequest().getParameter("id")));
} else if (usecase.equals("deleteuser")) {
- log.warn("DEBUG: Delete user: " + getEnvironment().getRequest().getParameter("id"));
+ log.debug("Delete user: " + getEnvironment().getRequest().getParameter("id"));
deleteUser(getEnvironment().getRequest().getParameter("id"));
} else if (usecase.equals("deletegroup")) {
- log.warn("DEBUG: Delete group: " + getEnvironment().getRequest().getParameter("id"));
+ log.debug("Delete group: " + getEnvironment().getRequest().getParameter("id"));
deleteGroup(getEnvironment().getRequest().getParameter("id"));
} else if (usecase.equals("creategroup")) {
log.debug("Try to create group: " + getEnvironment().getRequest().getParameter("id"));
@@ -346,10 +346,10 @@
for (int i = 0; i < members.length; i++) {
String typeID[] = members[i].split(":");
if (typeID[0].equals("u")) {
- log.warn("DEBUG: Remove user '" + typeID[1] + "' from group: " + id);
+ log.debug("Remove user '" + typeID[1] + "' from group: " + id);
group.removeMember(um.getUser(typeID[1]));
} else if (typeID[0].equals("g")) {
- log.warn("DEBUG: Remove group '" + typeID[1] + "' from group: " + id);
+ log.debug("Remove group '" + typeID[1] + "' from group: " + id);
group.removeMember(gm.getGroup(typeID[1]));
}
}
@@ -563,7 +563,7 @@
sb.append("<members>");
// INFO: See policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java#resolveGroup(), also re Loops!
for (int i = 0; i < members.length; i++) {
- //log.warn("DEBUG: Member: " + members[i].getID());
+ //log.debug("Member: " + members[i].getID());
if (members[i] instanceof User) {
sb.append("<user id=\"" + members[i].getID() + "\"/>");
} else if (members[i] instanceof Group) {
@@ -573,7 +573,7 @@
sb.append("<loop-detected group-id=\"" + members[i].getID() + "\"/>");
} else {
sb.append("<group id=\"" + members[i].getID() + "\">");
- //log.warn("DEBUG: Resolve group: " + members[i].getID());
+ //log.debug("Resolve group: " + members[i].getID());
// TODO: Make sure that there are no redundencies, whereas since resolvedGroups is not used, it does not matter for the moment.
resolvedGroups.add(members[i].getID());
Index: src/realms/welcome-admin/yanel/resources/show-realms/src/java/org/wyona/yanel/impl/resources/showrealms/ShowRealms.java
===================================================================
--- src/realms/welcome-admin/yanel/resources/show-realms/src/java/org/wyona/yanel/impl/resources/showrealms/ShowRealms.java (revision 56388)
+++ src/realms/welcome-admin/yanel/resources/show-realms/src/java/org/wyona/yanel/impl/resources/showrealms/ShowRealms.java (working copy)
@@ -149,7 +149,7 @@
File xsltFile = org.wyona.commons.io.FileUtil.file(rtd
.getConfigFile().getParentFile().getAbsolutePath(), "xslt"
+ File.separator + "info2xhtml.xsl");
- log.error("DEBUG: XSLT file: " + xsltFile);
+ log.debug("XSLT file: " + xsltFile);
return new StreamSource(xsltFile);
}
Index: src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java
===================================================================
--- src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java (revision 56388)
+++ src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java (working copy)
@@ -212,16 +212,16 @@
* @return List of all updaters which are usable for a specific Yanel revision. Return null if none is available.
*/
public List<Map<String, String>> getUpdatersForYanelRevision(String yanelRevision) {
- log.warn("DEBUG: Find an updater for revision: " + yanelRevision);
+ log.debug("Find an updater for revision: " + yanelRevision);
VersionComparator versionComparator = new VersionComparator();
List<Map<String, String>> bestUpdater = getUpdateVersionsOf("type", "updater");
if (bestUpdater == null) return null;
for (int i = bestUpdater.size() - 1; i >= 0; i--) { // INFO: Start at the end, because otherwise remove(int) will lead to strange results
Map<String, String> versionDetail = bestUpdater.get(i);
- log.warn("DEBUG: Check updater: " + versionDetail.get("revision"));
+ log.debug("Check updater: " + versionDetail.get("revision"));
- log.warn("DEBUG: Updater MinRevision: " + versionDetail.get(TARGET_APPLICATION_MIN_REVISION));
- log.warn("DEBUG: Updater MaxRevision: " +versionDetail.get(TARGET_APPLICATION_MAX_REVISION));
+ log.debug("Updater MinRevision: " + versionDetail.get(TARGET_APPLICATION_MIN_REVISION));
+ log.debug("Updater MaxRevision: " +versionDetail.get(TARGET_APPLICATION_MAX_REVISION));
if (versionComparator.compare(versionDetail.get(TARGET_APPLICATION_MIN_REVISION), yanelRevision) > 0 ) {
bestUpdater.remove(i);
continue;
@@ -230,7 +230,7 @@
bestUpdater.remove(i);
continue;
}
- log.warn("DEBUG: Workable updater: " + versionDetail.get("revision"));
+ log.debug("Workable updater: " + versionDetail.get("revision"));
}
Collections.sort(bestUpdater, new UpdateInfoVersionComparator());
@@ -244,7 +244,7 @@
* @return List of all updates which are installable for a specific Yanel revision. Return null if none is available.
*/
public List<Map<String, String>> getYanelUpdatesForYanelRevision(String yanelRevision) {
- log.warn("DEBUG: Find an update for revision: " + yanelRevision);
+ log.debug("Find an update for revision: " + yanelRevision);
// Get all updates
List<Map<String, String>> allUpdates = getUpdateVersionsOf("type", "updates");
@@ -258,7 +258,7 @@
for (int i = allUpdates.size() - 1; i >= 0; i--) { // INFO: Start at the end, because otherwise remove(int) will lead to strange results
Map<String, String> updatesVersionDetail = allUpdates.get(i);
String updateRevision = updatesVersionDetail.get("revision");
- log.warn("DEBUG: Check update revision: " + updateRevision);
+ log.debug("Check update revision: " + updateRevision);
if (versionComparator.compare(updatesVersionDetail.get(TARGET_APPLICATION_MIN_REVISION), yanelRevision) > 0 ) {
allUpdates.remove(i);
continue;
@@ -267,7 +267,7 @@
allUpdates.remove(i);
continue;
}
- log.warn("DEBUG: Workable update revision: " + updateRevision);
+ log.debug("Workable update revision: " + updateRevision);
}
// Get all updaters which work for yanelRevision
@@ -281,12 +281,12 @@
for (int i = 0; i < allUpdates.size(); i++) { // TODO: Reverse ... because otherwise remove will lead to strange results
Map<String, String> updatesVersionDetail = allUpdates.get(i);
String revision = updatesVersionDetail.get("revision");
- log.error("DEBUG: Update revision: " + revision);
+ log.debug("Update revision: " + revision);
for (int j = 0; j < updaters.size(); j++) { // TODO: Reverse ... because otherwise remove will lead to strange results
Map<String, String> updatersVersionDetail = updaters.get(j);
- log.error("DEBUG: Updater revision: " + updatersVersionDetail.get("revision"));
+ log.debug("Updater revision: " + updatersVersionDetail.get("revision"));
if (versionComparator.compare(updatersVersionDetail.get(TARGET_APPLICATION_MIN_REVISION), revision) > 0 ) {
allUpdates.remove(i);
}
Index: src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java
===================================================================
--- src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java (revision 56388)
+++ src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java (working copy)
@@ -536,7 +536,7 @@
List<Map<String, String>> bestUpdater = updateInfo.getUpdateVersionsOf("type", "updater", installInfo.getRevision());
for (int i = 0; i < bestUpdater.size(); i++) {
Map<String, String> versionDetail =bestUpdater.get(i);
- log.error("DEBUG: Updater details: " + versionDetail);
+ log.debug("Updater details: " + versionDetail);
if (versionComparator.compare(versionDetail.get(UpdateInfo.TARGET_APPLICATION_MIN_REVISION), updateRevision) > 0 ) {
bestUpdater.remove(i);
}
@@ -563,7 +563,7 @@
for (int i = 0; i < updates.size(); i++) {
Map<String, String> versionDetail = updates.get(i);
- log.error("DEBUG: Update: " + versionDetail.get("id") + "-v-" + versionDetail.get("version") + "-r-" + versionDetail.get("revision"));
+ log.debug("Update: " + versionDetail.get("id") + "-v-" + versionDetail.get("version") + "-r-" + versionDetail.get("revision"));
for (int j = 0; j < tomcatContextHandler.getWebappNames().length; j++) {
if (tomcatContextHandler.getWebappNames()[j].equals(versionDetail.get("id") + "-v-" + versionDetail.get("version") + "-r-" + versionDetail.get("revision"))) {
Index: src/core/java/org/wyona/yanel/cmdl/communication/CommandLineRequest.java
===================================================================
--- src/core/java/org/wyona/yanel/cmdl/communication/CommandLineRequest.java (revision 56388)
+++ src/core/java/org/wyona/yanel/cmdl/communication/CommandLineRequest.java (working copy)
@@ -47,7 +47,7 @@
private class ParameterNames implements Enumeration<String> {
private java.util.Vector<String> names;
public ParameterNames(Enumeration<?> names) {
- log.error("DEBUG: Copy parameters: " + names.getClass().getName());
+ log.debug("Copy parameters: " + names.getClass().getName());
this.names = new java.util.Vector<String>();
while (names.hasMoreElements()) {
this.names.add((String)names.nextElement());
@@ -75,7 +75,7 @@
}
public CommandLineRequest(HttpServletRequest request) {
- log.error("DEBUG: Copy request: " + request.getClass().getName());
+ log.debug("Copy request: " + request.getClass().getName());
Enumeration<?> pn = request.getParameterNames();
while(pn.hasMoreElements()) {
String name = (String) pn.nextElement();
Index: src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
===================================================================
--- src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java (revision 56388)
+++ src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java (working copy)
@@ -154,16 +154,16 @@
Configuration resourceTypes[] = config.getChildren("resource-type");
for (int i = 0; i < resourceTypes.length; i++) {
- log.warn("DEBUG: Register resource type...");
+ log.debug("Register resource type...");
try {
String packageName = resourceTypes[i].getAttribute("package"); // INFO: This method will throw an exception if no 'package' attribute exists, and hence further down it will try to read the 'src' attribute...
- log.warn("DEBUG: Package: " + packageName);
+ log.debug("Package: " + packageName);
log.info("Package: " + packageName);
// TODO: Config itself, e.g. org/wyona/yanel/impl/resources/redirect/my-resource.xml
URL packageURL = ResourceTypeRegistry.class.getClassLoader().getResource(packageName.replace('.','/'));
- log.warn("DEBUG: Package: " + packageURL.getFile());
+ log.debug("Package: " + packageURL.getFile());
//log.info("Package: " + packageURL.getFile());
File jarFile = null;
if (packageURL.getPath().indexOf("!") > 0) {
@@ -208,7 +208,7 @@
}
} catch (Exception e) {
log.error(e.getMessage()); // INFO: Do not show this error message, because it is not really an error in most cases
- log.warn("DEBUG: No package attribute, hence try src attribute...");
+ log.debug("No package attribute, hence try src attribute...");
log.info("No package attribute, hence try src attribute...");
try {
File resConfigFile = new File(resourceTypes[i].getAttribute("src"));
Index: src/core/java/org/wyona/yanel/core/transformation/AccessControlTransformer.java
===================================================================
--- src/core/java/org/wyona/yanel/core/transformation/AccessControlTransformer.java (revision 56388)
+++ src/core/java/org/wyona/yanel/core/transformation/AccessControlTransformer.java (working copy)
@@ -75,9 +75,9 @@
*
*/
public void startElement(String namespaceURI, String localName, String qName, Attributes attrs) throws SAXException {
- //log.error("DEBUG: Start element: " + localName + ", " + qName);
+ //log.debug("Start element: " + localName + ", " + qName);
numberOfNestedElements = numberOfNestedElements + 1;
- //log.error("DEBUG: Number of nested elements: " + numberOfNestedElements);
+ //log.debug("Number of nested elements: " + numberOfNestedElements);
if (bufferEnabled && isAnchorElement(namespaceURI, localName, qName)) {
@@ -136,7 +136,7 @@
if (bufferEnabled || !accessGranted) {
//if (bufferEnabled || accessDenied) {
- //log.error("DEBUG: Do nothing and just dump start of element: <" + localName + " ...>");
+ //log.debug("Do nothing and just dump start of element: <" + localName + " ...>");
} else {
super.startElement(namespaceURI, localName, qName, attrs);
}
@@ -146,7 +146,7 @@
*
*/
public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
- //log.error("DEBUG: End element: " + localName + ", " + qName);
+ //log.debug("End element: " + localName + ", " + qName);
numberOfNestedElements = numberOfNestedElements - 1;
@@ -172,12 +172,12 @@
if (bufferEnabled || !accessGranted) {
//if (bufferEnabled || accessDenied) {
- //log.error("DEBUG: Do nothing and just dump end of element: </" + localName + ">");
+ //log.debug("Do nothing and just dump end of element: </" + localName + ">");
} else {
super.endElement(namespaceURI, localName, qName);
}
- //log.error("DEBUG: Number of nested elements: " + numberOfNestedElements);
+ //log.debug("Number of nested elements: " + numberOfNestedElements);
if (isParentElement(namespaceURI, localName, qName) && numberOfNestedElements == -1 && !accessGranted) {
accessGranted = true;
}
@@ -194,7 +194,7 @@
public void characters(char[] buf, int offset, int len) throws SAXException {
if (!accessGranted) {
//if (accessDenied) {
- //log.error("DEBUG: Do nothing and just dump characters!");
+ //log.debug("Do nothing and just dump characters!");
} else {
super.characters(buf, offset, len);
}
Index: src/core/java/org/wyona/yanel/core/util/ConfigurationUtil.java
===================================================================
--- src/core/java/org/wyona/yanel/core/util/ConfigurationUtil.java (revision 56388)
+++ src/core/java/org/wyona/yanel/core/util/ConfigurationUtil.java (working copy)
@@ -87,7 +87,7 @@
// avalon ConfigurationUtil doesn't seem to work properly
/*
* org.w3c.dom.Element element = ConfigurationUtil.toElement(customConfig);
- * log.error("DEBUG: element: " + element.getLocalName()); org.w3c.dom.Document doc =
+ * log.debug("element: " + element.getLocalName()); org.w3c.dom.Document doc =
* element.getOwnerDocument(); org.w3c.dom.Element rootElement = doc.getDocumentElement();
* rootElement.appendChild(element); return doc;
*/
Index: src/core/java/org/wyona/yanel/core/map/RealmManager.java
===================================================================
--- src/core/java/org/wyona/yanel/core/map/RealmManager.java (revision 56388)
+++ src/core/java/org/wyona/yanel/core/map/RealmManager.java (working copy)
@@ -106,7 +106,7 @@
// 2.) Getting realms.xml from user home directory
- log.warn("DEBUG: User home directory: " + System.getProperty("user.home"));
+ log.debug("User home directory: " + System.getProperty("user.home"));
File userHomeRealmsConfigFile = new File(System.getProperty("user.home"), "realms.xml");
if (userHomeRealmsConfigFile.isFile()) {
log.warn("Use user home directory: " + System.getProperty("user.home"));
@@ -434,7 +434,7 @@
String key = (String)keyIterator.next();
Realm realm = (Realm)_realms.get(key);
if (!realm.getID().equals(rootRealm.getID())) {
- log.warn("DEBUG: Check whether to inherit root realm properties to another realm: " + realm.getName());
+ log.debug("Check whether to inherit root realm properties to another realm: " + realm.getName());
if ((realm.getProxyHostName() == null) && (!key.equals(rootRealm.getID())) && rootRealm.isProxySet()) {
realm.setProxy(rootRealm.getProxyHostName(), rootRealm.getProxyPort(), rootRealm.getProxySSLPort(), rootRealm.getProxyPrefix());
log.info("Inherit root realm properties to realm: " + key);
Index: src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
===================================================================
--- src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java (revision 56388)
+++ src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java (working copy)
@@ -670,7 +670,7 @@
// http://www-128.ibm.com/developerworks/java/library/j-io1/
byte[] memBuffer = baos.toByteArray();
- log.warn("DEBUG: InputStream: " + baos);
+ log.debug("InputStream: " + baos);
return new java.io.ByteArrayInputStream(memBuffer);
}
Index: src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java
===================================================================
--- src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java (revision 56388)
+++ src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java (working copy)
@@ -68,7 +68,7 @@
* @see org.wyona.yanel.impl.resources.usecase.UsecaseResource#init()
*/
protected void init() throws UsecaseException {
- log.warn("DEBUG: Init resource ...");
+ log.debug("Init resource ...");
try {
String matcherExtension = getResourceConfigProperty(CONFIG_PROPERTY_MATCHER_EXTENSION);
if (matcherExtension != null && matcherExtension.length() > 0) {
@@ -98,9 +98,9 @@
return;
}
- log.warn("DEBUG: Edit path: " + editPath);
+ log.debug("Edit path: " + editPath);
editorContent = getParameterAsString(editPath);
- log.warn("DEBUG: Editor content: " + editorContent);
+ log.debug("Editor content: " + editorContent);
if (ResourceAttributeHelper.hasAttributeImplemented(resToEdit, "Modifiable", "2")) {
try {
@@ -119,7 +119,7 @@
* @see org.wyona.yanel.impl.resources.usecase.UsecaseResource#processUsecase(java.lang.String)
*/
protected View processUsecase(String viewID) throws UsecaseException {
- log.warn("DEBUG: Edit path: " + getEditPath());
+ log.debug("Edit path: " + getEditPath());
try {
if (!getRealm().getPolicyManager().authorize(getEditPath(), getEnvironment().getIdentity(), new org.wyona.security.core.api.Usecase("write"))) {
log.warn("Not authorized: " + getPath() + ", " + getEditPath());
@@ -133,9 +133,9 @@
String resourceContent = getResourceContent();
if (getParameter(PARAM_CANCEL) != null) {
- log.warn("DEBUG: Name: " + PARAM_CANCEL + ", Value: " + getParameterAsString(PARAM_CANCEL));
+ log.debug("Name: " + PARAM_CANCEL + ", Value: " + getParameterAsString(PARAM_CANCEL));
cancel();
- log.warn("DEBUG: Original view ID: " + viewID + ", new view ID: " + VIEW_CANCEL);
+ log.debug("Original view ID: " + viewID + ", new view ID: " + VIEW_CANCEL);
return generateView(VIEW_CANCEL);
}
@@ -158,7 +158,7 @@
String userID = getEnvironment().getIdentity().getUsername();
- log.warn("DEBUG: Check if content of '" + getResToEdit().getPath() + "' is already checked out");
+ log.debug("Check if content of '" + getResToEdit().getPath() + "' is already checked out");
if (isResToEditCheckedOut() && !(getParameter(PARAM_SUBMIT) != null || getParameter(PARAM_SUBMIT_TIDY_SAVE) != null)) {
addError("Resource is checked out ");
String checkoutUserID = getResToEditCheckoutUserID();
@@ -213,7 +213,7 @@
if (isResToEditVersionableV2()) {
if (!isResToEditCheckedOut()) {
((VersionableV2) getResToEdit()).checkout(userID);
- log.warn("DEBUG: Resource '" + getResToEdit().getPath() + "' has been checked out.");
+ log.debug("Resource '" + getResToEdit().getPath() + "' has been checked out.");
} else {
log.warn("Resource '" + getResToEdit().getPath() + "' is already checked out!");
}
@@ -263,18 +263,18 @@
try {
final String content = getEditorContent();
if (log.isDebugEnabled()) log.debug("saving content: " + content);
- log.warn("DEBUG: Saving content: " + content);
+ log.debug("Saving content: " + content);
OutputStream os = ((ModifiableV2) resToEdit).getOutputStream();
IOUtils.write(content, os);
os.close();
addInfoMessage("Succesfully saved resource " + resToEdit.getPath() + ". ");
- log.warn("DEBUG: Try to checkin resource: " + resToEdit.getPath());
+ log.debug("Try to checkin resource: " + resToEdit.getPath());
if (isResToEditVersionableV2()) {
VersionableV2 versionable = (VersionableV2)resToEdit;
try {
- log.warn("DEBUG: Checkin: " + resToEdit.getPath());
+ log.debug("Checkin: " + resToEdit.getPath());
versionable.checkin("Updated with tinyMCE");
addInfoMessage("Succesfully checked in resource '" + resToEdit.getPath() + "'.");
} catch (Exception e) {
Index: src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java
===================================================================
--- src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java (revision 56388)
+++ src/resources/testing-control/src/java/org/wyona/yanel/impl/resources/TestingControlResource.java (working copy)
@@ -399,7 +399,7 @@
org.wyona.yarep.core.Repository Repo = this.getRealm().getRepository();
org.wyona.commons.io.Path newPath = new org.wyona.commons.io.Path("/test-results-archive/"
+ resultName);
- log.error("DEBUG: " + newPath);
+ log.debug("" + newPath);
org.wyona.yanel.core.util.YarepUtil.addNodes(Repo,
newPath.toString(),
org.wyona.yarep.core.NodeType.RESOURCE);
Index: src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java
===================================================================
--- src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java (revision 56388)
+++ src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java (working copy)
@@ -599,7 +599,7 @@
response.addCookie(rememberLoginNameCookie);
}
} else {
- log.error("DEBUG: Do NOT remember my login name: " + loginUsername + "," + openID);
+ log.debug("Do NOT remember my login name: " + loginUsername + "," + openID);
rememberMyLoginName = false;
// Unset Login Cookies (http://java.sun.com/j2ee/sdk_1.3/techdocs/api/javax/servlet/http/Cookie.html#setMaxAge(int))
Index: src/webapp/src/java/org/wyona/yanel/servlet/HeartbeatJob.java
===================================================================
--- src/webapp/src/java/org/wyona/yanel/servlet/HeartbeatJob.java (revision 56388)
+++ src/webapp/src/java/org/wyona/yanel/servlet/HeartbeatJob.java (working copy)
@@ -25,6 +25,6 @@
realmName = realm.getName();
}
log.info("Heartbeat: " + new java.util.Date() + " (Realm: " + realmName + ")"); // TODO: Show statistics, e.g. uptime, etc.
- //log.warn("DEBUG: Heartbeat: " + new java.util.Date() + " (Realm: " + realmName + ")");
+ //log.debug("Heartbeat: " + new java.util.Date() + " (Realm: " + realmName + ")");
}
}
Index: src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java (revision 56388)
+++ src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java (working copy)
@@ -1422,7 +1422,7 @@
// INFO: Append timestamp in order to workaround 301 redirect cache problem (Also see http://bugzilla.wyona.com/cgi-bin/bugzilla/show_bug.cgi?id=6465)
// TODO: Check if url still has a query string (see above)
urlWithoutLogoutQS = urlWithoutLogoutQS + "?yanel.refresh=" + new Date().getTime();
- log.warn("DEBUG: Redirect to original request: " + urlWithoutLogoutQS);
+ log.debug("Redirect to original request: " + urlWithoutLogoutQS);
response.setHeader("Location", urlWithoutLogoutQS.toString());
response.setStatus(javax.servlet.http.HttpServletResponse.SC_MOVED_PERMANENTLY); // 301
@@ -2449,7 +2449,7 @@
//logAccess.info(requestURL + " r:" + realm.getID() + " c:" + cookie.getValue() + " ref:" + request.getHeader("referer") + " ua:" + request.getHeader("User-Agent"));
logAccess.info(AccessLog.getLogMessage(request, response, realm.getID()));
}
- //log.warn("DEBUG: Referer: " + request.getHeader(HTTP_REFERRER));
+ //log.debug("Referer: " + request.getHeader(HTTP_REFERRER));
} catch(Exception e) { // Catch all exceptions, because we do not want to throw exceptions because of logging browser history
log.error(e, e);
}
More information about the Yanel-development
mailing list