fixed docker file issue

FultonBrowne · Dec 18, 2019 · 33dbd1c · 33dbd1c
1 parent 15319b6
commit 33dbd1c
Show file tree

Hide file tree

Showing 42 changed files with 12 additions and 104 deletions.
diff --git a/.idea/artifacts/Ara_Server_jar.xml b/.idea/artifacts/Ara_Server_jar.xml
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN ./gradlew build
 
 FROM openjdk:11.0-jre
 WORKDIR /app
-COPY --from=build /app/bin/jar /app
+COPY --from=build /app/build/libs /app
 EXPOSE 80
 ENTRYPOINT ["sh", "-c"]
-CMD ["java -jar Ara-Server.jar"]
+CMD ["java -jar Ara-Server-1.0-SNAPSHOT-all.jar"]
diff --git a/bin/jar/Ara-Server.jar b/bin/jar/Ara-Server.jar
diff --git a/bin/jar/FastInfoset-1.2.15.jar b/bin/jar/FastInfoset-1.2.15.jar
diff --git a/bin/jar/annotations-13.0.jar b/bin/jar/annotations-13.0.jar
diff --git a/bin/jar/antlr-2.7.7.jar b/bin/jar/antlr-2.7.7.jar
diff --git a/bin/jar/ara-server.Ara-Server.main.jar b/bin/jar/ara-server.Ara-Server.main.jar
diff --git a/bin/jar/byte-buddy-1.10.2.jar b/bin/jar/byte-buddy-1.10.2.jar
diff --git a/bin/jar/classmate-1.5.1.jar b/bin/jar/classmate-1.5.1.jar
diff --git a/bin/jar/dom4j-2.1.1.jar b/bin/jar/dom4j-2.1.1.jar
diff --git a/bin/jar/gson-2.8.6.jar b/bin/jar/gson-2.8.6.jar
diff --git a/bin/jar/hamcrest-core-1.3.jar b/bin/jar/hamcrest-core-1.3.jar
diff --git a/bin/jar/hibernate-commons-annotations-5.1.0.Final.jar b/bin/jar/hibernate-commons-annotations-5.1.0.Final.jar
diff --git a/bin/jar/istack-commons-runtime-3.0.7.jar b/bin/jar/istack-commons-runtime-3.0.7.jar
diff --git a/bin/jar/jandex-2.1.1.Final.jar b/bin/jar/jandex-2.1.1.Final.jar
diff --git a/bin/jar/javassist-3.24.0-GA.jar b/bin/jar/javassist-3.24.0-GA.jar
diff --git a/bin/jar/javax.activation-api-1.2.0.jar b/bin/jar/javax.activation-api-1.2.0.jar
diff --git a/bin/jar/javax.persistence-api-2.2.jar b/bin/jar/javax.persistence-api-2.2.jar
diff --git a/bin/jar/jaxb-api-2.3.1.jar b/bin/jar/jaxb-api-2.3.1.jar
diff --git a/bin/jar/jaxb-runtime-2.3.1.jar b/bin/jar/jaxb-runtime-2.3.1.jar
diff --git a/bin/jar/jboss-logging-3.3.2.Final.jar b/bin/jar/jboss-logging-3.3.2.Final.jar
diff --git a/bin/jar/jboss-transaction-api_1.2_spec-1.1.1.Final.jar b/bin/jar/jboss-transaction-api_1.2_spec-1.1.1.Final.jar
diff --git a/bin/jar/jdom2-2.0.6.jar b/bin/jar/jdom2-2.0.6.jar
diff --git a/bin/jar/junit-4.12.jar b/bin/jar/junit-4.12.jar
diff --git a/bin/jar/kotlin-stdlib-1.3.50.jar b/bin/jar/kotlin-stdlib-1.3.50.jar
diff --git a/bin/jar/kotlin-stdlib-common-1.3.50.jar b/bin/jar/kotlin-stdlib-common-1.3.50.jar
diff --git a/bin/jar/kotlin-stdlib-jdk7-1.3.50.jar b/bin/jar/kotlin-stdlib-jdk7-1.3.50.jar
diff --git a/bin/jar/kotlin-stdlib-jdk8-1.3.50.jar b/bin/jar/kotlin-stdlib-jdk8-1.3.50.jar
diff --git a/bin/jar/mssql-jdbc-7.4.1.jre11.jar b/bin/jar/mssql-jdbc-7.4.1.jre11.jar
diff --git a/bin/jar/nanohttpd-2.3.1.jar b/bin/jar/nanohttpd-2.3.1.jar
diff --git a/bin/jar/okio-2.2.2.jar b/bin/jar/okio-2.2.2.jar
diff --git a/bin/jar/opennlp-tools-1.9.1.jar b/bin/jar/opennlp-tools-1.9.1.jar
diff --git a/bin/jar/postgresql-9.1-901-1.jdbc4.jar b/bin/jar/postgresql-9.1-901-1.jdbc4.jar
diff --git a/bin/jar/rome-1.12.1.jar b/bin/jar/rome-1.12.1.jar
diff --git a/bin/jar/rome-utils-1.12.1.jar b/bin/jar/rome-utils-1.12.1.jar
diff --git a/bin/jar/slf4j-api-1.7.29.jar b/bin/jar/slf4j-api-1.7.29.jar
diff --git a/bin/jar/sparc-3.3.0-v3346.jar b/bin/jar/sparc-3.3.0-v3346.jar
diff --git a/bin/jar/stax-ex-1.8.jar b/bin/jar/stax-ex-1.8.jar
diff --git a/bin/jar/txw2-2.3.1.jar b/bin/jar/txw2-2.3.1.jar
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'application'
     id 'org.jetbrains.kotlin.jvm' version '1.3.61'
+    id 'com.github.johnrengelman.shadow' version '5.0.0'
     //id ("com.gradle.build-scan").version("2.4.2") 
 
     // ./gradlew :refreshVersions 
@@ -11,12 +12,16 @@ plugins {
 application {
     mainClassName('com.andromeda.araserver.Run')
 }
-jar {
+mainClassName = 'com.andromeda.araserver.Run'
+        jar {
     manifest {
         attributes(
-                'Main-Class': 'com.andromeda.araserver.Run'
+                'Main-Class': mainClassName
         )
+
     }
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }    }
 }
 
 group 'ara-server'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/main/java/com/andromeda/araserver/pages/ApiStart.java b/src/main/java/com/andromeda/araserver/pages/ApiStart.java
@@ -35,104 +35,6 @@ public String apiMain(String mainUri, KeyWord keyWord, Parser parse) {
         return new MsSql().getSkills(term, searchterm, keyWord, parse);//ParseApi(searchterm);
     }
 
-    private String ParseApi(String search) {
-        //text to be outputted
-        String out;
-        String term;
-        //parse for search term
-        ArrayList<String> pairs = new ArrayList<>(Arrays.asList(search.split("&")));
-        term = pairs.get(0);
-        System.out.println(term);
-        //connect to DB
-        try {
-            //get DB driver
-            Class.forName("org.postgresql.Driver");
-            //get connection
-            Connection c = getConnection();
-            Statement stmt = c.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM skills;");
-            // I dont know how this works but it does 😀
-            while (rs.next()) {
-                // get values from the data base
-                String start = rs.getString("start");
-                String endtxt = rs.getString("endtxt");
-                String link = rs.getString("link");
-                //Print to logs for debugging
-                System.out.println("start = " + start);
-                System.out.println("endtxt = " + endtxt);
-                System.out.println("link = " + link);
-                //to avoid a null pointer
-                SqlModel temsqlmodel = new SqlModel(start, endtxt, link);
-                sqlmodel.add(temsqlmodel);
-                System.out.println();
-            }
-
-
-        } catch (Exception e) {
-            //print errors
-            e.printStackTrace();
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            return new Gson().toJson(outputModels);
-        }
-        System.out.println("Opened database successfully");
-        System.out.println(search);
-        //figure out what links to go to
-        for (SqlModel sqlModel : sqlmodel) {
-            System.out.println(sqlModel.description);
-            System.out.println(search.startsWith(sqlModel.description));
-
-            assert term != null;
-            if (search.startsWith(sqlModel.description) || search.equals(sqlModel.description)) {
-                System.out.println("Hiiiiiiii");
-                linkval = sqlModel.link + "/" + search.replace(sqlModel.description, "");
-                System.out.println(linkval);
-                break;
-            }
-            if (!"".equals(sqlModel.title) && term.endsWith(sqlModel.title)) {
-                linkval = sqlModel.link + "/" + search.replace(sqlModel.title, "");
-
-                break;
-            }
-        }
-        // parse to avoid errors
-        if (linkval == null) linkval = "https://araserver.herokuapp.com/searcht/" + search;
-        linkval = linkval.replace(" ", "");
-        System.out.println(linkval);
-        String url = linkval;
-        URL obj;
-        String result;
-        try {
-            //get data from correct link
-            obj = new URL(url);
-            HttpURLConnection con = (HttpURLConnection) obj.openConnection();
-            con.setRequestMethod("GET");
-            int responseCode = con.getResponseCode();
-            System.out.println("\nSending 'GET' request to URL : " + url);
-            System.out.println("Response Code : " + responseCode);
-            BufferedReader in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()));
-            String inputLine;
-            StringBuilder response = new StringBuilder();
-
-            while ((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-            }
-            Scanner s = new Scanner(in).useDelimiter("\\A");
-            result = s.hasNext() ? s.next() : "";
-            System.out.println(result + "hi");
-            in.close();
-            //print result
-            out = response.toString();
-            System.out.println(out);
-        } catch (Exception e) {
-            //get the problems
-            e.printStackTrace();
-            //print error msg
-            out = new Gson().toJson(outputModels);
-        }
-        //return the output
-        return out;
-    }
     private static Connection getConnection() throws SQLException {
         //get a SQL connection (Note these creds are for test DB)
         String dbUrl = "jdbc:postgresql://" + "ec2-54-221-214-3.compute-1.amazonaws.com" + ':' + "5432" + "/d40qc3ivndkhlh" + "?ssl=true" + "&sslfactory=org.postgresql.ssl.NonValidatingFactory";