shuber 2005/11/08 12:05:36 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
. jahia-JAHIA-4-1-BRANCH.iws
src/java/org/jahia/services/webdav DAVFileAccess.java
Log:
JAHIA-437
Replace e.printStackTrace calls with error logging.
Revision Changes Path
1.1.2.9 +73 -47 jahia/jahia-JAHIA-4-1-BRANCH.iws
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/jahia-JAHIA-4-1-BRANCH.iws.diff?r1=1.1.2.8&r2=1.1.2.9&f=h
1.22.2.2.2.10 +15 -15
jahia/src/java/org/jahia/services/webdav/DAVFileAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/DAVFileAccess.java.diff?r1=1.22.2.2.2.9&r2=1.22.2.2.2.10&f=h
Index: jahia-JAHIA-4-1-BRANCH.iws
===================================================================
RCS file: /home/cvs/repository/jahia/Attic/jahia-JAHIA-4-1-BRANCH.iws,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- jahia-JAHIA-4-1-BRANCH.iws 8 Nov 2005 10:50:27 -0000 1.1.2.8
+++ jahia-JAHIA-4-1-BRANCH.iws 8 Nov 2005 11:05:36 -0000 1.1.2.9
@@ -122,7 +122,7 @@
<file leaf-file-name="DAVFilemanager_Engine.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.039443154">
+ <state line="959" column="34" selection-start="43985"
selection-end="43985" vertical-scroll-proportion="-1.1120163">
<folding />
</state>
</provider>
@@ -131,7 +131,7 @@
<file leaf-file-name="AbstractAction.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.038116593">
+ <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.03359684">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -142,7 +142,7 @@
<file leaf-file-name="JahiaUserManagerLDAPProvider.java"
pinned="false" current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.039443154">
+ <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.034623217">
<folding />
</state>
</provider>
@@ -151,7 +151,7 @@
<file leaf-file-name="ConnectionDispenser.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.039443154">
+ <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.034623217">
<folding />
</state>
</provider>
@@ -160,43 +160,43 @@
<file leaf-file-name="JahiaErrorDisplay.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.039443154">
+ <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.034623217">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JahiaPageBaseService.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageBaseService.java">
+ <file leaf-file-name="JahiaSitesSlideService.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/sites/JahiaSitesSlideService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.039443154">
+ <state line="155" column="20" selection-start="5627"
selection-end="5627" vertical-scroll-proportion="1.0468432">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JahiaSitesSlideService.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/sites/JahiaSitesSlideService.java">
+ <file leaf-file-name="ContentPage.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/ContentPage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="155" column="20" selection-start="5627"
selection-end="5627" vertical-scroll-proportion="1.1925755">
+ <state line="90" column="13" selection-start="3506"
selection-end="3506" vertical-scroll-proportion="0.29124236">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ContentPage.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/ContentPage.java">
+ <file leaf-file-name="ContentPageField.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/fields/ContentPageField.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="13" selection-start="3506"
selection-end="3506" vertical-scroll-proportion="0.33178654">
+ <state line="133" column="29" selection-start="6989"
selection-end="6989" vertical-scroll-proportion="0.49898168">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ContentPageField.java" pinned="false"
current="true" current-in-tab="true">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/fields/ContentPageField.java">
+ <file leaf-file-name="DAVFileAccess.java" pinned="false"
current="true" current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/webdav/DAVFileAccess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="133" column="29" selection-start="6989"
selection-end="6989" vertical-scroll-proportion="0.5684455">
+ <state line="875" column="29" selection-start="34270"
selection-end="34270" vertical-scroll-proportion="0.60285133">
<folding />
</state>
</provider>
@@ -205,7 +205,7 @@
<file leaf-file-name="JahiaPage.java" pinned="false" current="false"
current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="435" column="22" selection-start="14881"
selection-end="14881" vertical-scroll-proportion="0.33178654">
+ <state line="435" column="22" selection-start="14881"
selection-end="14881" vertical-scroll-proportion="0.29124236">
<folding />
</state>
</provider>
@@ -370,6 +370,32 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="filemanager" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="fields" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
@@ -704,7 +730,7 @@
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="7" />
<window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.3755069" order="0" />
- <window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="1" />
+ <window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.32951945" order="1" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="1" />
<window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33295193" order="8" />
<window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.4" order="6" />
@@ -716,7 +742,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
- <window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.39816934" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.39816934" order="4" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="sliding" type="sliding" visible="false"
weight="0.4" order="0" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
@@ -788,13 +814,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPagesDB.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="668" column="20" selection-start="28082"
selection-end="28082" vertical-scroll-proportion="1.5400944">
- <folding />
- </state>
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state line="362" column="31" selection-start="11944"
selection-end="11944" vertical-scroll-proportion="0.021628499">
@@ -830,71 +849,78 @@
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/webdav/DAVFileAccess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.039443154">
+ <state line="875" column="29" selection-start="34270"
selection-end="34270" vertical-scroll-proportion="0.60285133">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.039443154">
+ <state line="959" column="34" selection-start="43985"
selection-end="43985" vertical-scroll-proportion="-1.1120163">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.039443154">
+ <state line="435" column="22" selection-start="14881"
selection-end="14881" vertical-scroll-proportion="0.29124236">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/fields/ContentPageField.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.038116593">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="133" column="29" selection-start="6989"
selection-end="6989" vertical-scroll-proportion="0.49898168">
+ <folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/ContentPage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.039443154">
+ <state line="90" column="13" selection-start="3506"
selection-end="3506" vertical-scroll-proportion="0.29124236">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/sites/JahiaSitesSlideService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="155" column="20" selection-start="5627"
selection-end="5627" vertical-scroll-proportion="1.1925755">
+ <state line="155" column="20" selection-start="5627"
selection-end="5627" vertical-scroll-proportion="1.0468432">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPage.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="435" column="22" selection-start="14881"
selection-end="14881" vertical-scroll-proportion="0.33178654">
+ <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.034623217">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/ContentPage.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="13" selection-start="3506"
selection-end="3506" vertical-scroll-proportion="0.33178654">
+ <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.034623217">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/fields/ContentPageField.java">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="133" column="29" selection-start="6989"
selection-end="6989" vertical-scroll-proportion="0.5684455">
+ <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.034623217">
<folding />
</state>
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.03359684">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Index: DAVFileAccess.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/DAVFileAccess.java,v
retrieving revision 1.22.2.2.2.9
retrieving revision 1.22.2.2.2.10
diff -u -r1.22.2.2.2.9 -r1.22.2.2.2.10
--- DAVFileAccess.java 3 Oct 2005 15:19:12 -0000 1.22.2.2.2.9
+++ DAVFileAccess.java 8 Nov 2005 11:05:36 -0000 1.22.2.2.2.10
@@ -148,7 +148,7 @@
ns.token.begin ();
} catch (Exception e) {
// anything to do ?
- e.printStackTrace ();
+ logger.error("Error", e);
}
}
@@ -157,7 +157,7 @@
ns.token.commit ();
} catch (Exception e) {
// anything to do ?
- e.printStackTrace ();
+ logger.error("Error", e);
}
}
@@ -166,7 +166,7 @@
ns.token.rollback ();
} catch (Exception e) {
// anything to do ?
- e.printStackTrace ();
+ logger.error("Error", e);
}
}
@@ -287,17 +287,17 @@
result.removeAll (grantedUsers);
return result;
} catch (JahiaACLException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
} catch (ServiceAccessException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
} catch (ObjectNotFoundException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
} catch (VetoException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
} catch (LinkedObjectNotFoundException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
} catch (AccessDeniedException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
}
return new HashSet ();
}
@@ -432,7 +432,7 @@
(SubjectNode) ns.security.getPrincipal (slideToken),
ns.getPermission (
perm));
} catch (SlideException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
return false;
}
}
@@ -550,7 +550,7 @@
(slideToken, revisionDescriptors,
revisionDescriptor).streamContent ();
} catch (Exception e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
}
return null;
}
@@ -652,7 +652,7 @@
} catch (LinkedObjectNotFoundException e) {
// Nothing we can do here ...
- e.printStackTrace ();
+ logger.error("Error", e);
//
// make sure the transaction is aborted
// throw any WebDAV exception to indicate
@@ -967,7 +967,7 @@
try {
ns.content.store (slideToken, objectNode.getUri (),
revisionDescriptor, null);
} catch (SlideException e) {
- e.printStackTrace ();
+ logger.error("Error", e);
}
}
}
@@ -998,7 +998,7 @@
ns.content.store (prot ? ns.rootToken : slideToken,
objectNode.getUri (),
revisionDescriptor, null);
} catch (SlideException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error("Error", e); //To change body of catch statement
use Options | File Templates.
}
}
@@ -1141,7 +1141,7 @@
ns.lock.unlock (ns.rootToken, nodeLock);
}
} catch (SlideException e) {
- e.printStackTrace ();
+ logger.error("Error", e);
return false;
}
return true;
