diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16d28051c9c40c86881cc0af2195dc9dae1b10e4..6f8a472d1b09800a6a605aff9bc0b335d88c2529 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Mar 09 13:39:39 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index a59a8b20fe2b3ee889bd145bbad3d84ba6b594b5..360e1e3d3a125b0b22149913ff1d5c4579841e24 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -3,37 +3,36 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0"> - <persistence-unit name="defaultPU" transaction-type="RESOURCE_LOCAL"> + <persistence-unit name="postgresPU" transaction-type="RESOURCE_LOCAL"> <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> <!-- put your entity-classes here --> <!-- this must be provided --> <properties> - <property name="javax.persistence.jdbc.url" value="jdbc:oracle:thin:@localhost:1521:xe"/> - <property name="javax.persistence.jdbc.driver" value="oracle.jdbc.OracleDriver"/> - <property name="javax.persistence.jdbc.user" value="JpaUser"/> - <property name="javax.persistence.jdbc.password" value="JpaPassword"/> + <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost/postgres" /> + <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" /> + <property name="javax.persistence.jdbc.user" value="JpaUser" /> + <property name="javax.persistence.jdbc.password" value="JpaPassword" /> <!--<property name="javax.persistence.schema-generation.database.action" value="none"/>--> <!--<property name="javax.persistence.schema-generation.database.action" value="create"/>--> <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/> - <property name="eclipselink.logging.level" value="WARNING"/> - <property name="eclipselink.logging.exceptions" value="false"/> - <property name="eclipselink.logging.level.sql" value="FINE"/> - <property name="eclipselink.logging.parameters" value="true"/> - <property name="eclipselink.logging.timestamp" value="false"/> - <property name="eclipselink.logging.session" value="false"/> - </properties> -</persistence-unit> -<persistence-unit name="fboraclePU" transaction-type="RESOURCE_LOCAL"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> + <property name="eclipselink.logging.level" value="WARNING"/> + <property name="eclipselink.logging.exceptions" value="false"/> + <property name="eclipselink.logging.level.sql" value="FINE"/> + <property name="eclipselink.logging.parameters" value="true"/> + <property name="eclipselink.logging.timestamp" value="false"/> + <property name="eclipselink.logging.session" value="false"/> + </properties> + </persistence-unit> + <persistence-unit name="locOraclePU" transaction-type="RESOURCE_LOCAL"> + <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> <!-- put your entity-classes here --> <!-- this must be provided --> <properties> - <property name="javax.persistence.jdbc.url" value="jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP) - (HOST=141.100.70.17)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orclpdb.fbi.h-da.de)))"/> + <property name="javax.persistence.jdbc.url" value="jdbc:oracle:thin:@localhost:1521:xe"/> <property name="javax.persistence.jdbc.driver" value="oracle.jdbc.OracleDriver"/> <property name="javax.persistence.jdbc.user" value="JpaUser"/> <property name="javax.persistence.jdbc.password" value="JpaPassword"/> @@ -45,21 +44,22 @@ <property name="eclipselink.logging.level" value="WARNING"/> <property name="eclipselink.logging.exceptions" value="false"/> <property name="eclipselink.logging.level.sql" value="FINE"/> - <property name="eclipselink.logging.parameters" value="true"/> - <property name="eclipselink.logging.timestamp" value="false"/> - <property name="eclipselink.logging.session" value="false"/> - </properties> + <property name="eclipselink.logging.parameters" value="true"/> + <property name="eclipselink.logging.timestamp" value="false"/> + <property name="eclipselink.logging.session" value="false"/> + </properties> </persistence-unit> - <persistence-unit name="postgresPU" transaction-type="RESOURCE_LOCAL"> + <persistence-unit name="fbiOraclePU" transaction-type="RESOURCE_LOCAL"> <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> <!-- put your entity-classes here --> <!-- this must be provided --> <properties> - <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost/postgres" /> - <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver" /> - <property name="javax.persistence.jdbc.user" value="JpaUser" /> - <property name="javax.persistence.jdbc.password" value="JpaPassword" /> + <property name="javax.persistence.jdbc.url" value="jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP) + (HOST=141.100.70.17)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orclpdb.fbi.h-da.de)))"/> + <property name="javax.persistence.jdbc.driver" value="oracle.jdbc.OracleDriver"/> + <property name="javax.persistence.jdbc.user" value="JpaUser"/> + <property name="javax.persistence.jdbc.password" value="JpaPassword"/> <!--<property name="javax.persistence.schema-generation.database.action" value="none"/>--> <!--<property name="javax.persistence.schema-generation.database.action" value="create"/>--> @@ -74,3 +74,4 @@ </properties> </persistence-unit> </persistence> +