You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/12/03 14:00:11 UTC
svn commit: r600514 - in /activemq/camel/trunk/components/camel-atom: ./
src/main/java/org/apache/camel/component/atom/
Author: jstrachan
Date: Mon Dec 3 05:00:11 2007
New Revision: 600514
URL: http://svn.apache.org/viewvc?rev=600514&view=rev
Log:
updated pom to upgrade to later Abdera release
Modified:
activemq/camel/trunk/components/camel-atom/pom.xml
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/EntryFilter.java
Modified: activemq/camel/trunk/components/camel-atom/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/pom.xml?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/pom.xml (original)
+++ activemq/camel/trunk/components/camel-atom/pom.xml Mon Dec 3 05:00:11 2007
@@ -34,20 +34,54 @@
<description>Camel Atom support</description>
<properties>
- <camel.osgi.export.pkg>org.apache.camel.component.atom*</camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>org.apache.camel.component.atom*</camel.osgi.export.pkg>
</properties>
<dependencies>
+ <!-- TODO these two should be picked up transitively! -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-core</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions</artifactId>
- <version>0.2.0-incubating</version>
- <scope>compile</scope>
+ <artifactId>abdera-extensions-main</artifactId>
+ <version>0.3.0-incubating</version>
</dependency>
- </dependencies>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomComponent.java Mon Dec 3 05:00:11 2007
@@ -17,10 +17,10 @@
*/
package org.apache.camel.component.atom;
+import java.util.Map;
+
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
-
-import java.util.Map;
/**
* An <a href="http://activemq.apache.org/camel/atom.html">Atom Component</a>.
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java Mon Dec 3 05:00:11 2007
@@ -20,7 +20,6 @@
import java.io.BufferedOutputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
@@ -31,7 +30,6 @@
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.Parser;
-import org.apache.abdera.util.iri.IRISyntaxException;
import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Producer;
@@ -70,7 +68,7 @@
}
}
- public Document<Feed> parseDocument() throws IRISyntaxException, IOException {
+ public Document<Feed> parseDocument() throws Exception {
String uri = getAtomUri();
InputStream in = new URL(uri).openStream();
return createAtomParser().parse(in, uri);
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java Mon Dec 3 05:00:11 2007
@@ -17,13 +17,11 @@
*/
package org.apache.camel.component.atom;
-import java.io.IOException;
import java.util.List;
import org.apache.abdera.model.Document;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.abdera.util.iri.IRISyntaxException;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.PollingConsumerSupport;
@@ -56,10 +54,7 @@
document = null;
return null;
}
- catch (IRISyntaxException e) {
- throw new RuntimeCamelException(e);
- }
- catch (IOException e) {
+ catch (Exception e) {
throw new RuntimeCamelException(e);
}
}
@@ -92,7 +87,7 @@
protected void doStop() throws Exception {
}
- public Document<Feed> getDocument() throws IRISyntaxException, IOException {
+ public Document<Feed> getDocument() throws Exception {
if (document == null) {
document = endpoint.parseDocument();
list = document.getRoot().getEntries();
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java Mon Dec 3 05:00:11 2007
@@ -19,13 +19,10 @@
import org.apache.abdera.model.Document;
import org.apache.abdera.model.Feed;
-import org.apache.abdera.util.iri.IRISyntaxException;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.PollingConsumerSupport;
-import java.io.IOException;
-
/**
* @version $Revision: 1.1 $
*/
@@ -44,10 +41,7 @@
exchange.getIn().setBody(document);
return exchange;
}
- catch (IRISyntaxException e) {
- throw new RuntimeCamelException(e);
- }
- catch (IOException e) {
+ catch (Exception e) {
throw new RuntimeCamelException(e);
}
}
@@ -65,6 +59,4 @@
protected void doStop() throws Exception {
}
-
-
}
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java Mon Dec 3 05:00:11 2007
@@ -17,14 +17,12 @@
*/
package org.apache.camel.component.atom;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import org.apache.abdera.model.Document;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.apache.abdera.util.iri.IRISyntaxException;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ExchangeHelper;
@@ -57,7 +55,7 @@
}
}
- protected Document<Feed> getDocument(Exchange exchange) throws IRISyntaxException, IOException {
+ protected Document<Feed> getDocument(Exchange exchange) throws Exception {
Document<Feed> document = endpoint.parseDocument();
Feed root = document.getRoot();
Entry entry = root.addEntry();
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/EntryFilter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/EntryFilter.java?rev=600514&r1=600513&r2=600514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/EntryFilter.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/EntryFilter.java Mon Dec 3 05:00:11 2007
@@ -17,9 +17,9 @@
*/
package org.apache.camel.component.atom;
-import org.apache.abdera.model.Feed;
import org.apache.abdera.model.Document;
import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.Feed;
/**
* @version $Revision: 1.1 $