Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

APPSERV-22 Remove Derby #4451

Merged
merged 17 commits into from
Feb 21, 2020
Merged

APPSERV-22 Remove Derby #4451

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
acce875
Remove Derby from the following:
MeroRai Dec 17, 2019
0dd4e81
Removed Derby from QuickLook tests
MeroRai Jan 8, 2020
dde35a9
Removed Derby from JDBC related code
MeroRai Jan 8, 2020
513c5df
Removed derby related code from nucleus/admin/config-api module
MeroRai Jan 8, 2020
048fa15
Removed Derby related code from nucleus folder
MeroRai Jan 8, 2020
98b67b9
Removed derby related code from appserver folder
MeroRai Jan 8, 2020
096028a
Updated the Jenkins script files to use H2 database
MeroRai Jan 27, 2020
c372ec8
Update the properties on JDBC-RA to use H2 properties
MeroRai Jan 27, 2020
ce10b91
Update JVM options to use H2 database
MeroRai Jan 27, 2020
7a2dcad
Fixed the false positive where the QuickLook tests were displaying as…
MeroRai Jan 27, 2020
d39e5fd
Merge branch 'master' of https://github.com/payara/Payara into APPSER…
MeroRai Jan 27, 2020
edef8d7
* Made the database product name case-less.
MeroRai Feb 11, 2020
62877d3
Added copyright headers
MeroRai Feb 12, 2020
b6c8855
Fixed QuickLook issue where a package was not imported
MeroRai Feb 12, 2020
1e9b608
Added back the required Derby related code. This was done to support …
MeroRai Feb 18, 2020
6808460
Fixed Could not initialize class isue on DBVendorTypeHelper
MeroRai Feb 19, 2020
23880c0
Fixed the conflicts on the domain.xml files
MeroRai Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
30 changes: 12 additions & 18 deletions appserver/admin/admin-core/src/test/resources/UpgradeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,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 +222,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
Open in desktop

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
Open in desktop

This file was deleted.

40 changes: 7 additions & 33 deletions ...min/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,15 @@
package com.sun.enterprise.admin.cli.optional;

import com.sun.enterprise.admin.cli.*;
import static com.sun.enterprise.admin.cli.optional.DBType.DERBY;
import static com.sun.enterprise.admin.cli.optional.DBType.H2;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import static com.sun.enterprise.util.SystemPropertyConstants.*;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.glassfish.api.Param;
import org.glassfish.api.admin.*;

import static com.sun.enterprise.util.SystemPropertyConstants.*;

/**
* This is an abstract class to be inherited by StartDatabaseCommand and
* StopDatabaseCommand. This classes prepares the variables that are used to to
Expand All @@ -63,14 +62,10 @@
*/
public abstract class DatabaseCommand extends CLICommand {

protected static final String DB_TYPE_DEFAULT = "h2";
protected static final String DB_HOST_DEFAULT = "0.0.0.0";
private static final String DB_HOST_DEFAULT = "0.0.0.0";
private static final String DB_PORT_DEFAULT = "9092";
protected final static String DB_USER = "dbuser";
//protected final static String DB_PASSWORD = "dbpassword";
protected final static String DB_PASSWORDFILE = "dbpasswordfile";

@Param(name = "dbtype", optional = true, defaultValue = DB_TYPE_DEFAULT)
protected String dbType;

@Param(name = "dbhost", optional = true, defaultValue = DB_HOST_DEFAULT)
protected String dbHost;
Expand All @@ -94,25 +89,17 @@ public abstract class DatabaseCommand extends CLICommand {
*/
protected void prepareProcessExecutor() throws Exception {
sInstallRoot = new File(getSystemProperty(INSTALL_ROOT_PROPERTY));
if (dbType == null) {
dbType = DB_TYPE_DEFAULT;
} else {
checkIfDBTypeIsValid(dbType);
}

if (dbHost == null) {
dbHost = DB_HOST_DEFAULT;
}
if (dbPort == null) {
if(dbType.equals(H2.getValue())){
dbPort = H2.getPort();
} else if(dbType.equals(DERBY.getValue())){
dbPort = DERBY.getPort();
}
dbPort = DB_PORT_DEFAULT;
} else {
checkIfPortIsValid(dbPort);
}
sJavaHome = new File(getSystemProperty(JAVA_ROOT_PROPERTY));
dbManager = DBManagerFactory.getDBManager(DBType.valueOf(dbType.toUpperCase()));
dbManager = new H2Manager();
dbLocation = new File(getSystemProperty(dbManager.getRootProperty()));
try {
dbManager.checkIfDbInstalled(dbLocation);
Expand All @@ -137,19 +124,6 @@ private void checkIfPortIsValid(final String port)
strings.get("InvalidPortNumber", port));
}
}

/**
* Check if database type is valid.
*/
private void checkIfDBTypeIsValid(final String dbType)
throws CommandValidationException {
try {
DBType.valueOf(dbType.toUpperCase());
} catch (IllegalArgumentException e) {
throw new CommandValidationException(
strings.get("InvalidDBType", dbType));
}
}

/**
* Defines the command to ping the database.
Expand Down
Loading