Author: paperwing
Date: 2012-04-10 18:55:50 -0700 (Tue, 10 Apr 2012)
New Revision: 28792
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
Log:
Changed dependency on Apache commons-io library version from 2.2 to 1.4, which
was already present as one of the Cytoscape dependencies. This would make it
easier for others to build the project.
Modified: csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
===================================================================
--- csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
2012-04-11 01:43:17 UTC (rev 28791)
+++ csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/pom.xml
2012-04-11 01:55:50 UTC (rev 28792)
@@ -116,11 +116,19 @@
</dependency>
<!-- dependencies for file copying and moving utilities -->
+ <!-- commons-io 2.2 dependency
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>commons-io</artifactId>
<version>2.2</version>
</dependency>
+ -->
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+
<artifactId>com.springsource.org.apache.commons.io</artifactId>
+ <version>1.4.0</version>
+ </dependency>
<!-- dependencies needed for plugin manager -->
<dependency>
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-04-11 01:43:17 UTC (rev 28791)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-04-11 01:55:50 UTC (rev 28792)
@@ -127,7 +127,7 @@
File appFile = app.getAppFile();
// Only perform the copy if the app was not already in
the target directory
- if
(!FileUtils.directoryContains(installedAppsDirectory, appFile)) {
+ if (appFile.getParentFile().getCanonicalPath() !=
installedAppsDirectory.getCanonicalPath()) {
// Uses Apache Commons library; overwrites
files with the same name.
FileUtils.copyFileToDirectory(appFile,
installedAppsDirectory);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
