Author: lindner
Date: Wed Jul 8 21:03:04 2009
New Revision: 792320
URL: http://svn.apache.org/viewvc?rev=792320&view=rev
Log:
fix dependencies, remove json-lib
Removed:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/BaseJsonLibConfig.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/BeanJsonLibConversionException.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/InjectorBeanInstanceStrategy.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtils.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpher.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/NullDefaultValueProcessor.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/NullPropertyFilter.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverterTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidatorException.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidatorTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtilsTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibTestsGuiceModule.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpherTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/NullDefaultValueProcessorTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/NullPropertyFilterTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/samples/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=792320&r1=792319&r2=792320&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Wed Jul 8 21:03:04 2009
@@ -127,13 +127,6 @@
<artifactId>oauth</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.2.2</version>
- <classifier>jdk15</classifier>
- <type>jar</type>
- </dependency>
- <dependency>
<artifactId>commons-betwixt</artifactId>
<groupId>commons-betwixt</groupId>
</dependency>
@@ -142,11 +135,6 @@
<artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
@@ -160,8 +148,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>net.sf.ezmorph</groupId>
- <artifactId>ezmorph</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</dependency>
<!-- test -->
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=792320&r1=792319&r2=792320&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed Jul 8 21:03:04 2009
@@ -145,10 +145,6 @@
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
- <artifactId>oauth-consumer</artifactId>
- </dependency>
- <dependency>
- <groupId>net.oauth.core</groupId>
<artifactId>oauth-httpclient3</artifactId>
</dependency>
<dependency>
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=792320&r1=792319&r2=792320&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Wed Jul 8 21:03:04 2009
@@ -140,10 +140,6 @@
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
- <artifactId>oauth-consumer</artifactId>
- </dependency>
- <dependency>
- <groupId>net.oauth.core</groupId>
<artifactId>oauth-httpclient3</artifactId>
</dependency>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=792320&r1=792319&r2=792320&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Wed Jul 8 21:03:04 2009
@@ -80,14 +80,6 @@
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
- <!-- the classifier prevents this working in dep management -->
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.2</version>
- <classifier>jdk15</classifier>
- <type>jar</type>
- </dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
@@ -97,6 +89,10 @@
<artifactId>aopalliance</artifactId>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
@@ -105,23 +101,11 @@
<groupId>commons-lang</groupId>
</dependency>
<dependency>
- <artifactId>commons-betwixt</artifactId>
- <groupId>commons-betwixt</groupId>
- </dependency>
- <dependency>
- <artifactId>commons-collections</artifactId>
- <groupId>commons-collections</groupId>
- </dependency>
- <dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
- <artifactId>oauth-consumer</artifactId>
- </dependency>
- <dependency>
- <groupId>net.oauth.core</groupId>
<artifactId>oauth-httpclient3</artifactId>
</dependency>
@@ -147,10 +131,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.ezmorph</groupId>
- <artifactId>ezmorph</artifactId>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=792320&r1=792319&r2=792320&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Wed Jul 8 21:03:04 2009
@@ -1344,12 +1344,6 @@
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
- <artifactId>oauth-consumer</artifactId>
- <version>20090531</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
<version>20090531</version>
<scope>compile</scope>
