You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2009/02/27 08:13:51 UTC
svn commit: r748414 - in /cocoon/cocoon3/trunk: cocoon-docs/src/changes/
cocoon-stax/ cocoon-stax/src/main/java/org/apache/cocoon/stax/
cocoon-stax/src/main/java/org/apache/cocoon/stax/component/
cocoon-stax/src/main/java/org/apache/cocoon/stax/convert...
Author: reinhard
Date: Fri Feb 27 07:13:50 2009
New Revision: 748414
URL: http://svn.apache.org/viewvc?rev=748414&view=rev
Log:
COCOON-27 Java 5 support
Modified:
cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml
cocoon/cocoon3/trunk/cocoon-stax/pom.xml
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXProducer.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXTransformer.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXGenerator.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXSerializer.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/component/IncludeTransformer.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/SAXForStAXPipelineWrapper.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/StAXToSAXPipelineAdapter.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/XMLFilterImplEx.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindCorrespondingStartEndElementPairNavigator.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindEndElementNavigator.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindStartElementNavigator.java
cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/InSubtreeNavigator.java
cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/src/GeneratingStarter.java
cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/test/EmitTransformerTest.java
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-docs/src/changes/changes.xml Fri Feb 27 07:13:50 2009
@@ -72,6 +72,9 @@
[cocoon-stax] Provide wrappers to add SAX-components to StAX pipelines and
Adapters between StAX pipelines and SAX pipelines.
</action>
+ <action dev="reinhard" type="add" issue="COCOON3-27" due-to="Kilian Matt, Andreas Pieber">
+ [cocoon-stax] Java 5 support.
+ </action>
<action dev="stevendolg" type="fix" >
[cocoon-sax] Create a separate SAX module that contains all SAX specific classes.
Modified: cocoon/cocoon3/trunk/cocoon-stax/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/pom.xml?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/pom.xml Fri Feb 27 07:13:50 2009
@@ -53,6 +53,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.cocoon.sax</groupId>
<artifactId>cocoon-sax</artifactId>
<optional>true</optional>
@@ -79,13 +84,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXProducer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXProducer.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXProducer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXProducer.java Fri Feb 27 07:13:50 2009
@@ -21,10 +21,9 @@
import org.apache.cocoon.pipeline.component.Producer;
/**
- * StAX specific abstract class implementing the
- * {@link Producer#setConsumer(Consumer)} method checking if a
- * {@link StAXConsumer} is used, storing it and setting itself as the parent of
- * its consumer.
+ * StAX specific abstract class implementing the {@link Producer#setConsumer(Consumer)} method
+ * checking if a {@link StAXConsumer} is used, storing it and setting itself as the parent of its
+ * consumer.
*/
public abstract class AbstractStAXProducer extends AbstractStAXPipelineComponent implements StAXProducer {
@@ -33,9 +32,8 @@
/**
* {@inheritDoc}
*
- * @see Producer#setConsumer(Consumer)
+ * @see org.apache.cocoon.pipeline.component.Producer#setConsumer(org.apache.cocoon.pipeline.component.Consumer)
*/
- @Override
public void setConsumer(Consumer consumer) {
if (consumer instanceof StAXConsumer) {
this.consumer = (StAXConsumer) consumer;
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXTransformer.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/AbstractStAXTransformer.java Fri Feb 27 07:13:50 2009
@@ -42,7 +42,6 @@
*
* @see StAXConsumer#initiatePullProcessing()
*/
- @Override
public final void initiatePullProcessing() {
this.getConsumer().initiatePullProcessing();
}
@@ -52,7 +51,6 @@
*
* @see StAXConsumer#setParent(StAXProducer)
*/
- @Override
public final void setParent(StAXProducer parent) {
this.parent = parent;
}
@@ -64,7 +62,6 @@
*
* @see StAXProducer#hasNext()
*/
- @Override
public final boolean hasNext() throws XMLStreamException {
if (this.queue.isEmpty()) {
this.produceEvents();
@@ -78,7 +75,6 @@
*
* @see StAXProducer#nextEvent()
*/
- @Override
public final XMLEvent nextEvent() {
return this.queue.poll();
}
@@ -88,7 +84,6 @@
*
* @see StAXProducer#peek()
*/
- @Override
public final XMLEvent peek() {
return this.queue.peek();
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXGenerator.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXGenerator.java Fri Feb 27 07:13:50 2009
@@ -57,9 +57,8 @@
/**
* {@inheritDoc}
*
- * @see Starter#execute()
+ * @see org.apache.cocoon.pipeline.component.Starter#execute()
*/
- @Override
public void execute() {
this.getConsumer().initiatePullProcessing();
}
@@ -67,9 +66,8 @@
/**
* {@inheritDoc}
*
- * @see StAXProducer#hasNext()
+ * @see org.apache.cocoon.stax.StAXProducer#hasNext()
*/
- @Override
public boolean hasNext() {
return this.reader.hasNext();
}
@@ -77,9 +75,8 @@
/**
* {@inheritDoc}
*
- * @see StAXProducer#nextEvent()
+ * @see org.apache.cocoon.stax.StAXProducer#nextEvent()
*/
- @Override
public XMLEvent nextEvent() throws XMLStreamException {
return this.reader.nextEvent();
}
@@ -87,9 +84,8 @@
/**
* {@inheritDoc}
*
- * @see StAXProducer#peek()
+ * @see org.apache.cocoon.stax.StAXProducer#peek()
*/
- @Override
public XMLEvent peek() throws XMLStreamException {
return this.reader.peek();
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXSerializer.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/StAXSerializer.java Fri Feb 27 07:13:50 2009
@@ -41,9 +41,8 @@
/**
* {@inheritDoc}
*
- * @see Finisher#setOutputStream(OutputStream)
+ * @see org.apache.cocoon.pipeline.component.Finisher#setOutputStream(java.io.OutputStream)
*/
- @Override
public void setOutputStream(OutputStream outputStream) {
try {
this.writer = XMLOutputFactory.newInstance().createXMLEventWriter(outputStream, "UTF-8");
@@ -57,9 +56,8 @@
/**
* {@inheritDoc}
*
- * @see StAXConsumer#initiatePullProcessing()
+ * @see org.apache.cocoon.stax.StAXConsumer#initiatePullProcessing()
*/
- @Override
public void initiatePullProcessing() {
try {
while (this.parent.hasNext()) {
@@ -79,9 +77,8 @@
/**
* {@inheritDoc}
*
- * @see StAXConsumer#setParent(StAXProducer)
+ * @see org.apache.cocoon.stax.StAXConsumer#setParent(org.apache.cocoon.stax.StAXProducer)
*/
- @Override
public void setParent(StAXProducer parent) {
this.parent = parent;
}
@@ -89,9 +86,8 @@
/**
* {@inheritDoc}
*
- * @see Finisher#getContentType()
+ * @see org.apache.cocoon.pipeline.component.Finisher#getContentType()
*/
- @Override
public String getContentType() {
return null;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/component/IncludeTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/component/IncludeTransformer.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/component/IncludeTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/component/IncludeTransformer.java Fri Feb 27 07:13:50 2009
@@ -69,7 +69,6 @@
private boolean active;
- @Override
public boolean fulfillsCriteria(XMLEvent event) {
if (event.isStartElement()) {
this.active = event.asStartElement().getName().equals(IncludeTransformer.INCLUDE_QNAME);
@@ -79,7 +78,6 @@
return this.active;
}
- @Override
public boolean isActive() {
return this.active;
}
@@ -88,7 +86,6 @@
private boolean active;
- @Override
public boolean fulfillsCriteria(XMLEvent event) {
if (event.isEndElement()) {
this.active = event.asEndElement().getName().equals(IncludeTransformer.INCLUDE_QNAME);
@@ -98,7 +95,6 @@
return this.active;
}
- @Override
public boolean isActive() {
return this.active;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/SAXForStAXPipelineWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/SAXForStAXPipelineWrapper.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/SAXForStAXPipelineWrapper.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/SAXForStAXPipelineWrapper.java Fri Feb 27 07:13:50 2009
@@ -41,9 +41,8 @@
* {@link StAXConsumer} the {@link SAXForStAXPipelineWrapper} retrieves an {@link XMLEvent} from its
* {@link StAXConsumer} and translate it to an SAXEvent. Each event produced during calling the
* SAX-component are transformed to {@link XMLEvent}s and are stored internally. If the
- * SAX-component produced at least one {@link XMLEvent} all produced {@link XMLEvent}s are
- * returned. Otherwise the next event is pulled from the {@link StAXProducer} and the process is
- * repeated.
+ * SAX-component produced at least one {@link XMLEvent} all produced {@link XMLEvent}s are returned.
+ * Otherwise the next event is pulled from the {@link StAXProducer} and the process is repeated.
*/
public class SAXForStAXPipelineWrapper extends AbstractStAXTransformer implements XMLEventConsumer {
@@ -93,9 +92,8 @@
/**
* {@inheritDoc}
*
- * @see XMLEventConsumer#add(XMLEvent)
+ * @see javax.xml.stream.util.XMLEventConsumer#add(javax.xml.stream.events.XMLEvent)
*/
- @Override
public void add(XMLEvent event) throws XMLStreamException {
this.addEventToQueue(event);
}
@@ -103,7 +101,7 @@
/**
* {@inheritDoc}
*
- * @see AbstractStAXTransformer#produceEvents()
+ * @see org.apache.cocoon.stax.AbstractStAXTransformer#produceEvents()
*/
@Override
protected void produceEvents() throws XMLStreamException {
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/StAXToSAXPipelineAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/StAXToSAXPipelineAdapter.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/StAXToSAXPipelineAdapter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/StAXToSAXPipelineAdapter.java Fri Feb 27 07:13:50 2009
@@ -22,7 +22,6 @@
import org.apache.cocoon.pipeline.SetupException;
import org.apache.cocoon.pipeline.component.AbstractPipelineComponent;
import org.apache.cocoon.pipeline.component.Consumer;
-import org.apache.cocoon.pipeline.component.Producer;
import org.apache.cocoon.sax.SAXConsumer;
import org.apache.cocoon.sax.SAXProducer;
import org.apache.cocoon.stax.StAXConsumer;
@@ -43,9 +42,8 @@
/**
* {@inheritDoc}
*
- * @see Producer#setConsumer(Consumer)
+ * @see org.apache.cocoon.pipeline.component.Producer#setConsumer(org.apache.cocoon.pipeline.component.Consumer)
*/
- @Override
public void setConsumer(Consumer consumer) {
if (!(consumer instanceof SAXConsumer)) {
throw new SetupException("SAXProducer requires an SAXConsumer.");
@@ -60,9 +58,8 @@
/**
* {@inheritDoc}
*
- * @see StAXProducer#setConsumer(Consumer)
+ * @see org.apache.cocoon.stax.StAXConsumer#initiatePullProcessing()
*/
- @Override
public void initiatePullProcessing() {
try {
while (this.parent.hasNext()) {
@@ -76,9 +73,8 @@
/**
* {@inheritDoc}
*
- * @see StAXConsumer#setParent(StAXProducer)
+ * @see org.apache.cocoon.stax.StAXConsumer#setParent(org.apache.cocoon.stax.StAXProducer)
*/
- @Override
public void setParent(StAXProducer parent) {
this.parent = parent;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/StAXEventContentHandler.java Fri Feb 27 07:13:50 2009
@@ -63,7 +63,8 @@
*
* @version from stax-utils stable version stax-utils-20070216
* @original javanet.staxutils.StAXEventContentHandler, javanet.staxutils.StAXContentHandler
- * @modified true (added SAXConsumer and made one class out of StAXEventContentHandler and StAXContentHandler)
+ * @modified true (added SAXConsumer and made one class out of StAXEventContentHandler and
+ * StAXContentHandler)
*/
public class StAXEventContentHandler extends DefaultHandler implements SAXConsumer {
@@ -134,8 +135,8 @@
* the provided XMLEventConsumer
*
* @param consumer The {@link XMLEventConsumer} to which events will be written.
- * @param factory The {@link XMLEventFactory} used to construct events. If <code>null</code>,
- * a default instance will be constructed.
+ * @param factory The {@link XMLEventFactory} used to construct events. If <code>null</code>, a
+ * default instance will be constructed.
*/
public StAXEventContentHandler(XMLEventConsumer consumer, XMLEventFactory factory) {
this.consumer = consumer;
@@ -265,7 +266,6 @@
}
}
- @Override
public void comment(char[] ch, int start, int length) throws SAXException {
this.eventFactory.setLocation(this.getCurrentLocation());
@@ -310,7 +310,6 @@
}
}
- @Override
public void endCDATA() throws SAXException {
this.eventFactory.setLocation(this.getCurrentLocation());
try {
@@ -465,7 +464,6 @@
public void endPrefixMapping(String prefix) throws SAXException {
}
- @Override
public void startCDATA() throws SAXException {
this.isCDATA = true;
if (this.CDATABuffer == null) {
@@ -475,25 +473,20 @@
}
}
- @Override
public void endDTD() throws SAXException {
}
- @Override
public void endEntity(String name) throws SAXException {
}
- @Override
public void startDTD(String name, String publicId, String systemId) throws SAXException {
}
- @Override
public void startEntity(String name) throws SAXException {
}
/**
- * Used to report a {@link SAXException}to the {@link XMLReporter} registered with this
- * handler.
+ * Used to report a {@link SAXException}to the {@link XMLReporter} registered with this handler.
*/
protected void reportException(String type, SAXException e) throws SAXException {
if (this.reporter != null) {
@@ -569,17 +562,14 @@
}
}
- @Override
public void finish() {
// do nothing
}
- @Override
public void setConfiguration(Map<String, ? extends Object> configuration) {
// do nothing
}
- @Override
public void setup(Map<String, Object> parameters) {
// do nothing
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/XMLFilterImplEx.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/XMLFilterImplEx.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/XMLFilterImplEx.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/converter/util/XMLFilterImplEx.java Fri Feb 27 07:13:50 2009
@@ -76,49 +76,42 @@
return this.lexicalHandler;
}
- @Override
public void startDTD(String name, String publicId, String systemId) throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.startDTD(name, publicId, systemId);
}
}
- @Override
public void endDTD() throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.endDTD();
}
}
- @Override
public void startEntity(String name) throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.startEntity(name);
}
}
- @Override
public void endEntity(String name) throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.endEntity(name);
}
}
- @Override
public void startCDATA() throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.startCDATA();
}
}
- @Override
public void endCDATA() throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.endCDATA();
}
}
- @Override
public void comment(char ch[], int start, int length) throws SAXException {
if (this.lexicalHandler != null) {
this.lexicalHandler.comment(ch, start, length);
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindCorrespondingStartEndElementPairNavigator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindCorrespondingStartEndElementPairNavigator.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindCorrespondingStartEndElementPairNavigator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindCorrespondingStartEndElementPairNavigator.java Fri Feb 27 07:13:50 2009
@@ -25,8 +25,6 @@
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
-import org.apache.cocoon.pipeline.Pipeline;
-
/**
* This implementation of the {@link Navigator} returns true every time a {@link StartElement} is
* entered to {@link Navigator#fulfillsCriteria(XMLEvent)} and matches all other conditions entered
@@ -78,9 +76,8 @@
/**
* {@inheritDoc}
*
- * @see Pipeline#fulfillsCriteria(XMLEvent)
+ * @see org.apache.cocoon.stax.navigation.Navigator#fulfillsCriteria(javax.xml.stream.events.XMLEvent)
*/
- @Override
public boolean fulfillsCriteria(XMLEvent event) {
if (event.isStartElement()) {
StartElement element = (StartElement) event;
@@ -120,9 +117,8 @@
/**
* {@inheritDoc}
*
- * @see Navigator#isActive()
+ * @see org.apache.cocoon.stax.navigation.Navigator#isActive()
*/
- @Override
public boolean isActive() {
return this.active;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindEndElementNavigator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindEndElementNavigator.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindEndElementNavigator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindEndElementNavigator.java Fri Feb 27 07:13:50 2009
@@ -25,8 +25,6 @@
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
-import org.apache.cocoon.pipeline.Pipeline;
-
/**
* This implementation of the {@link Navigator} returns true of
* {@link Navigator#fulfillsCriteria(XMLEvent)} any time it is called with a {@link EndElement} full
@@ -76,9 +74,8 @@
/**
* {@inheritDoc}
*
- * @see Pipeline#fulfillsCriteria(XMLEvent)
+ * @see org.apache.cocoon.stax.navigation.Navigator#fulfillsCriteria(javax.xml.stream.events.XMLEvent)
*/
- @Override
public boolean fulfillsCriteria(XMLEvent event) {
if (event.isStartElement()) {
StartElement element = (StartElement) event;
@@ -116,9 +113,8 @@
/**
* {@inheritDoc}
*
- * @see Navigator#isActive()
+ * @see org.apache.cocoon.stax.navigation.Navigator#isActive()
*/
- @Override
public boolean isActive() {
return this.active;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindStartElementNavigator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindStartElementNavigator.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindStartElementNavigator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/FindStartElementNavigator.java Fri Feb 27 07:13:50 2009
@@ -28,8 +28,6 @@
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
-import org.apache.cocoon.pipeline.Pipeline;
-
/**
* This implementation of the {@link Navigator} returns true of
* {@link Navigator#fulfillsCriteria(XMLEvent)} any time it is called with a {@link StartElement}
@@ -91,10 +89,9 @@
/**
* {@inheritDoc}
*
- * @see Pipeline#fulfillsCriteria(XMLEvent)
+ * @see org.apache.cocoon.stax.navigation.Navigator#fulfillsCriteria(javax.xml.stream.events.XMLEvent)
*/
@SuppressWarnings("unchecked")
- @Override
public boolean fulfillsCriteria(XMLEvent event) {
if (event.isStartElement()) {
StartElement element = (StartElement) event;
@@ -160,9 +157,8 @@
/**
* {@inheritDoc}
*
- * @see Navigator#isActive()
+ * @see org.apache.cocoon.stax.navigation.Navigator#isActive()
*/
- @Override
public boolean isActive() {
return this.active;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/InSubtreeNavigator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/InSubtreeNavigator.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/InSubtreeNavigator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/main/java/org/apache/cocoon/stax/navigation/InSubtreeNavigator.java Fri Feb 27 07:13:50 2009
@@ -28,8 +28,6 @@
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
-import org.apache.cocoon.pipeline.Pipeline;
-
/**
* This {@link Navigator} implementation returns as long true as long it is in an opened clause. The
* navigator starts the moment an {@link XMLEvent} is a {@link StartElement} and matches all
@@ -92,10 +90,9 @@
/**
* {@inheritDoc}
*
- * @see Pipeline#fulfillsCriteria(XMLEvent)
+ * @see org.apache.cocoon.stax.navigation.Navigator#fulfillsCriteria(javax.xml.stream.events.XMLEvent)
*/
@SuppressWarnings("unchecked")
- @Override
public boolean fulfillsCriteria(XMLEvent event) {
if (event.isStartElement()) {
StartElement element = (StartElement) event;
@@ -188,9 +185,8 @@
/**
* {@inheritDoc}
*
- * @see Navigator#isActive()
+ * @see org.apache.cocoon.stax.navigation.Navigator#isActive()
*/
- @Override
public boolean isActive() {
return this.active;
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/src/GeneratingStarter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/src/GeneratingStarter.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/src/GeneratingStarter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/src/GeneratingStarter.java Fri Feb 27 07:13:50 2009
@@ -55,7 +55,6 @@
*
* @see org.apache.cocoon.pipeline.component.Starter#execute()
*/
- @Override
public void execute() {
this.getConsumer().initiatePullProcessing();
}
@@ -65,7 +64,6 @@
*
* @see org.apache.cocoon.stax.StAXProducer#hasNext()
*/
- @Override
public boolean hasNext() {
return !this.state.equals(GenerationState.FINISHED);
}
@@ -75,7 +73,6 @@
*
* @see org.apache.cocoon.stax.StAXProducer#nextEvent()
*/
- @Override
public XMLEvent nextEvent() throws XMLStreamException {
return this.createNextElement(false);
}
@@ -137,7 +134,6 @@
*
* @see org.apache.cocoon.stax.StAXProducer#peek()
*/
- @Override
public XMLEvent peek() throws XMLStreamException {
return this.createNextElement(true);
}
Modified: cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/test/EmitTransformerTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/test/EmitTransformerTest.java?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/test/EmitTransformerTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stax/src/test/java/org/apache/cocoon/stax/stress/test/EmitTransformerTest.java Fri Feb 27 07:13:50 2009
@@ -64,12 +64,10 @@
private final XMLEventFactory eventFactory = XMLEventFactory.newInstance();
private boolean startEmitted = false;
- @Override
public boolean hasNext() {
return true;
}
- @Override
public XMLEvent nextEvent() throws XMLStreamException {
if (this.startEmitted) {
return this.eventFactory.createEndElement("", "", "parent");
@@ -79,24 +77,19 @@
}
}
- @Override
public XMLEvent peek() throws XMLStreamException {
throw new RuntimeException("not impl");
}
- @Override
public void setConsumer(Consumer consumer) {
}
- @Override
public void finish() {
}
- @Override
public void setConfiguration(Map<String, ? extends Object> configuration) {
}
- @Override
public void setup(Map<String, Object> parameters) {
}
});
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=748414&r1=748413&r2=748414&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Fri Feb 27 07:13:50 2009
@@ -251,6 +251,11 @@
<version>3.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
<version>0.95</version>
@@ -472,6 +477,11 @@
<version>2.0-beta-8</version>
</plugin>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
<version>1.0-alpha-3</version>