You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/07/21 19:19:49 UTC
svn commit: r678489 - in /incubator/shindig/trunk: ./
java/server/src/test/java/org/apache/shindig/server/endtoend/
java/social-api/
java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/
Author: doll
Date: Mon Jul 21 10:19:49 2008
New Revision: 678489
URL: http://svn.apache.org/viewvc?rev=678489&view=rev
Log:
Removed the abdera dependencies from the java build.
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java?rev=678489&r1=678488&r2=678489&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java Mon Jul 21 10:19:49 2008
@@ -141,7 +141,6 @@
context.addServlet(gadgetServletHolder, GADGET_BASE);
// Attach DataServiceServlet
- // TODO: also support the Abdera codebase
ServletHolder jsonServletHolder = new ServletHolder(new DataServiceServlet());
context.addServlet(jsonServletHolder, JSON_BASE);
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=678489&r1=678488&r2=678489&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Mon Jul 21 10:19:49 2008
@@ -94,14 +94,6 @@
<artifactId>google-collect</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-client</artifactId>
- </dependency>
- <dependency>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
</dependency>
@@ -114,14 +106,6 @@
<groupId>commons-collections</groupId>
</dependency>
<dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions-main</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions-html</artifactId>
- </dependency>
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>test</scope>
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java?rev=678489&r1=678488&r2=678489&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java Mon Jul 21 10:19:49 2008
@@ -43,7 +43,7 @@
.getConfiguration()
.setAttributesForPrimitives(false);
writer.getBindingConfiguration().setMapIDs(false);
- // Print no line endings to match Abdera.
+ // Print no line endings
writer.setEndOfLine("");
writer.setWriteEmptyElements(false);
String toReturn = null;
Modified: incubator/shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=678489&r1=678488&r2=678489&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Mon Jul 21 10:19:49 2008
@@ -665,16 +665,6 @@
<id>oauth</id>
<url>http://oauth.googlecode.com/svn/code/maven</url>
</repository>
-
- <!-- For Abdera -->
- <repository>
- <id>apache-incubating</id>
- <name>Apache Incubating Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<!-- ====================================================================== -->
@@ -799,16 +789,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-server</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-client</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
<artifactId>commons-betwixt</artifactId>
<groupId>commons-betwixt</groupId>
<version>0.8</version>
@@ -824,16 +804,6 @@
<version>6.1.9</version>
</dependency>
<dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions-main</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions-html</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>1.5.2</version>
@@ -852,7 +822,7 @@
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.1</version>
- <!--
+ <!--
htmlunit depends on an out of date rev of commons-io, which ends
up causing classpath problems in generated war files.
-->