Author: taylor
Date: Thu Jan 1 16:46:04 2015
New Revision: 1648880
URL: http://svn.apache.org/r1648880
Log:
JS2-1197: Audit reports are now building and operational again
Modified:
portals/jetspeed-2/applications/jsaudit/trunk/src/main/java/org/apache/jetspeed/portlets/audit/PortalUserJetspeedInteraction.java
portals/jetspeed-2/applications/jsaudit/trunk/src/main/resources/log4j.properties
portals/jetspeed-2/applications/jsaudit/trunk/src/webapp/WEB-INF/faces-config.xml
Modified:
portals/jetspeed-2/applications/jsaudit/trunk/src/main/java/org/apache/jetspeed/portlets/audit/PortalUserJetspeedInteraction.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/jsaudit/trunk/src/main/java/org/apache/jetspeed/portlets/audit/PortalUserJetspeedInteraction.java?rev=1648880&r1=1648879&r2=1648880&view=diff
==============================================================================
---
portals/jetspeed-2/applications/jsaudit/trunk/src/main/java/org/apache/jetspeed/portlets/audit/PortalUserJetspeedInteraction.java
(original)
+++
portals/jetspeed-2/applications/jsaudit/trunk/src/main/java/org/apache/jetspeed/portlets/audit/PortalUserJetspeedInteraction.java
Thu Jan 1 16:46:04 2015
@@ -54,7 +54,10 @@ public class PortalUserJetspeedInteracti
}
catch (Exception e)
{
- log.error("Failed to get User Bean: " + e.getMessage(),
e);
+ if (log.isDebugEnabled()) {
+ // deleted users can not exist
+ log.debug("Failed to get User Bean: " +
e.getMessage(), e);
+ }
}
return null;
}
Modified:
portals/jetspeed-2/applications/jsaudit/trunk/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/jsaudit/trunk/src/main/resources/log4j.properties?rev=1648880&r1=1648879&r2=1648880&view=diff
==============================================================================
---
portals/jetspeed-2/applications/jsaudit/trunk/src/main/resources/log4j.properties
(original)
+++
portals/jetspeed-2/applications/jsaudit/trunk/src/main/resources/log4j.properties
Thu Jan 1 16:46:04 2015
@@ -29,11 +29,6 @@ log4j.rootLogger = ERROR, pa
log4j.category.org.apache.jetspeed = ERROR, pa
log4j.additivity.org.apache.jetspeed = false
-#
-# Velocity
-#
-log4j.category.velocity = ERROR, velocity
-log4j.additivity.velocity = false
########################################################################
#
Modified:
portals/jetspeed-2/applications/jsaudit/trunk/src/webapp/WEB-INF/faces-config.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/jsaudit/trunk/src/webapp/WEB-INF/faces-config.xml?rev=1648880&r1=1648879&r2=1648880&view=diff
==============================================================================
---
portals/jetspeed-2/applications/jsaudit/trunk/src/webapp/WEB-INF/faces-config.xml
(original)
+++
portals/jetspeed-2/applications/jsaudit/trunk/src/webapp/WEB-INF/faces-config.xml
Thu Jan 1 16:46:04 2015
@@ -15,13 +15,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"; >
-<faces-config
- xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd";
- version="2.0">
+<faces-config>
<application>
<locale-config>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
