Skip to content

Commit

Permalink
Merge pull request #4451 from MeroRai/APPSERV-22
Browse files Browse the repository at this point in the history 
APPSERV-22 Remove Derby
  • Loading branch information
@MeroRai
MeroRai authored Feb 21, 2020
2 parents 4427837 + 23880c0 commit 0d2e038
Show file tree
Hide file tree
Showing 169 changed files with 4,314 additions and 6,247 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ void setupDomain() {
}
sh "${ASADMIN} create-domain --nopassword ${DOMAIN_NAME}"
sh "${ASADMIN} start-domain ${DOMAIN_NAME}"
sh "${ASADMIN} start-database --dbtype derby || true"
sh "${ASADMIN} start-database || true"
}

void teardownDomain() {
echo 'tidying up after tests:'
sh "${ASADMIN} stop-domain ${DOMAIN_NAME}"
sh "${ASADMIN} stop-database --dbtype derby || true"
sh "${ASADMIN} stop-database || true"
sh "${ASADMIN} delete-domain ${DOMAIN_NAME}"
}
4 changes: 2 additions & 2 deletions Jenkinsfile-Nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,12 @@ void setupDomain() {
}
sh "${ASADMIN} create-domain --nopassword ${DOMAIN_NAME}"
sh "${ASADMIN} start-domain ${DOMAIN_NAME}"
sh "${ASADMIN} start-database --dbtype derby || true"
sh "${ASADMIN} start-database || true"
}

def teardownDomain() {
echo 'tidying up after tests:'
sh "${ASADMIN} stop-domain ${DOMAIN_NAME}"
sh "${ASADMIN} stop-database --dbtype derby || true"
sh "${ASADMIN} stop-database || true"
sh "${ASADMIN} delete-domain ${DOMAIN_NAME}"
}
99 changes: 0 additions & 99 deletions api/payara-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,105 +208,6 @@
<version>${h2db.version}</version>
</dependency>

<!-- Server ships with JavaDB, but there are no client jars distributed. Instead, clients can use derby jars -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyoptionaltools</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbywar</artifactId>
<version>${javadb.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_cs</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_de_DE</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_es</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_fr</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_hu</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_it</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_ja_JP</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_ko_KR</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_pl</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_pt_BR</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_ru</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_zh_CN</artifactId>
<version>${javadb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyLocale_zh_TW</artifactId>
<version>${javadb.version}</version>
</dependency>


<!-- Arquillian containers (test scope)-->
<dependency>
<groupId>fish.payara.arquillian</groupId>
Expand Down
32 changes: 14 additions & 18 deletions appserver/admin/admin-core/src/test/resources/UpgradeTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
-->

<!-- Portions Copyright [2017-2020] Payara Foundation and/or affiliates -->

<domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
<system-applications>
<application enabled="true" context-root="" location="${com.sun.aas.installRootURI}/lib/install/applications/__admingui" name="__admingui" directory-deployed="true" object-type="system-admin">
Expand Down Expand Up @@ -75,22 +77,16 @@
<bar></bar>
</foo>
</something-weirder>
<resources>
<jdbc-resource pool-name="__TimerPool" jndi-name="jdbc/__TimerPool" object-type="system-all"></jdbc-resource>
<jdbc-resource pool-name="DerbyPool" jndi-name="jdbc/__default"></jdbc-resource>
<jdbc-connection-pool datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" res-type="javax.sql.XADataSource" name="__TimerPool">
<property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer"></property>
<property name="connectionAttributes" value=";create=true"></property>
</jdbc-connection-pool>
<jdbc-connection-pool datasource-classname="org.apache.derby.jdbc.ClientDataSource" is-isolation-level-guaranteed="false" res-type="javax.sql.DataSource" name="DerbyPool">
<property name="PortNumber" value="1527"></property>
<property name="Password" value="APP"></property>
<property name="User" value="APP"></property>
<property name="serverName" value="localhost"></property>
<property name="DatabaseName" value="sun-appserv-samples"></property>
<property name="connectionAttributes" value=";create=true"></property>
</jdbc-connection-pool>
</resources>
<resources>
<jdbc-resource pool-name="__TimerPool" jndi-name="jdbc/__TimerPool" object-type="system-admin" />
<jdbc-resource pool-name="H2Pool" jndi-name="jdbc/__default" />
<jdbc-connection-pool name="__TimerPool" datasource-classname="org.h2.jdbcx.JdbcDataSource" res-type="javax.sql.XADataSource">
<property name="URL" value="jdbc:h2:${com.sun.aas.instanceRoot}/lib/databases/ejbtimer;AUTO_SERVER=TRUE" />
</jdbc-connection-pool>
<jdbc-connection-pool is-isolation-level-guaranteed="false" name="H2Pool" datasource-classname="org.h2.jdbcx.JdbcDataSource" res-type="javax.sql.DataSource">
<property name="URL" value="jdbc:h2:${com.sun.aas.instanceRoot}/lib/databases/embedded_default;AUTO_SERVER=TRUE" />
</jdbc-connection-pool>
</resources>
<servers>
<server name="server" config-ref="server-config">
<application-ref ref="__admingui" virtual-servers="__asadmin"></application-ref>
Expand Down Expand Up @@ -228,8 +224,8 @@
<jvm-options>-Xmx512m</jvm-options>
<jvm-options>-Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.jks</jvm-options>
<jvm-options>-Djavax.net.ssl.trustStore=${com.sun.aas.instanceRoot}/config/cacerts.jks</jvm-options>
<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib</jvm-options>
<jvm-options>-Djdbc.drivers=org.apache.derby.jdbc.ClientDriver</jvm-options>
<jvm-options>-Djava.ext.dirs=${com.sun.aas.javaRoot}/lib/ext${path.separator}${com.sun.aas.javaRoot}/jre/lib/ext${path.separator}${com.sun.aas.instanceRoot}/lib/ext${path.separator}${fish.payara.aas.h2Root}/bin</jvm-options>
<jvm-options>-Djdbc.drivers=org.h2.Driver</jvm-options>
<jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
<jvm-options>-XX:NewRatio=2</jvm-options>
</java-config>
Expand Down
60 changes: 0 additions & 60 deletions ...in/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DBManagerFactory.java
View file

This file was deleted.

71 changes: 0 additions & 71 deletions appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DBType.java
View file

This file was deleted.

Loading

0 comments on commit 0d2e038

Please sign in to comment.