Author: solomax
Date: Wed Feb 20 13:11:58 2013
New Revision: 1448149
URL: http://svn.apache.org/r1448149
Log:
Code added to ensure zip file is not recurcively added to itself;
Wicket libraries version bump;
Modified:
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1448149&r1=1448148&r2=1448149&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Wed Feb 20 13:11:58 2013
@@ -216,31 +216,31 @@
<dependency org="org.simpleframework" name="simple-xml"
rev="2.6.9" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.5.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.6.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.6" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.7" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.6" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.7" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1448149&r1=1448148&r2=1448149&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
Wed Feb 20 13:11:58 2013
@@ -518,14 +518,14 @@ public class BackupExport {
}
}
- private void writeZipDir(File directoryToZip, File f) throws
IOException {
+ private void writeZipDir(File directoryToZip, File zipFile) throws
IOException {
FileOutputStream fos = null;
ZipOutputStream zos = null;
try {
- fos = new FileOutputStream(f);
+ fos = new FileOutputStream(zipFile);
zos = new ZipOutputStream(fos);
- writeZipDir(directoryToZip.toURI(), directoryToZip,
zos);
+ writeZipDir(directoryToZip.toURI(), directoryToZip,
zos, zipFile);
} finally {
if (zos != null) {
try {
@@ -544,10 +544,13 @@ public class BackupExport {
}
}
- private void writeZipDir(URI base, File dir, ZipOutputStream zos)
throws IOException {
+ private void writeZipDir(URI base, File dir, ZipOutputStream zos, File
zipFile) throws IOException {
for (File file : dir.listFiles()) {
+ if (zipFile.equals(file)) {
+ continue;
+ }
if (file.isDirectory()) {
- writeZipDir(base, file, zos);
+ writeZipDir(base, file, zos, zipFile);
} else {
String path =
base.relativize(file.toURI()).toString();
log.debug("Writing '" + path + "' to zip file");
