Author: scottbw
Date: Tue Mar 9 22:16:49 2010
New Revision: 921165
URL: http://svn.apache.org/viewvc?rev=921165&view=rev
Log:
OK I miscounted :-) this is part 4 of 3 updates of the Shindig integration code
that brings it up to date with the other changes to the Wookie core code; See
WOOKIE-52 for more information on wookie-shindig integration.
Added:
incubator/wookie/trunk/ant/lib/guice-2.0.jar (with props)
incubator/wookie/trunk/ant/lib/oauth-20090531.jar (with props)
Removed:
incubator/wookie/trunk/ant/lib/shindig-common-1.1-SNAPSHOT.jar
Modified:
incubator/wookie/trunk/ivy.xml
Added: incubator/wookie/trunk/ant/lib/guice-2.0.jar
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/lib/guice-2.0.jar?rev=921165&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wookie/trunk/ant/lib/guice-2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/wookie/trunk/ant/lib/oauth-20090531.jar
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/ant/lib/oauth-20090531.jar?rev=921165&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wookie/trunk/ant/lib/oauth-20090531.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/wookie/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/ivy.xml?rev=921165&r1=921164&r2=921165&view=diff
==============================================================================
--- incubator/wookie/trunk/ivy.xml (original)
+++ incubator/wookie/trunk/ivy.xml Tue Mar 9 22:16:49 2010
@@ -48,12 +48,14 @@
</dependency>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.2"
conf="deploy->default">
</dependency>
- <dependency org="org.apache.incubator" name="shindig-common"
rev="1.1-SNAPSHOT">
+ <dependency org="org.apache.shindig" name="shindig-common"
rev="1.1-BETA5-incubating" conf="deploy->default">
</dependency>
<dependency org="org.jdom" name="jdom" rev="1.1"
conf="deploy->default">
</dependency>
<dependency org="org.json" name="json" rev="20080701"
conf="deploy->default">
</dependency>
+ <dependency org="javax.servlet" name="servlet-api" rev="2.5"
conf="deploy->default">
+ </dependency>
<!-- Libraries used in a development/test environment but not in
deployment -->
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.3"
conf="dev->default">
@@ -64,8 +66,8 @@
</dependency>
<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.3"
conf="dev->default">
</dependency>
- <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="6.1.3"
conf="dev->default">
- </dependency>
+ <!--<dependency org="org.mortbay.jetty" name="servlet-api-2.5"
rev="6.1.3" conf="dev->default">
+ </dependency>-->
<dependency org="org.apache.derby" name="derby" rev="10.4.2.0"
conf="dev->default">
</dependency>
