Author: lindner
Date: Sun Jan 11 20:07:09 2009
New Revision: 733604
URL: http://svn.apache.org/viewvc?rev=733604&view=rev
Log:
SHINDIG-837 | Patch from Vincent Siveton | Delete temp file on exit
SHINDIG-834 | Patch from Vincent Siveton | Relocate xstream dependency
Modified:
incubator/shindig/branches/1.0.x-incubating/ (props changed)
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
incubator/shindig/branches/1.0.x-incubating/pom.xml
Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 20:07:09 2009
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596
+/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733603
Modified:
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=733604&r1=733603&r2=733604&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
Sun Jan 11 20:07:09 2009
@@ -92,6 +92,7 @@
public void testFileReferences() throws Exception {
File temp = File.createTempFile(getName(), ".js-noopt");
+ temp.deleteOnExit();
BufferedWriter out = new BufferedWriter(new FileWriter(temp));
out.write(DEF_JS_CONTENT);
out.close();
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml?rev=733604&r1=733603&r2=733604&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
(original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml Sun Jan
11 20:07:09 2009
@@ -131,7 +131,7 @@
<artifactId>annotations</artifactId>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=733604&r1=733603&r2=733604&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/pom.xml Sun Jan 11 20:07:09 2009
@@ -1055,7 +1055,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2</version>
</dependency>
