Author: cschneider
Date: Tue Sep 17 13:02:52 2013
New Revision: 1524028
URL: http://svn.apache.org/r1524028
Log:
CXF-5284 Importing correct package version, catching throwable to not interrupt
main execution
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/services/sts/sts-core/pom.xml
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerListener.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1522478,1524027
Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/pom.xml?rev=1524028&r1=1524027&r2=1524028&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/sts/sts-core/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/services/sts/sts-core/pom.xml Tue Sep 17 13:02:52
2013
@@ -129,6 +129,7 @@
org.apache.cxf.sts.*;version=${project.version}
</Export-Package>
<Import-Package>
+
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.apache.cxf.sts.provider.*;version=${project.version},
!org.apache.cxf.sts.*,
org.apache.cxf.*;version=${project.version},
Modified:
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerListener.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerListener.java?rev=1524028&r1=1524027&r2=1524028&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerListener.java
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerListener.java
Tue Sep 17 13:02:52 2013
@@ -188,7 +188,7 @@ public class LoggerListener implements S
map.put(KEYS.STATUS.name(), "SUCCESS");
}
writeLog(map);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
LOG.log(Level.WARNING, "Failed to capture or write logging
details", ex);
}
}
@@ -229,7 +229,7 @@ public class LoggerListener implements S
map.put(KEYS.STATUS.name(), "SUCCESS");
}
writeLog(map);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
LOG.log(Level.WARNING, "Failed to capture or write logging
details", ex);
}
}
@@ -270,7 +270,7 @@ public class LoggerListener implements S
map.put(KEYS.STATUS.name(), "SUCCESS");
}
writeLog(map);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
LOG.log(Level.WARNING, "Failed to capture or write logging
details", ex);
}
}
@@ -311,7 +311,7 @@ public class LoggerListener implements S
map.put(KEYS.STATUS.name(), "SUCCESS");
}
writeLog(map);
- } catch (Exception ex) {
+ } catch (Throwable ex) {
LOG.log(Level.WARNING, "Failed to capture or write logging
details", ex);
}
}
@@ -357,8 +357,8 @@ public class LoggerListener implements S
this.dateFormat = new SimpleDateFormat(format);
}
- public Level getLogLevel() {
- return logLevel;
+ public String getLogLevel() {
+ return logLevel.getName();
}
public void setLogLevel(String logLevel) {
