Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring WebUI Views, PluginInfo and various Util classes. #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactoring WebUI Views, PluginInfo and various Util classes. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions alitheia/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
</dependencies>

<profiles>
Expand Down
147 changes: 0 additions & 147 deletions alitheia/core/src/main/java/eu/sqooss/impl/service/fds/DiskUtil.java
View file
Open in desktop

This file was deleted.

25 changes: 18 additions & 7 deletions alitheia/core/src/main/java/eu/sqooss/impl/service/fds/FDSServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,17 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;

import eu.sqooss.service.util.FileUtils;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.io.FileUtils;
import org.osgi.framework.BundleContext;

import eu.sqooss.impl.service.fds.TimelineImpl;
import eu.sqooss.core.AlitheiaCore;
import eu.sqooss.service.db.DBService;
import eu.sqooss.service.db.ProjectFile;
Expand Down Expand Up @@ -139,7 +138,11 @@ public CleanupThread(String name) {
public void run() {
System.err.println("Cleaning up " + fdsCheckoutRoot);
logger.info("Cleaning up " + fdsCheckoutRoot);
DiskUtil.rmRf(fdsCheckoutRoot);
try {
FileUtils.deleteDirectory(fdsCheckoutRoot);
} catch (IOException e) {
logger.error("Could not remove directory " + fdsCheckoutRoot + ".", e);
}
}
}

Expand All @@ -165,7 +168,11 @@ private OnDiskCheckout createCheckout(SCMAccessor scm, ProjectVersion pv, String
if (checkoutRoot.exists()) {
logger.warn("Checkout root <" + checkoutRoot + "> exists. " +
"Cleaning up");
FileUtils.deleteRecursive(checkoutRoot);
try {
FileUtils.deleteDirectory(checkoutRoot);
} catch (IOException e) {
logger.error("Could not remove directory " + checkoutRoot + ".", e);
}
}
if (!checkoutRoot.mkdirs()) {
logger.warn("Could not create checkout root <" + checkoutRoot
Expand Down Expand Up @@ -653,7 +660,11 @@ public void releaseCheckout(OnDiskCheckout c) {
File root = null;
try {
root = c.getRoot();
FileUtils.deleteRecursive(root);
try {
FileUtils.deleteDirectory(root);
} catch (IOException e) {
logger.error("Could not remove directory " + root + ".", e);
}
} catch (Exception e) {
logger.error("Cannot clean up checkout root: " +
root.getAbsolutePath());
Expand Down
3 changes: 0 additions & 3 deletions alitheia/core/src/main/java/eu/sqooss/impl/service/logging/CyclicLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,4 @@ public String[] getEntries() {
}
}



// vi: ai nosi sw=4 ts=4 expandtab

9 changes: 9 additions & 0 deletions alitheia/core/src/main/java/eu/sqooss/impl/service/pa/MetricInstallationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package eu.sqooss.impl.service.pa;

public class MetricInstallationException extends Exception {

public MetricInstallationException(String message) {
super(message);
}

}
Loading