Author: lresende
Date: Fri Oct 31 16:27:42 2008
New Revision: 709599
URL: http://svn.apache.org/viewvc?rev=709599&view=rev
Log:
Removing unnecessary abdera dependency.
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF?rev=709599&r1=709598&r2=709599&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/META-INF/MANIFEST.MF
Fri Oct 31 16:27:42 2008
@@ -22,7 +22,6 @@
javax.servlet.http,
javax.xml.namespace,
junit.framework;resolution:=optional,
- org.apache.abdera.parser,
org.apache.commons.codec.binary,
org.apache.commons.httpclient,
org.apache.commons.httpclient.auth,
Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml?rev=709599&r1=709598&r2=709599&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
(original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml Fri Oct
31 16:27:42 2008
@@ -73,12 +73,6 @@
</dependency>
<dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-core</artifactId>
- <version>0.4.0-incubating</version>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java?rev=709599&r1=709598&r2=709599&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
Fri Oct 31 16:27:42 2008
@@ -38,8 +38,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
-import org.apache.abdera.parser.ParseException;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.databinding.Mediator;
@@ -56,6 +54,7 @@
import com.google.gdata.data.ExtensionProfile;
import com.google.gdata.data.ParseSource;
import com.google.gdata.data.PlainTextConstruct;
+import com.google.gdata.util.ParseException;
import com.google.gdata.util.ServiceException;
@@ -414,14 +413,10 @@
try {
ParseSource source = new ParseSource(request.getReader());
feedEntry = com.google.gdata.data.Entry.readEntry(source,
com.google.gdata.data.Entry.class, null);
- } catch (ParseException pe) {
+ } catch (com.google.gdata.util.ParseException pe) {
throw new ServletException(pe);
- } catch (com.google.gdata.util.ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (ServiceException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new ServletException(e);
}
// Let the component implementation create it
@@ -486,26 +481,21 @@
// Write the created Atom entry
response.setStatus(HttpServletResponse.SC_CREATED);
response.setContentType("application/atom+xml; charset=utf-8");
- try {
-
- // Generate the corresponding Atom representation of the
- // feed
- StringWriter stringWriter = new StringWriter();
- com.google.gdata.util.common.xml.XmlWriter w =
- new
com.google.gdata.util.common.xml.XmlWriter(stringWriter);
- createdFeedEntry.generateAtom(w, new ExtensionProfile());
- w.flush();
- // Write the Atom representation(XML) into Http response
- // content
- OutputStreamWriter osw = new
OutputStreamWriter(response.getOutputStream());
- PrintWriter out = new
PrintWriter(response.getOutputStream());
- out.println(stringWriter.toString());
- out.close();
+ // Generate the corresponding Atom representation of the
+ // feed
+ StringWriter stringWriter = new StringWriter();
+ com.google.gdata.util.common.xml.XmlWriter w =
+ new
com.google.gdata.util.common.xml.XmlWriter(stringWriter);
+ createdFeedEntry.generateAtom(w, new ExtensionProfile());
+ w.flush();
- } catch (ParseException pe) {
- throw new ServletException(pe);
- }
+ // Write the Atom representation(XML) into Http response
+ // content
+ OutputStreamWriter osw = new
OutputStreamWriter(response.getOutputStream());
+ PrintWriter out = new PrintWriter(response.getOutputStream());
+ out.println(stringWriter.toString());
+ out.close();
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
@@ -551,11 +541,8 @@
feedEntry = com.google.gdata.data.Entry.readEntry(source,
com.google.gdata.data.Entry.class, null);
System.out.println("[Debug Info] localServlet doPut ---
feedEntry title: " + feedEntry.getTitle().getPlainText());
- } catch (ParseException pe) {
+ } catch (com.google.gdata.util.ParseException pe) {
throw new ServletException(pe);
- } catch (com.google.gdata.util.ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (ServiceException e) {
// TODO Auto-generated catch block
e.printStackTrace();
