Author: dkulp
Date: Mon Apr 13 21:24:44 2009
New Revision: 764614
URL: http://svn.apache.org/viewvc?rev=764614&view=rev
Log:
Merged revisions 764599,764606 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r764599 | dkulp | 2009-04-13 16:17:46 -0400 (Mon, 13 Apr 2009) | 2 lines
[CXF-2162] If wss4j not found, continue and trap out if it's needed later
........
r764606 | dkulp | 2009-04-13 17:07:57 -0400 (Mon, 13 Apr 2009) | 2 lines
[CXF-2170] Update all logging to use j.u.l
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataService.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 21:24:44 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
Mon Apr 13 21:24:44 2009
@@ -28,6 +28,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Logger;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -37,8 +38,6 @@
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.type.basic.Base64Type;
import org.apache.cxf.aegis.type.basic.BigDecimalType;
import org.apache.cxf.aegis.type.basic.BigIntegerType;
@@ -68,6 +67,7 @@
import org.apache.cxf.aegis.type.xml.SourceType;
import org.apache.cxf.aegis.type.xml.XMLStreamReaderType;
import org.apache.cxf.binding.soap.Soap11;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.common.util.XMLSchemaQNames;
import org.jdom.Element;
@@ -77,7 +77,7 @@
*/
public class DefaultTypeMapping implements TypeMapping {
public static final String DEFAULT_MAPPING_URI =
"urn:org.apache.cxf.aegis.types";
- private static final Log LOG = LogFactory.getLog(DefaultTypeMapping.class);
+ private static final Logger LOG =
LogUtils.getL7dLogger(DefaultTypeMapping.class);
private Map<Class, Type> class2Type;
private Map<QName, Type> xml2Type;
private Map<Class, QName> class2xml;
@@ -146,7 +146,7 @@
xml2Type.put(type.getSchemaType(), type);
}
if (type.getTypeClass() == null && type.getSchemaType() == null) {
- LOG.warn("The type " + type.getClass().getName()
+ LOG.warning("The type " + type.getClass().getName()
+ " supports neither serialization (non-null TypeClass)"
+ " nor deserialization (non-null SchemaType).");
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
Mon Apr 13 21:24:44 2009
@@ -19,13 +19,13 @@
package org.apache.cxf.aegis.type;
import java.util.List;
+import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.util.NamespaceHelper;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.helpers.CastUtils;
import org.jdom.Attribute;
@@ -38,7 +38,7 @@
* @author <a href="mailto:[email protected]";>Dan Diephouse</a>
*/
public final class TypeUtil {
- public static final Log LOG = LogFactory.getLog(TypeUtil.class);
+ public static final Logger LOG = LogUtils.getL7dLogger(TypeUtil.class);
private TypeUtil() {
//utility class
@@ -48,7 +48,7 @@
if (!context.isReadXsiTypes()) {
if (baseType == null) {
- LOG.warn("xsi:type reading disabled, and no type available for
"
+ LOG.warning("xsi:type reading disabled, and no type available
for "
+ xsr.getName());
}
return baseType;
@@ -74,18 +74,18 @@
}
if (baseType != null) {
- LOG.debug("xsi:type=\"" + overrideName
+ LOG.finest("xsi:type=\"" + overrideName
+ "\" was specified, but no corresponding Type was
registered; defaulting to "
+ baseType.getSchemaType());
return baseType;
} else {
- LOG.warn("xsi:type=\"" + overrideName
+ LOG.warning("xsi:type=\"" + overrideName
+ "\" was specified, but no corresponding Type was
registered; no default.");
return null;
}
} else {
if (baseType == null) {
- LOG.warn("xsi:type absent, and no type available for "
+ LOG.warning("xsi:type absent, and no type available for "
+ xsr.getName());
}
return baseType;
@@ -107,7 +107,7 @@
}
if (!context.isReadXsiTypes()) {
- LOG.warn("xsi:type reading disabled, and no type available for "
+ LOG.warning("xsi:type reading disabled, and no type available for
"
+ xsr.getName());
return null;
}
@@ -128,11 +128,11 @@
return type;
}
- LOG.warn("xsi:type=\"" + schemaTypeName
+ LOG.warning("xsi:type=\"" + schemaTypeName
+ "\" was specified, but no corresponding Type was
registered; no default.");
return null;
}
- LOG.warn("xsi:type was not specified for top-level element " +
xsr.getName());
+ LOG.warning("xsi:type was not specified for top-level element " +
xsr.getName());
return null;
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
Mon Apr 13 21:24:44 2009
@@ -28,6 +28,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -43,13 +45,12 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.basic.BeanType;
import org.apache.cxf.aegis.type.basic.XMLBeanTypeInfo;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.logging.LogUtils;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -57,6 +58,7 @@
import org.jdom.input.DOMBuilder;
import org.jdom.xpath.XPath;
+
/**
* Deduce mapping information from an xml file. The xml file should be in the
* same packages as the class, with the name <code>className.aegis.xml</code>.
@@ -94,7 +96,7 @@
* specified.
*/
public class XMLTypeCreator extends AbstractTypeCreator {
- private static final Log LOG = LogFactory.getLog(XMLTypeCreator.class);
+ private static final Logger LOG =
LogUtils.getL7dLogger(XMLTypeCreator.class);
private static List<Class> stopClasses = new ArrayList<Class>();
static {
stopClasses.add(Object.class);
@@ -122,13 +124,13 @@
aegisDocumentBuilderFactory.setSchema(aegisSchema);
} catch (UnsupportedOperationException e) {
//Parsers that don't support schema validation
- LOG.info("Parser doesn't support setSchema. Not validating.",
e);
+ LOG.log(Level.INFO, "Parser doesn't support setSchema. Not
validating.", e);
} catch (IOException ie) {
- LOG.error("Error reading Aegis schema", ie);
+ LOG.log(Level.SEVERE, "Error reading Aegis schema", ie);
} catch (FactoryConfigurationError e) {
- LOG.error("Error reading Aegis schema", e);
+ LOG.log(Level.SEVERE, "Error reading Aegis schema", e);
} catch (SAXException e) {
- LOG.error("Error reading Aegis schema", e);
+ LOG.log(Level.SEVERE, "Error reading Aegis schema", e);
}
}
}
@@ -138,7 +140,7 @@
try {
documentBuilder = aegisDocumentBuilderFactory.newDocumentBuilder();
} catch (ParserConfigurationException e) {
- LOG.error("Unable to create a document builder, e");
+ LOG.log(Level.SEVERE, "Unable to create a document builder, e");
throw new RuntimeException("Unable to create a document builder,
e");
}
org.w3c.dom.Document doc;
@@ -161,26 +163,26 @@
public void error(SAXParseException exception) throws SAXException
{
String message = errorMessage(exception);
- LOG.error(message, exception);
+ LOG.log(Level.SEVERE, message, exception);
throwDatabindingException(message);
}
public void fatalError(SAXParseException exception) throws
SAXException {
String message = errorMessage(exception);
- LOG.error(message, exception);
+ LOG.log(Level.SEVERE, message, exception);
throwDatabindingException(message);
}
public void warning(SAXParseException exception) throws
SAXException {
- LOG.info(errorMessage(exception), exception);
+ LOG.log(Level.INFO, errorMessage(exception), exception);
}
});
try {
doc = documentBuilder.parse(is);
} catch (SAXException e) {
- LOG.error("Error parsing Aegis file.", e); // can't happen due to
+ LOG.log(Level.SEVERE, "Error parsing Aegis file.", e); // can't
happen due to
// above.
return null;
}
@@ -198,16 +200,16 @@
String path = '/' + clazz.getName().replace('.', '/') + ".aegis.xml";
InputStream is = clazz.getResourceAsStream(path);
if (is == null) {
- LOG.debug("Mapping file : " + path + " not found.");
+ LOG.finest("Mapping file : " + path + " not found.");
return null;
}
- LOG.debug("Found mapping file : " + path);
+ LOG.finest("Found mapping file : " + path);
try {
doc = readAegisFile(is, path);
documents.put(clazz.getName(), doc);
return doc;
} catch (IOException e) {
- LOG.error("Error loading file " + path, e);
+ LOG.log(Level.SEVERE, "Error loading file " + path, e);
return null;
}
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
Mon Apr 13 21:24:44 2009
@@ -25,11 +25,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.logging.Logger;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.Type;
@@ -37,6 +36,7 @@
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
import org.jdom.Attribute;
@@ -49,7 +49,7 @@
* @author <a href="mailto:[email protected]";>Dan Diephouse</a>
*/
public class ArrayType extends Type {
- private static final Log LOG = LogFactory.getLog(ArrayType.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(ArrayType.class);
private QName componentName;
private long minOccurs;
@@ -380,7 +380,7 @@
// We couldn't find the type the user specified. One is created
// below instead.
if (type == null) {
- LOG.debug("Couldn't find array component type " +
componentName + ". Creating one instead.");
+ LOG.finest("Couldn't find array component type " +
componentName + ". Creating one instead.");
}
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
Mon Apr 13 21:24:44 2009
@@ -23,19 +23,19 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.Type;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.logging.LogUtils;
import org.jdom.Element;
public class XMLBeanTypeInfo extends BeanTypeInfo {
- private static final Log LOG = LogFactory.getLog(XMLBeanTypeInfo.class);
+ private static final Logger LOG =
LogUtils.getL7dLogger(XMLBeanTypeInfo.class);
private List mappings;
/**
@@ -71,7 +71,7 @@
return;
}
- LOG.debug("Found mapping for property " + pd.getName());
+ LOG.finest("Found mapping for property " + pd.getName());
style = e.getAttributeValue("style");
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
Mon Apr 13 21:24:44 2009
@@ -25,10 +25,10 @@
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
+import java.util.logging.Logger;
+
import javax.xml.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.Type;
@@ -38,13 +38,14 @@
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.binding.soap.Soap11;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.jdom.Element;
import static
org.apache.cxf.aegis.type.encoded.SoapEncodingUtil.readAttributeValue;
public class SoapArrayType extends Type {
- private static final Log LOG = LogFactory.getLog(SoapArrayType.class);
+ private static final Logger LOG =
LogUtils.getL7dLogger(SoapArrayType.class);
private static final String SOAP_ENCODING_NS_1_1 =
Soap11.getInstance().getSoapEncodingStyle();
private static final QName SOAP_ARRAY_POSITION = new
QName(SOAP_ENCODING_NS_1_1, "position");
@@ -388,7 +389,7 @@
// We couldn't find the type the user specified. One is created
// below instead.
if (type == null) {
- LOG.debug("Couldn't find array component type " +
componentName + ". Creating one instead.");
+ LOG.finest("Couldn't find array component type " +
componentName + ". Creating one instead.");
}
}
Modified:
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataService.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataService.java?rev=764614&r1=764613&r2=764614&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataService.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataService.java
Mon Apr 13 21:24:44 2009
@@ -20,20 +20,13 @@
import java.util.zip.CRC32;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class BinaryDataService {
- private final Log log = LogFactory.getLog(getClass());
public String verifyDataIntegrity(byte[] data, int length, long crc32) {
- log.debug("verifyDataIntegrity([" + data.length + " bytes of data], "
+ length + ", " + crc32
- + ") called.");
- String status = getStatusForData(data, length, crc32);
+ return getStatusForData(data, length, crc32);
- log.debug("verifyDataIntegrity status: " + status);
- return status;
}
/**
