School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated artifacts and readme

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2019-12-03 09:02:30 +01:00
parent b4aa47d61e
commit 4563b8d407
9 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/artifacts/WasteInformationServer_jar.xml
View File

@ -1,8 +1,14 @@
<component name="ArtifactManager">
<artifact type="jar" name="WasteInformationServer:jar">
<artifact type="jar" build-on-make="true" name="WasteInformationServer:jar">
<output-path>$PROJECT_DIR$/out/artifacts/WasteInformationServer_jar</output-path>
<root id="archive" name="WasteInformationServer.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/src/main/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="WasteInformationServer" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.18/mysql-connector-java-8.0.18.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1.jar" path-in-jar="/" />
</root>
</artifact>
</component>

11
.idea/artifacts/WasteinformationServer.xml
View File

@ -1,11 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="WasteinformationServer">
<output-path>$PROJECT_DIR$/out/artifacts/WasteinformationServer</output-path>
<root id="archive" name="WasteinformationServer.jar">
<element id="module-output" name="WasteInformationServer" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/mysql-connector-java-5.1.44-bin.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar" path-in-jar="/" />
<element id="dir-copy" path="$PROJECT_DIR$/resources" />
</root>
</artifact>
</component>

6
.idea/artifacts/unnamed.xml
View File

@ -1,6 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="unnamed">
<output-path>$PROJECT_DIR$/out/artifacts/unnamed</output-path>
<root id="archive" name="unnamed.jar" />
</artifact>
</component>

6
README.md
View File

@ -1 +1,5 @@
# WasteInformationServer
# WasteInformationServer
## Dependencies:
* org.eclipse.paho.client.mqttv3
* mysql-connector-java

0
src/META-INF/MANIFEST.MF → src/main/java/META-INF/MANIFEST.MF
View File

1
src/main/java/com/wasteinformationserver/db/JDCB.java
View File

@ -53,7 +53,6 @@ public class JDCB {
conn = db.getConnection();
loggedin = true;
} catch (SQLException e) {
Log.error("no connection to Database!");
throw new IOException("No connection to database");
}

5
src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
View File

@ -43,6 +43,11 @@ public abstract class PostRequest implements HttpHandler {
}
}
/**
*
* @param params received get params from com.wasteinformationserver.website
* @return json reply to com.wasteinformationserver.website
*/
public abstract String request(HashMap<String, String> params);
}

3
src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
View File

@ -65,9 +65,6 @@ public class DataRequest extends PostRequest {
Log.debug(result);
break;
case "getAllCities":
// TODO: 15.11.19 database call to get all data and store it as json.
StringBuilder builder = new StringBuilder();
ResultSet sett = jdcb.executeQuery("select * from cities");

10
src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
View File

@ -9,12 +9,12 @@ public class LoginState {
return mythis;
}
String username;
String firstname;
String lastname;
String email;
private String username;
private String firstname;
private String lastname;
private String email;
boolean loggedin = true; //todo set back!!!
boolean loggedin = false;
public void logIn(){
loggedin=true;