diff --git a/.gitignore b/.gitignore index f14df30..cd7b3df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ +dependency-reduced-pom.xml /bin/ databases/ .class derby.log .settings/ -resources/ \ No newline at end of file +resources/ +target/ diff --git a/README.md b/README.md index 0ab6283..15468e1 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ This program allows you to create a Linkset network file that can be used with C ============= +## How to run + How to run the script with your own tab-delimited text file? 1. Download the latest release from https://github.com/CyTargetLinker/linksetCreator/releases. Download the jar file (e.g. linkset-creator-v2.0.jar) @@ -33,6 +35,13 @@ How to run the script with your own tab-delimited text file? 3. Run the converter file with the input file (tab delimited text file containing the interaction data), the config file (as described in point 2) and an output file (e.g. output.xgmml). - * java -jar -Dfile.encoding=UTF-8 linkset-creator-vx.x.jar -i input.txt -o output.xgmml -c file.config - +```shell +java -jar -Dfile.encoding=UTF-8 target/linkset-creator-vx.x.jar -i input.txt -o output.xgmml -c file.config +``` + +## How to compile + +```shell +mvn clean install +``` diff --git a/lib/derby.jar b/lib/derby.jar deleted file mode 100644 index c5bd754..0000000 Binary files a/lib/derby.jar and /dev/null differ diff --git a/lib/jewelcli-0.6.jar b/lib/jewelcli-0.6.jar deleted file mode 100644 index 17d6c6e..0000000 Binary files a/lib/jewelcli-0.6.jar and /dev/null differ diff --git a/lib/org.bridgedb.bio.jar b/lib/org.bridgedb.bio.jar deleted file mode 100644 index 8cfd2ee..0000000 Binary files a/lib/org.bridgedb.bio.jar and /dev/null differ diff --git a/lib/org.bridgedb.jar b/lib/org.bridgedb.jar deleted file mode 100644 index b086eb9..0000000 Binary files a/lib/org.bridgedb.jar and /dev/null differ diff --git a/lib/org.bridgedb.rdb.jar b/lib/org.bridgedb.rdb.jar deleted file mode 100644 index b8c0ec2..0000000 Binary files a/lib/org.bridgedb.rdb.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..f01bad5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + + io.github.cytargetlinker + org.linkset.creator + Linkset-Creator + 0.0.1 + + + 3.0.16 + 10.15.2.0 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 8 + 8 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.0 + + + attach-javadocs + + jar + + + + aggregate + + aggregate + + site + + + + + + 8 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 + + + + + org.linkset.creator.GenericCreator + + + + + + + package + + shade + + + + + + + + + + org.bridgedb + org.bridgedb.bio + ${bridgedb.version} + + + org.bridgedb + org.bridgedb.rdb + ${bridgedb.version} + + + mysql + mysql-connector-java + + + + + uk.co.flamingpenguin.jewelcli + jewelcli + 0.6 + + + org.apache.derby + derby + ${derby.version} + + + org.apache.derby + derbytools + ${derby.version} + + + org.apache.derby + derbyshared + ${derby.version} + + + org.apache.derby + derbyclient + ${derby.version} + + + + diff --git a/src/org/linkset/creator/GenericCreator.java b/src/main/java/org/linkset/creator/GenericCreator.java similarity index 98% rename from src/org/linkset/creator/GenericCreator.java rename to src/main/java/org/linkset/creator/GenericCreator.java index 0ec02f5..66070e2 100644 --- a/src/org/linkset/creator/GenericCreator.java +++ b/src/main/java/org/linkset/creator/GenericCreator.java @@ -33,6 +33,7 @@ import org.bridgedb.IDMapper; import org.bridgedb.IDMapperException; import org.bridgedb.Xref; +import org.bridgedb.bio.DataSourceTxt; import org.linkset.creator.graph.Graph; import org.linkset.creator.graph.Graph.Edge; import org.linkset.creator.graph.Graph.Node; @@ -62,6 +63,8 @@ private interface Args extends AHelp, AFilesIn, AFilesOut {} * -c = config file */ public static void main(String argv[]) throws Exception { + DataSourceTxt.init(); + Class.forName("org.apache.derby.jdbc.ClientDriver"); System.out.println("Start"); pargs = ArgsParser.parse(argv, Args.class); diff --git a/src/org/linkset/creator/graph/AttributeHolder.java b/src/main/java/org/linkset/creator/graph/AttributeHolder.java similarity index 100% rename from src/org/linkset/creator/graph/AttributeHolder.java rename to src/main/java/org/linkset/creator/graph/AttributeHolder.java diff --git a/src/org/linkset/creator/graph/Graph.java b/src/main/java/org/linkset/creator/graph/Graph.java similarity index 100% rename from src/org/linkset/creator/graph/Graph.java rename to src/main/java/org/linkset/creator/graph/Graph.java diff --git a/src/org/linkset/creator/graph/XGMMLWriter.java b/src/main/java/org/linkset/creator/graph/XGMMLWriter.java similarity index 100% rename from src/org/linkset/creator/graph/XGMMLWriter.java rename to src/main/java/org/linkset/creator/graph/XGMMLWriter.java diff --git a/src/org/linkset/creator/utils/ArgsParser.java b/src/main/java/org/linkset/creator/utils/ArgsParser.java similarity index 100% rename from src/org/linkset/creator/utils/ArgsParser.java rename to src/main/java/org/linkset/creator/utils/ArgsParser.java diff --git a/src/org/linkset/creator/utils/CommonAttributes.java b/src/main/java/org/linkset/creator/utils/CommonAttributes.java similarity index 100% rename from src/org/linkset/creator/utils/CommonAttributes.java rename to src/main/java/org/linkset/creator/utils/CommonAttributes.java diff --git a/src/org/linkset/creator/utils/ConfigAttributes.java b/src/main/java/org/linkset/creator/utils/ConfigAttributes.java similarity index 100% rename from src/org/linkset/creator/utils/ConfigAttributes.java rename to src/main/java/org/linkset/creator/utils/ConfigAttributes.java diff --git a/src/org/linkset/creator/utils/ConfigFileReader.java b/src/main/java/org/linkset/creator/utils/ConfigFileReader.java similarity index 100% rename from src/org/linkset/creator/utils/ConfigFileReader.java rename to src/main/java/org/linkset/creator/utils/ConfigFileReader.java diff --git a/src/org/linkset/creator/utils/Utils.java b/src/main/java/org/linkset/creator/utils/Utils.java similarity index 96% rename from src/org/linkset/creator/utils/Utils.java rename to src/main/java/org/linkset/creator/utils/Utils.java index 746517a..9f79ebd 100644 --- a/src/org/linkset/creator/utils/Utils.java +++ b/src/main/java/org/linkset/creator/utils/Utils.java @@ -24,7 +24,6 @@ import org.bridgedb.BridgeDb; import org.bridgedb.IDMapper; import org.bridgedb.IDMapperException; -import org.bridgedb.bio.DataSourceTxt; /** * @@ -42,7 +41,6 @@ public static void setUpLogger(Logger log, File logFile, boolean append) throws } public static IDMapper initIDMapper(File file, boolean transitive) { - DataSourceTxt.init(); try { Class.forName("org.bridgedb.rdb.IDMapperRdb"); } catch (ClassNotFoundException ex) {