diff --git a/conformance/org.universaal.tools.conformanceTools/.settings/org.sonar.ide.eclipse.core.prefs b/conformance/org.universaal.tools.conformanceTools/.settings/org.sonar.ide.eclipse.core.prefs
index 02cad538291e8386ff5a34f487423a4caa15efcb..64d43cb264184bc66360dfe6cf356f380822cc58 100644
--- a/conformance/org.universaal.tools.conformanceTools/.settings/org.sonar.ide.eclipse.core.prefs
+++ b/conformance/org.universaal.tools.conformanceTools/.settings/org.sonar.ide.eclipse.core.prefs
@@ -1,7 +1,6 @@
-#Tue Apr 17 17:32:42 CEST 2012
-eclipse.preferences.version=1
-projectArtifactId=
-projectBranch=
-projectGroupId=
-serverUrl=http\://84.124.53.250\:9000
-version=1
+eclipse.preferences.version=1
+projectArtifactId=
+projectBranch=
+projectGroupId=
+serverUrl=http\://84.124.53.250\:9000
+version=1
diff --git a/conformance/org.universaal.tools.conformanceTools/META-INF/MANIFEST.MF b/conformance/org.universaal.tools.conformanceTools/META-INF/MANIFEST.MF
index 90a0e650b350b2ea195623e013d0a69f6a572500..235d45cdf974b7e4725ff50b0cf1fa7600a35aec 100644
--- a/conformance/org.universaal.tools.conformanceTools/META-INF/MANIFEST.MF
+++ b/conformance/org.universaal.tools.conformanceTools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ConformanceTools
Bundle-SymbolicName: org.universaal.tools.conformanceTools;singleton:=true
-Bundle-Version: 0.2.0
+Bundle-Version: 0.3.0
Bundle-Activator: org.universaal.tools.conformanceTools.Activator
Bundle-Vendor: universAAL
Require-Bundle: org.eclipse.ui,
diff --git a/conformance/org.universaal.tools.conformanceTools/icons/icon_error_sml.gif b/conformance/org.universaal.tools.conformanceTools/icons/icon_error_sml.gif
new file mode 100644
index 0000000000000000000000000000000000000000..61132ef2b01806f6122c31d173c98e01e499b9a0
Binary files /dev/null and b/conformance/org.universaal.tools.conformanceTools/icons/icon_error_sml.gif differ
diff --git a/conformance/org.universaal.tools.conformanceTools/icons/icon_info_sml.gif b/conformance/org.universaal.tools.conformanceTools/icons/icon_info_sml.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5d187d77600a660cb1087dfbf88892aa5e864d43
Binary files /dev/null and b/conformance/org.universaal.tools.conformanceTools/icons/icon_info_sml.gif differ
diff --git a/conformance/org.universaal.tools.conformanceTools/icons/icon_warning_sml.gif b/conformance/org.universaal.tools.conformanceTools/icons/icon_warning_sml.gif
new file mode 100644
index 0000000000000000000000000000000000000000..873bbb52cb9768103c27fbb9a9bac16ac615fce5
Binary files /dev/null and b/conformance/org.universaal.tools.conformanceTools/icons/icon_warning_sml.gif differ
diff --git a/conformance/org.universaal.tools.conformanceTools/icons/maven-feather.png b/conformance/org.universaal.tools.conformanceTools/icons/maven-feather.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5ada836e9eb4af4db810f648b013933e72c8fbe
Binary files /dev/null and b/conformance/org.universaal.tools.conformanceTools/icons/maven-feather.png differ
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/run/ToolsRun.java b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/run/ToolsRun.java
index 93a5b54392b0f93737cfb2c80a44056fcff528d6..14c97a79c98281ca4b5baeea9568df820b76e435 100644
--- a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/run/ToolsRun.java
+++ b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/run/ToolsRun.java
@@ -1,10 +1,17 @@
package org.universaal.tools.conformanceTools.run;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.eclipse.core.filesystem.EFS;
@@ -15,6 +22,8 @@ import org.eclipse.core.resources.IWorkspaceDescription;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -31,13 +40,20 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
+import org.osgi.framework.Bundle;
import org.universaal.tools.conformanceTools.Activator;
+import org.universaal.tools.conformanceTools.utils.HtmlPage;
+import org.universaal.tools.conformanceTools.utils.HtmlPage.Table;
import org.universaal.tools.conformanceTools.utils.RunPlugin;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class ToolsRun {
private RunPlugin plugin;
- private IProject project;
+ private IProject projectToAnalyze;
private IWorkbenchWindow window;
private ISelection selection;
@@ -59,9 +75,9 @@ public class ToolsRun {
Object selected = ((StructuredSelection) selection).getFirstElement();
if (selected instanceof JavaProject)
- this.project = ((JavaProject) selected).getProject();
+ this.projectToAnalyze = ((JavaProject) selected).getProject();
else if (selected instanceof IProject)
- this.project = ((IProject) selected);
+ this.projectToAnalyze = ((IProject) selected);
else {
MessageDialog.openInformation(window.getShell(),
"uAAL Conformance Tools", "Not a project.");
@@ -86,21 +102,23 @@ public class ToolsRun {
IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
- if (project != null && !project.hasNature(IMavenConstants.NATURE_ID)) {
+ if (projectToAnalyze != null && !projectToAnalyze.hasNature(IMavenConstants.NATURE_ID)) {
monitor.done();
return new Status(Status.ERROR, Activator.PLUGIN_ID, "uAAL - not a Maven project.");
}
- IFile pomResource = project.getFile(IMavenConstants.POM_FILE_NAME);
+ IFile pomResource = projectToAnalyze.getFile(IMavenConstants.POM_FILE_NAME);
if (pomResource == null) {
monitor.done();
return new Status(Status.ERROR, Activator.PLUGIN_ID, "uAAL - missing POM file.");
}
- IMavenProjectFacade projectFacade = projectManager.create(project, monitor);
+ IMavenProjectFacade projectFacade = projectManager.create(projectToAnalyze, monitor);
+ if (projectFacade == null)
+ ToolsRun.this.run(window, plugin); // seems to be only a timing issue - re-run it will solve the problem
+
IMaven maven = MavenPlugin.getMaven();
- MavenExecutionRequest request = projectManager.createExecutionRequest(pomResource,
- projectFacade.getResolverConfiguration(), monitor);
+ MavenExecutionRequest request = projectManager.createExecutionRequest(pomResource, projectFacade.getResolverConfiguration(), monitor);
List<String> goals = new ArrayList<String>();
@@ -181,20 +199,26 @@ public class ToolsRun {
public void run() {
try{
- String path_ = ResourcesPlugin.getWorkspace().getRoot().getLocation().makeAbsolute()+"/"+project.getDescription().getName();
+ String path_ = ResourcesPlugin.getWorkspace().getRoot().getLocation().makeAbsolute()+"/"+projectToAnalyze.getDescription().getName();
File f = null;
if(plugin == RunPlugin.CheckStyle)
f = new File(path_+"/target/site/checkstyle.html");
if(plugin == RunPlugin.FindBugs)
- f = new File(path_+"/target/findbugsXml.xml");
+ f = new File(path_+"/target/findbugsXml.xml");
if (f != null && f.exists() ){
+ if(plugin == RunPlugin.FindBugs){
+ parseFindBugsResults(f);
+ f = new File(path_+"/target/site/findbugs.html");
+ }
+
org.eclipse.core.filesystem.IFileStore fileStore = EFS.getLocalFileSystem().getStore(f.toURI());
IWorkbenchPage page = window.getActivePage();
try {
+ verifyImages();
if(page != null && fileStore != null)
IDE.openEditorOnFileStore( page, fileStore );
else
@@ -203,12 +227,13 @@ public class ToolsRun {
catch ( PartInitException e ) {
e.printStackTrace();
}
+
}
else {
if(plugin == RunPlugin.CheckStyle)
- System.out.println("uAAL CT: does file "+ResourcesPlugin.getWorkspace().getRoot().getProject(project.getDescription().getName())+"/target/site/checkstyle.html"+" exist?");
+ System.out.println("uAAL CT: does file "+path_+"/target/site/checkstyle.html"+" exist?");
if(plugin == RunPlugin.FindBugs)
- System.out.println("uAAL CT: does file "+ResourcesPlugin.getWorkspace().getRoot().getProject(project.getDescription().getName())+"/target/findbugsXml.xml"+" exist?");
+ System.out.println("uAAL CT: does file "+path_+"/target/site/findbugs.html"+" exist?");
}
}
catch(Exception ex){
@@ -232,4 +257,253 @@ public class ToolsRun {
job.setUser(true);
job.schedule();
}
+
+ private ArrayList<Node> bugsMap = new ArrayList<Node>();
+ private ArrayList<BugDescriptor> orderderBM = new ArrayList<BugDescriptor>();
+
+ private void parseFindBugsResults(File xml){
+
+ int maxSeverity = -1;
+ int minSeverity = 1000;
+ try{
+ if(xml != null){
+ DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ Document results = docBuilder.parse(xml);
+
+ NodeList bugs = results.getElementsByTagName("BugInstance");
+ for(int i = 0; i < bugs.getLength(); i++){
+ Node bug = bugs.item(i);
+ if(bug.getNodeType() == Node.ELEMENT_NODE){
+ Element bug_ = (Element) bug;
+ List<String> nc = getNodesContent(bug_.getChildNodes(), "SourceLine", "start");
+ if(!nc.isEmpty()){
+
+ Integer severity = Integer.parseInt(bug_.getAttribute("rank"));
+ if(severity > maxSeverity)
+ maxSeverity = severity;
+ if(severity < minSeverity)
+ minSeverity = severity;
+
+ bugsMap.add(bug);
+ }
+ }
+ }
+ }
+
+ orderBySeverity(maxSeverity, minSeverity);
+
+ visualizeFindBugsResults();
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ private void orderBySeverity(int max, int min){
+
+ try{
+ int k = max;
+ while(k >= min){
+ for(int i = 0; i < bugsMap.size(); i++){
+
+ Node node = bugsMap.get(i);
+ int severity = 0;
+
+ if(node.getNodeType() == Node.ELEMENT_NODE){
+ Element node_ = (Element) node;
+
+ try{
+ severity = Integer.parseInt(node_.getAttribute("rank"));
+ }
+ catch(NumberFormatException e){
+ severity = -1; // something went wrong
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(severity == k){
+ BugDescriptor bd = new BugDescriptor();
+ bd.setSeverity(severity);
+ bd.setErrorType(node_.getAttribute("type"));
+ bd.setClazz(getNodesContent(node.getChildNodes(), "SourceLine", "sourcepath").get(0));
+ bd.setDescr(getNodesContent(node.getChildNodes(), "LongMessage", null).get(0));
+
+ try{
+ bd.setLine(Integer.parseInt(getNodesContent(node.getChildNodes(), "SourceLine", "start").get(0)));
+ }
+ catch(NumberFormatException e){
+ bd.setLine(-1); // not referred to a particular line
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ orderderBM.add(bd);
+ }
+ }
+ }
+
+ k--;
+ }
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ private List<String> getNodesContent(NodeList element, String nodeName, String attribute){
+
+ List<String> result = new ArrayList<String>();
+ if(element != null && nodeName != null){
+ for(int i = 0; i < element.getLength(); i++){
+ Node node = element.item(i);
+ if(node.getNodeType() == Node.ELEMENT_NODE){
+ Element node_ = (Element) node;
+ if(node_.getNodeName().equalsIgnoreCase(nodeName))
+ if(attribute != null)
+ result.add(node_.getAttribute(attribute));
+ else
+ result.add(node_.getTextContent());
+ }
+ }
+ }
+
+ return result;
+ }
+
+ public void visualizeFindBugsResults(){
+
+ try{
+ HtmlPage page = new HtmlPage("FINDBUGS ANALYSIS RESULTS");
+ String path_ = ResourcesPlugin.getWorkspace().getRoot().getLocation().makeAbsolute()+"/"+projectToAnalyze.getDescription().getName()+"/target/site/images/logos/maven-feather.png";
+ page.getBody().addElement("<img src='"+path_+"' alt='Maven Logo'><br/><br/>");
+
+ Table t = page.new Table(orderderBM.size()+2, 5);
+
+ // table header
+ t.addContent("<font size='5'><b><center>ERROR TYPE</center></b></font>", 0, 0);
+ t.addContent("<font size='5'><b><center>SEVERITY</center></b></font>", 0, 1);
+ t.addContent("<font size='5'><b><center>CLASS</center></b></font>", 0, 2);
+ t.addContent("<font size='5'><b><center>DESCRIPTION</center></b></font>", 0, 3);
+ t.addContent("<font size='5'><b><center>LINE</center></b></font>", 0, 4);
+
+ int j = 0;
+ for(int i = 0; i < orderderBM.size(); i++){
+ t.addContent("<center>"+orderderBM.get(i).getErrorType()+"</center>", i+2, j);
+ t.addContent("<center>"+orderderBM.get(i).getSeverity()+"</center>", i+2, ++j);
+ t.addContent("<center>"+orderderBM.get(i).getClazz()+"</center>", i+2, ++j);
+ t.addContent("<center>"+orderderBM.get(i).getDescr()+"</center>", i+2, ++j);
+ if(orderderBM.get(i).getLine() != -1)
+ t.addContent("<center>"+orderderBM.get(i).getLine()+"</center>", i+2, ++j);
+ else
+ t.addContent("<center>n.a.</center>", i+2, ++j);
+ j = 0;
+ }
+
+ page.getBody().addElement(t.getTable());
+ String path = ResourcesPlugin.getWorkspace().getRoot().getLocation().makeAbsolute()+"/"+projectToAnalyze.getDescription().getName()+"/target/site/findbugs.html";
+ page.write(new File(path));
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ public void verifyImages(){
+
+ try{
+ String errFN = "icon_error_sml.gif";
+ String infFN = "icon_info_sml.gif";
+ String warnFN = "icon_warning_sml.gif";
+ String mavFN = "maven-feather.png";
+
+ String destPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().makeAbsolute()+"/"+this.projectToAnalyze.getDescription().getName();
+ String destInternalProjectPath = "/target/site/images/";
+
+ File target, site, images, logos;
+ target = new File(destPath+"/target");
+ if(!target.exists())
+ target.mkdir();
+ site = new File(destPath+"/target/site");
+ if(!site.exists())
+ target.mkdir();
+ images = new File(destPath+"/target/site/images");
+ if(!images.exists())
+ images.mkdir();
+ logos = new File(destPath+"/target/site/images/logos/");
+ if(!logos.exists())
+ logos.mkdir();
+
+ Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
+
+ copyFile(bundle, destPath, destInternalProjectPath, errFN, "/icons/");
+ copyFile(bundle, destPath, destInternalProjectPath, infFN, "/icons/");
+ copyFile(bundle, destPath, destInternalProjectPath, warnFN, "/icons/");
+ copyFile(bundle, destPath, destInternalProjectPath+"logos/", mavFN, "/icons/");
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ private void copyFile(Bundle bundle, String destPath, String destInternalProjectPath, String fileName, String sourceInternalProjectPath){
+
+ try{
+ Path path = new Path(sourceInternalProjectPath+fileName);
+ URL fileURL = Platform.find(bundle, path);
+ InputStream is = fileURL.openStream();
+ OutputStream os = new FileOutputStream(destPath+destInternalProjectPath+fileName);
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+ while ((bytesRead = is.read(buffer)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ is.close();
+ os.close();
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ }
+ }
+
+ private class BugDescriptor{
+
+ private int severity;
+ private int line;
+ private String descr;
+ private String clazz;
+ private String errorType;
+
+ public int getSeverity() {
+ return severity;
+ }
+ public void setSeverity(int severity) {
+ this.severity = severity;
+ }
+ public int getLine() {
+ return line;
+ }
+ public void setLine(int line) {
+ this.line = line;
+ }
+ public String getDescr() {
+ return descr;
+ }
+ public void setDescr(String descr) {
+ this.descr = descr;
+ }
+ public String getClazz() {
+ return clazz;
+ }
+ public void setClazz(String clazz) {
+ this.clazz = clazz;
+ }
+ public String getErrorType() {
+ return errorType;
+ }
+ public void setErrorType(String errorType) {
+ this.errorType = errorType;
+ }
+ }
}
\ No newline at end of file
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/HtmlPage.java b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/HtmlPage.java
new file mode 100644
index 0000000000000000000000000000000000000000..35aac8fd04348e3191de5485dde81f5702d4dff9
--- /dev/null
+++ b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/HtmlPage.java
@@ -0,0 +1,134 @@
+package org.universaal.tools.conformanceTools.utils;
+
+import java.io.File;
+import java.io.PrintStream;
+
+public class HtmlPage {
+
+ private String page;
+
+ private Head header;
+ private Body body;
+
+ private PrintStream out;
+
+ public HtmlPage(String headerText) {
+
+ this.header = new Head();
+ this.body = new Body(headerText);
+
+ this.page = this.header.getHeader() + this.body.getBody();
+ }
+
+ private String getPre(){
+ return "<html>";
+ }
+ private String getPost(){
+ return "</html>";
+ }
+
+ public void write(File file){
+
+ try{
+ out = new PrintStream(file);
+ out.append(getPre());
+ out.append(getPage());
+ out.append(getPost());
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ }
+ finally{
+ out.close();
+ }
+ }
+
+ public Head getHeader(){
+ return this.header;
+ }
+ public Body getBody(){
+ return this.body;
+ }
+ public String getPage(){
+ return this.header.getHeader() + this.body.getBody();
+ }
+
+
+ private class Head{
+
+ private String header;
+
+ private Head(){
+ header = "<head></head>";
+ }
+
+ public String getHeader(){
+ return this.header;
+ }
+ }
+
+
+ public class Body{
+
+ private String body;
+
+ private Body(String headerText){
+ this.body= "<h1><font color='red'><center>"+headerText+"</center></font></h1>";
+ }
+
+ public String getBody(){
+ openBody();
+ closeBody();
+ return this.body;
+ }
+
+ private void openBody(){
+ if(!this.body.startsWith("<body>"))
+ this.body = "<body>" + this.body;
+ }
+ private void closeBody(){
+ if(!this.body.endsWith("</body>"))
+ this.body = this.body + "</body>";
+ }
+
+ public void addElement(String element){
+ this.body = this.body.concat(element);
+ }
+ }
+
+ public class Table{
+
+ private String table;
+ private String[][] arrayTable;
+ private int rows, columns;
+
+ public Table(int rows, int columns){
+ this.table = "";
+ this.arrayTable = new String[rows][columns]; // rows x columns
+ this.rows = rows;
+ this.columns = columns;
+ }
+
+ public void addContent(String content, int row, int column){
+ this.arrayTable[row][column] = content;
+ }
+
+ public String getTable(){
+
+ this.table = "<table border='1' width='95%'>";
+ for(int i = 0; i < this.rows; i++){
+ this.table = this.table.concat("<tr>");
+ for(int j = 0; j < columns; j++){
+ if(this.arrayTable[i][j] != null && !this.arrayTable[i][j].isEmpty())
+ this.table = this.table.concat("<td style='padding-left: 20px;'>"+this.arrayTable[i][j]+"</td>");
+ else
+ this.table = this.table.concat("<td style='padding-left: 20px;'></td>");
+ }
+ this.table = this.table.concat("</tr>");
+ }
+ this.table = this.table.concat("</table>");
+
+ return this.table;
+ }
+ }
+}
\ No newline at end of file
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/RunPlugin.java b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/RunPlugin.java
index 861abb370435db141d1f68dc6a2efd2f933b4648..42e4917cc7e8e325123d8712e8ef8a382b722ac6 100644
--- a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/RunPlugin.java
+++ b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/RunPlugin.java
@@ -3,6 +3,7 @@ package org.universaal.tools.conformanceTools.utils;
public enum RunPlugin {
CheckStyle,
- FindBugs;
+ FindBugs,
+ Maven_Verifier;
}
\ No newline at end of file
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/Builder.java b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/Builder.java
similarity index 98%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/Builder.java
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/Builder.java
index a47035a19367228b7c6d5e8c14d9d2adeed1e684..2190dd9290a0b0bfd1bac2a05b8f1ee68074be70 100644
--- a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/Builder.java
+++ b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/Builder.java
@@ -1,4 +1,4 @@
-package org.universaal.tools.conformanceTools.utils;
+package org.universaal.tools.conformanceTools.utils.old;
import java.io.File;
@@ -11,6 +11,7 @@ import javax.xml.transform.stream.StreamResult;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.universaal.tools.conformanceTools.utils.RunPlugin;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/EssentialFiles.java b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/EssentialFiles.java
similarity index 96%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/EssentialFiles.java
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/EssentialFiles.java
index f0e1b4135a41d5b8ea2634d482413c21df291cac..b9097ab5715213ada148fd60a5d6722ad2af2253 100644
--- a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/EssentialFiles.java
+++ b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/EssentialFiles.java
@@ -1,4 +1,4 @@
-package org.universaal.tools.conformanceTools.utils;
+package org.universaal.tools.conformanceTools.utils.old;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -10,6 +10,7 @@ import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.universaal.tools.conformanceTools.Activator;
+import org.universaal.tools.conformanceTools.utils.RunPlugin;
public class EssentialFiles {
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/OptionsParser.java b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/OptionsParser.java
similarity index 92%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/OptionsParser.java
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/OptionsParser.java
index 321b8a8d49644beb6de8eccb6e9ecbb972302fda..e75d355454bff45cc09242c4c1aac5edc79953d8 100644
--- a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/OptionsParser.java
+++ b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/OptionsParser.java
@@ -1,4 +1,4 @@
-package org.universaal.tools.conformanceTools.utils;
+package org.universaal.tools.conformanceTools.utils.old;
import java.io.BufferedReader;
import java.io.InputStream;
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/checkstyle_checks.xml b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/checkstyle_checks.xml
similarity index 100%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/checkstyle_checks.xml
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/checkstyle_checks.xml
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/findbugs.properties b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/findbugs.properties
similarity index 100%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/findbugs.properties
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/findbugs.properties
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/options.properties b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/options.properties
similarity index 100%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/options.properties
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/options.properties
diff --git a/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/sun_checks.xml b/conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/sun_checks.xml
similarity index 100%
rename from conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/sun_checks.xml
rename to conformance/org.universaal.tools.conformanceTools/src/org/universaal/tools/conformanceTools/utils/old/sun_checks.xml