Author: alexsmirnov
Date: 2010-05-05 19:50:39 -0400 (Wed, 05 May 2010)
New Revision: 16902
Modified:
root/cdk/trunk/plugins/commons/src/test/java/org/richfaces/cdk/CdkTestRunner.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java
root/cdk/trunk/plugins/xinclude/pom.xml
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformer.java
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerContext.java
root/cdk/trunk/plugins/xinclude/src/test/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformerTest.java
Log:
switch Xinclude to CDK logger
Modified:
root/cdk/trunk/plugins/commons/src/test/java/org/richfaces/cdk/CdkTestRunner.java
===================================================================
---
root/cdk/trunk/plugins/commons/src/test/java/org/richfaces/cdk/CdkTestRunner.java 2010-05-05
23:22:04 UTC (rev 16901)
+++
root/cdk/trunk/plugins/commons/src/test/java/org/richfaces/cdk/CdkTestRunner.java 2010-05-05
23:50:39 UTC (rev 16902)
@@ -111,8 +111,8 @@
for (Field field : fieldValues.keySet()) {
Binding binding = fieldValues.get(field);
field.setAccessible(true);
- if (null != binding.value && field.get(test) == null) {
- field.set(test, binding.value);
+ if (null != binding.getValue() && field.get(test) == null) {
+ field.set(test, binding.getValue());
}
}
@@ -178,12 +178,12 @@
}
}
Binding binding = fields.get(field);
- if (null != binding.value) {
- builder.toInstance(binding.value);
- } else if (null != binding.implementation) {
- builder.to(binding.implementation);
- } else if (null != binding.provider) {
- builder.toProvider(binding.provider);
+ if (null != binding.getValue()) {
+ builder.toInstance(binding.getValue());
+ } else if (null != binding.getImplementation()) {
+ builder.to(binding.getImplementation());
+ } else if (null != binding.getProvider()) {
+ builder.toProvider(binding.getProvider());
}
}
}
@@ -191,8 +191,8 @@
@Override
public void replay() {
for (Binding field : fields.values()) {
- if(null != field.value){
- EasyMock.replay(field.value);
+ if(null != field.getValue()){
+ EasyMock.replay(field.getValue());
}
}
}
@@ -200,17 +200,66 @@
@Override
public void verify() {
for (Binding field : fields.values()) {
- if(null != field.value){
- EasyMock.verify(field.value);
+ if(null != field.getValue()){
+ EasyMock.verify(field.getValue());
}
}
}
}
+ /**
+ * <p class="changed_added_4_0">Binding definition storage</p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
protected static final class Binding {
private Object value;
private Class<?> implementation;
private Class<? extends Provider<?>> provider;
+ protected Binding() {
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param value the value to set
+ */
+ void setValue(Object value) {
+ this.value = value;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the value
+ */
+ Object getValue() {
+ return value;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param implementation the implementation to set
+ */
+ void setImplementation(Class<?> implementation) {
+ this.implementation = implementation;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the implementation
+ */
+ Class<?> getImplementation() {
+ return implementation;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param provider the provider to set
+ */
+ void setProvider(Class<? extends Provider<?>> provider) {
+ this.provider = provider;
+ }
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the provider
+ */
+ Class<? extends Provider<?>> getProvider() {
+ return provider;
+ }
}
private Map<Field, Binding> getMockValues(Set<Field> testFields) {
@@ -219,19 +268,19 @@
for (Field field : testFields) {
if (field.getAnnotation(Mock.class) != null) {
Binding bind = new Binding();
- bind.value = EasyMock.createStrictMock(field.getType());
+ bind.setValue(EasyMock.createStrictMock(field.getType()));
mocksAndStubs.put(field, bind);
} else if (field.getAnnotation(Stub.class) != null) {
Binding bind = new Binding();
- bind.value = EasyMock.createNiceMock(field.getType());
+ bind.setValue(EasyMock.createNiceMock(field.getType()));
mocksAndStubs.put(field, bind);
} else if (null != field.getAnnotation(As.class)) {
Binding bind = new Binding();
- bind.implementation = field.getAnnotation(As.class).value();
+ bind.setImplementation(field.getAnnotation(As.class).value());
mocksAndStubs.put(field, bind);
} else if (null != field.getAnnotation(AsProvider.class)) {
Binding bind = new Binding();
- bind.provider = field.getAnnotation(AsProvider.class).value();
+ bind.setProvider(field.getAnnotation(AsProvider.class).value());
mocksAndStubs.put(field, bind);
}
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2010-05-05
23:22:04 UTC (rev 16901)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/JAXBBinding.java 2010-05-05
23:50:39 UTC (rev 16902)
@@ -29,6 +29,7 @@
import com.google.inject.Inject;
import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer;
import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.Logger;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -59,7 +60,11 @@
@Inject
private EntityResolver2 resolver;
+
+ @Inject
+ private Logger log;
+
public JAXBBinding() { }
/* (non-Javadoc)
@@ -124,7 +129,7 @@
Unmarshaller u = JAXBContext.newInstance(bindClass).createUnmarshaller();
u.setEventHandler(new ValidationEventCollector());
- XIncludeTransformer xIncludeTransformer = new XIncludeTransformer();
+ XIncludeTransformer xIncludeTransformer = new XIncludeTransformer(log);
if (null != inputSource.getSystemId()) {
xIncludeTransformer.setBaseUri(new URI(inputSource.getSystemId()));
Modified: root/cdk/trunk/plugins/xinclude/pom.xml
===================================================================
--- root/cdk/trunk/plugins/xinclude/pom.xml 2010-05-05 23:22:04 UTC (rev 16901)
+++ root/cdk/trunk/plugins/xinclude/pom.xml 2010-05-05 23:50:39 UTC (rev 16902)
@@ -45,8 +45,8 @@
<artifactId>xmlunit</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>commons</artifactId>
<!--<scope>test</scope>-->
</dependency>
</dependencies>
Modified:
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformer.java
===================================================================
---
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformer.java 2010-05-05
23:22:04 UTC (rev 16901)
+++
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformer.java 2010-05-05
23:50:39 UTC (rev 16902)
@@ -19,26 +19,27 @@
*/
package org.apache.cocoon.pipeline.component.sax;
+import java.io.IOException;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.cocoon.pipeline.component.xpointer.XPointer;
import org.apache.cocoon.pipeline.component.xpointer.XPointerContext;
import org.apache.cocoon.pipeline.component.xpointer.parser.ParseException;
import org.apache.cocoon.pipeline.component.xpointer.parser.XPointerFrameworkParser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.xml.sax.*;
+import org.richfaces.cdk.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
import org.xml.sax.ext.EntityResolver2;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.XMLReaderFactory;
-import java.io.IOException;
-
-import java.net.URI;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
public final class XIncludeTransformer implements SAXConsumer {
private static final String DEFAULT_CHARSET = "UTF-8";
private static final String HTTP_ACCEPT = "Accept";
@@ -55,7 +56,7 @@
private static final String XINCLUDE_PARSE_TEXT = "text";
private static final String XINCLUDE_PARSE_XML = "xml";
private static final String XINCLUDE_XPOINTER = "xpointer";
- private static final Log LOG = LogFactory.getLog(XIncludeTransformer.class);
+ private final Logger LOG ;
/** The nesting level of fallback that should be used */
private int useFallbackLevel = 0;
@@ -82,12 +83,12 @@
private Locator locator;
private EntityResolver2 resolver;
- public XIncludeTransformer() {
-
- // default empty constructor
+ public XIncludeTransformer(Logger log) {
+ this.LOG = log;
}
- public XIncludeTransformer(URI baseUri) {
+ public XIncludeTransformer(URI baseUri,Logger log) {
+ this(log);
this.setBaseUri(baseUri);
}
@@ -260,7 +261,7 @@
try {
if (xpointer != null && xpointer.length() > 0) {
XPointer xPointer = XPointerFrameworkParser.parse(xpointer);
- XPointerContext xPointerContext = new XPointerContext(xpointer,
source, this, resolver);
+ XPointerContext xPointerContext = new XPointerContext(xpointer,
source, this, resolver,LOG);
for (Entry<String, String> namespace : namespaces.entrySet())
{
xPointerContext.addPrefix(namespace.getKey(),
namespace.getValue());
@@ -281,13 +282,13 @@
// this exception is thrown in case of an invalid xpointer expression
useFallbackLevel++;
- LOG.error("Error parsing XPointer expression, will try to use
fallback.", e);
+ LOG.info("Error parsing XPointer expression:
"+e.getMessage()+" , will try to use fallback.");
} catch (IOException e) {
useFallbackLevel++;
- LOG.error("Error processing an xInclude, will try to use
fallback.", e);
+ LOG.info("Error processing an xInclude: "+e.getMessage()+"
will try to use fallback.");
} catch (SAXException e) {
useFallbackLevel++;
- LOG.error("Error processing an xInclude, will try to use
fallback.", e);
+ LOG.info("Error processing an xInclude: "+e.getMessage()+"
will try to use fallback.");
}
} else if (XINCLUDE_PARSE_TEXT.equals(parse)) {
if (xpointer != null) {
Modified:
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerContext.java
===================================================================
---
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerContext.java 2010-05-05
23:22:04 UTC (rev 16901)
+++
root/cdk/trunk/plugins/xinclude/src/main/java/org/apache/cocoon/pipeline/component/xpointer/XPointerContext.java 2010-05-05
23:50:39 UTC (rev 16902)
@@ -19,32 +19,27 @@
*/
package org.apache.cocoon.pipeline.component.xpointer;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.namespace.NamespaceContext;
+
import org.apache.cocoon.pipeline.component.sax.SAXConsumer;
-import org.apache.cocoon.pipeline.component.sax.XIncludeTransformer;
import org.apache.cocoon.pipeline.util.dom.DOMUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import org.richfaces.cdk.Logger;
import org.w3c.dom.Document;
-
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.xml.namespace.NamespaceContext;
-
-import java.io.IOException;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
public final class XPointerContext implements NamespaceContext {
private static final String XML = "xml";
private static final String XMLNS = "xmlns";
private static final String XMLNS_NAMESPACE =
"http://www.w3.org/2000/xmlns/";
private static final String XML_NAMESPACE =
"http://www.w3.org/XML/1998/namespace";
- private static final Log LOGGER = LogFactory.getLog(XIncludeTransformer.class);
+ private final Logger LOGGER ;
private Map<String, String> prefixes = new HashMap<String, String>();
private Document document;
private final EntityResolver resolver;
@@ -52,11 +47,12 @@
private String xPointer;
private SAXConsumer xmlConsumer;
- public XPointerContext(String xPointer, InputSource source, SAXConsumer xmlConsumer,
EntityResolver resolver) {
+ public XPointerContext(String xPointer, InputSource source, SAXConsumer xmlConsumer,
EntityResolver resolver, Logger log) {
this.xPointer = xPointer;
this.source = source;
this.xmlConsumer = xmlConsumer;
this.resolver = resolver;
+ this.LOGGER = log;
}
public String getXPointer() {
@@ -71,7 +67,7 @@
return xmlConsumer;
}
- public Log getLogger() {
+ public Logger getLogger() {
return LOGGER;
}
Modified:
root/cdk/trunk/plugins/xinclude/src/test/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformerTest.java
===================================================================
---
root/cdk/trunk/plugins/xinclude/src/test/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformerTest.java 2010-05-05
23:22:04 UTC (rev 16901)
+++
root/cdk/trunk/plugins/xinclude/src/test/java/org/apache/cocoon/pipeline/component/sax/XIncludeTransformerTest.java 2010-05-05
23:50:39 UTC (rev 16902)
@@ -37,6 +37,7 @@
import org.junit.Ignore;
import org.junit.Test;
+import org.richfaces.cdk.JavaLogger;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
@@ -109,7 +110,7 @@
transformerHandler.getTransformer().setOutputProperties(properties);
transformerHandler.setResult(new StreamResult(baos));
- XIncludeTransformer xinclude = new XIncludeTransformer(base.toURI());
+ XIncludeTransformer xinclude = new XIncludeTransformer(base.toURI(),new
JavaLogger());
xinclude.setContentHandler(transformerHandler);