date:20130110

svn commit: r1431482 - in /struts/struts2/trunk: ./ xwork-core/ xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/ xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/

2013-01-10 Thread jogep

Author: jogep
Date: Thu Jan 10 16:26:26 2013
New Revision: 1431482

URL: http://svn.apache.org/viewvc?rev=1431482&view=rev
Log:
WW-3959 Support for Slf4j as optional XWork Logging Backend

Added:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLoggerFactory.java
Modified:
struts/struts2/trunk/pom.xml
struts/struts2/trunk/xwork-core/pom.xml

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1431482&r1=1431481&r2=1431482&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Jan 10 16:26:26 2013
@@ -652,6 +652,17 @@
 
 
 
+org.slf4j
+slf4j-api
+1.7.2
+
+
+org.slf4j
+slf4j-simple
+1.7.2
+
+
+
 org.testng
 testng
 5.1

Modified: struts/struts2/trunk/xwork-core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=1431482&r1=1431481&r2=1431482&view=diff
==
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Thu Jan 10 16:26:26 2013
@@ -268,6 +268,17 @@
 test
 
 
+
+
+org.slf4j
+slf4j-api
+true
+
+
+org.slf4j
+slf4j-simple
+true
+
 
 
 

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java?rev=1431482&r1=1431481&r2=1431482&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java
 Thu Jan 10 16:26:26 2013
@@ -16,6 +16,7 @@
 package com.opensymphony.xwork2.util.logging;
 
 import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
+import com.opensymphony.xwork2.util.logging.slf4j.Slf4jLoggerFactory;
 
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -59,11 +60,17 @@ public abstract class LoggerFactory {
 try {
 if (factory == null) {
 try {
-Class.forName("org.apache.commons.logging.LogFactory");
-factory = new 
com.opensymphony.xwork2.util.logging.commons.CommonsLoggerFactory();
+Class.forName("org.slf4j.LoggerFactory");
+factory = new Slf4jLoggerFactory();
 } catch (ClassNotFoundException ex) {
-// commons logging not found, falling back to jdk logging
-factory = new JdkLoggerFactory();
+//slf4j not found try commons LogFactory
+try {
+Class.forName("org.apache.commons.logging.LogFactory");
+factory = new 
com.opensymphony.xwork2.util.logging.commons.CommonsLoggerFactory();
+} catch (ClassNotFoundException cnfex) {
+// commons logging not found, falling back to jdk 
logging
+factory = new JdkLoggerFactory();
+}
 }
 }
 return factory;

Added: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java?rev=1431482&view=auto
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
 (added)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
 Thu Jan 10 16:26:26 2013
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of

svn commit: r1431540 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java

2013-01-10 Thread lukaszlenart

Author: lukaszlenart
Date: Thu Jan 10 18:18:39 2013
New Revision: 1431540

URL: http://svn.apache.org/viewvc?rev=1431540&view=rev
Log:
Adds missing documentation section

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java?rev=1431540&r1=1431539&r2=1431540&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
 Thu Jan 10 18:18:39 2013
@@ -3,24 +3,32 @@ package com.opensymphony.xwork2.validato
 import com.opensymphony.xwork2.validator.ValidationException;
 
 /**
- * ConditionalVisitorFieldValidator
+ * 
+ * The ConditionalVisitorFieldValidator will forward validation to the 
VisitorFieldValidator
+ * only if the expression will evaluate to true.
+ * 
  *
+ * 
+ * 
+ * expression - an OGNL expression which should evaluate to true to 
pass validation to the VisitorFieldValidator
+ * 
+ * 
  *
+ * 
+ * 
  * 
- *   
- * reason == 'colleague' and colleaguePositionID == '_CHOOSE_'
- * You must choose a position where you worked with this 
person,
- * or choose "Other..."
- *   
- *   
- * reason == 'colleague' and colleaguePositionID == 'OTHER'
- * 
- *   
+ * 
+ * reason == 'colleague' and 
colleaguePositionID == 'OTHER'
+ * You must select reason Colleague and position 
Other
+ * 
  * 
+ * 
+ * 
  *
  * @author Matt Raible
  */
 public class ConditionalVisitorFieldValidator extends VisitorFieldValidator {
+
 private String expression;
 
 public void setExpression(String expression) {
@@ -58,11 +66,9 @@ public class ConditionalVisitorFieldVali
 
 try {
 obj = getFieldValue(expression, object);
-}
-catch (ValidationException e) {
+} catch (ValidationException e) {
 throw e;
-}
-catch (Exception e) {
+} catch (Exception e) {
 // let this pass, but it will be logged right below
 }
 
@@ -74,4 +80,5 @@ public class ConditionalVisitorFieldVali
 
 return answer;
 }
+
 } 
\ No newline at end of file

[CONF] Confluence Changes in the last 24 hours

2013-01-10 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache Ambari (Incubating) (https://cwiki.apache.org/confluence/display/AMBARI)

Pages
-
Afganistan 2 created by exim (10:11 AM)
https://cwiki.apache.org/confluence/display/AMBARI/Afganistan+2

Afganistan created by exim (10:09 AM)
https://cwiki.apache.org/confluence/display/AMBARI/Afganistan

exim 1 created by exim (10:07 AM)
https://cwiki.apache.org/confluence/display/AMBARI/2013/01/10/exim+1

exim created by exim (10:04 AM)
https://cwiki.apache.org/confluence/display/AMBARI/exim



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Camel 2.11.0 Release edited by  bvahdat  (04:28 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.11.0+Release

Articles edited by  davsclaus  (06:09 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Articles



Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK)

Pages
-
CloudStack 4.1 Release edited by  sailajam  (11:58 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+4.1+Release

Understanding Dashboard edited by  nitin.me...@citrix.com  (11:30 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Understanding+Dashboard

devcloud-kvm created by mlsorensen (08:24 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/devcloud-kvm

Cisco UCS Integration functional spec created by frank.zh...@citrix.com (06:28 
PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Cisco+UCS+Integration+functional+spec

Add Remove Networks to VMs created by blan...@betterservers.com (05:44 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Add+Remove+Networks+to+VMs

CloudStack Version Numbers edited by  chiradeep  (04:39 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Version+Numbers

FS - Persistent Networks edited by  likitha.she...@citrix.com  (01:42 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+-+Persistent+Networks

Minutes 8th Jan 2013 created by sailajam (12:30 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Minutes+8th+Jan+2013

FS for Integrating CS alerts via SNMP to external management system edited by  
anshulg  (12:15 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+for+Integrating+CS+alerts+via+SNMP+to+external+management+system



Apache cTAKES (https://cwiki.apache.org/confluence/display/CTAKES)

Pages
-
cTAKES 3.0 Developer Guide edited by  bleeker  (05:26 PM)
https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+Developer+Guide

Documentation Conventions edited by  bleeker  (02:59 PM)
https://cwiki.apache.org/confluence/display/CTAKES/Documentation+Conventions



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
WSRMConfiguration edited by  cohei...@apache.org  (06:38 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/WSRMConfiguration

Provider Services edited by  cohei...@apache.org  (06:32 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Provider+Services

JAX-WS Dispatch API edited by  cohei...@apache.org  (06:14 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-WS+Dispatch+API



Apache Felix (https://cwiki.apache.org/confluence/display/FELIX)

Pages
-
Board Report (2013-03) edited by  fmeschbe  (09:59 AM)
https://cwiki.apache.org/confluence/display/FELIX/Board+Report+%282013-03%29



Apache Flex (https://cwiki.apache.org/confluence/display/FLEX)

Pages
-
ToDo edited by  e...@ixsoftware.nl  (08:39 AM)
https://cwiki.apache.org/confluence/display/FLEX/ToDo

Full Table edited by  e...@ixsoftware.nl  (08:32 AM)
https://cwiki.apache.org/confluence/display/FLEX/Full+Table



Apache Hive (https://cwiki.apache.org/confluence/display/Hive)

Pages
-
Enhanced Aggregation, Cube, Grouping and Rollup edited by  namit.jain  (12:55 
AM)
https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C+Grouping+and+Rollup



Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA)

Pages
-
Powered By edited by  o...@datadoghq.com  (02:55 PM)
https://cwiki.apache.org/confluence/display/KAFKA/Powered+By

Clients edited by  o...@datadoghq.com  (12:39 AM)
https://cwiki.apache.org/confluence/display/KAFKA/Clients

Eco

svn commit: r1431482 - in /struts/struts2/trunk: ./ xwork-core/ xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/ xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/

svn commit: r1431540 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java

[CONF] Confluence Changes in the last 24 hours

3 matches

Site Navigation

Mail list logo

Footer information