Skip to content

Commit 8b6c0f4

Browse files
adamretteradamretter
committed
fixup! fixup! WIP Rebrand eXist-db to Elemental
1 parent e0f642c commit 8b6c0f4

File tree

37 files changed

+332
-135
lines changed

37 files changed

+332
-135
lines changed

‎exist-core/pom.xml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,43 @@
670670
<configuration>
671671
<licenseSets>
672672

673+
<!--
674+
Elemental License - LGPL 2.1
675+
-->
676+
<licenseSet>
677+
<multi>
678+
<header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
679+
<separator><![CDATA[NOTE: Parts of this file contain code from 'The eXist-db Authors'.
680+
The original license header is included below.
681+
682+
=====================================================================
683+
]]></separator>
684+
<header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
685+
</multi>
686+
<includes>
687+
<include>pom.xml</include>
688+
<include>exist-core/src/main/java/org/exist/client/ClientFrame.java</include>
689+
<include>exist-core/src/main/java/org/exist/client/ConnectionDialog.java</include>
690+
<include>exist-core/src/main/java/org/exist/client/DocumentView.java</include>
691+
<include>exist-core/src/main/java/org/exist/client/IndexDialog.java</include>
692+
<include>exist-core/src/main/java/org/exist/client/InteractiveClient.java</include>
693+
<include>exist-core/src/main/java/org/exist/client/QueryDialog.java</include>
694+
<include>exist-core/src/main/java/org/exist/client/TriggersDialog.java</include>
695+
<include>exist-core/src/main/java/org/exist/client/UploadDialog.java</include>
696+
<include>exist-core/src/main/java/org/exist/client/security/AccessControlEntryDialog.java</include>
697+
<include>exist-core/src/main/java/org/exist/client/security/EditPropertiesDialog.java</include>
698+
<include>exist-core/src/main/java/org/exist/client/security/UserDialog.java</include>
699+
<include>exist-core/src/main/java/org/exist/client/security/UserManagerDialog.java</include>
700+
<include>exist-core/src/main/java/org/exist/launcher/ConfigurationDialog.java</include>
701+
<include>exist-core/src/main/resources/org/exist/client/messages.properties</include>
702+
<include>src/main/resources/org/exist/launcher/ConfigurationDialog.form</include>
703+
<include>src/main/java/org/exist/launcher/ConfigurationDialog.java</include>
704+
<include>src/main/java/org/exist/launcher/Launcher.java</include>
705+
<include>src/main/java/org/exist/launcher/LauncherWrapper.java</include>
706+
<include>src/main/java/org/exist/launcher/WindowsServiceManager.java</include>
707+
</includes>
708+
</licenseSet>
709+
673710
<licenseSet>
674711
<!--
675712
eXist-db's License
@@ -691,6 +728,26 @@
691728
<!--
692729
Already under LGPL 2.1, but with a different Copyright
693730
-->
731+
<exclude>pom.xml</exclude>
732+
<exclude>exist-core/src/main/java/org/exist/client/ClientFrame.java</exclude>
733+
<exclude>exist-core/src/main/java/org/exist/client/ConnectionDialog.java</exclude>
734+
<exclude>exist-core/src/main/java/org/exist/client/DocumentView.java</exclude>
735+
<exclude>exist-core/src/main/java/org/exist/client/IndexDialog.java</exclude>
736+
<exclude>exist-core/src/main/java/org/exist/client/InteractiveClient.java</exclude>
737+
<exclude>exist-core/src/main/java/org/exist/client/QueryDialog.java</exclude>
738+
<exclude>exist-core/src/main/java/org/exist/client/TriggersDialog.java</exclude>
739+
<exclude>exist-core/src/main/java/org/exist/client/UploadDialog.java</exclude>
740+
<exclude>exist-core/src/main/java/org/exist/client/security/AccessControlEntryDialog.java</exclude>
741+
<exclude>exist-core/src/main/java/org/exist/client/security/EditPropertiesDialog.java</exclude>
742+
<exclude>exist-core/src/main/java/org/exist/client/security/UserDialog.java</exclude>
743+
<exclude>exist-core/src/main/java/org/exist/client/security/UserManagerDialog.java</exclude>
744+
<exclude>exist-core/src/main/java/org/exist/launcher/ConfigurationDialog.java</exclude>
745+
<exclude>exist-core/src/main/resources/org/exist/client/messages.properties</exclude>
746+
<exclude>src/main/resources/org/exist/launcher/ConfigurationDialog.form</exclude>
747+
<exclude>src/main/java/org/exist/launcher/ConfigurationDialog.java</exclude>
748+
<exclude>src/main/java/org/exist/launcher/Launcher.java</exclude>
749+
<exclude>src/main/java/org/exist/launcher/LauncherWrapper.java</exclude>
750+
<exclude>src/main/java/org/exist/launcher/WindowsServiceManager.java</exclude>
694751
<exclude>src/main/java/org/exist/resolver/ResolverFactory.java</exclude>
695752
<exclude>src/main/java/org/exist/resolver/XercesXmlResolverAdapter.java</exclude>
696753
<exclude>src/main/java/org/exist/util/UTF8.java</exclude>

‎exist-core/src/main/java/org/exist/client/ClientFrame.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import java.util.stream.Collectors;
8383

8484
import static java.nio.charset.StandardCharsets.UTF_8;
85+
import static javax.swing.JOptionPane.INFORMATION_MESSAGE;
8586
import static org.exist.util.FileUtils.humanSize;
8687

8788
/**
@@ -110,7 +111,7 @@ public class ClientFrame extends JFrame implements WindowFocusListener, KeyListe
110111

111112
public static final String MULTIPLE_INDICATOR = "[...]";
112113
private static final String NON_APPLICABLE = "N/A";
113-
private static final String COLLECTION_MIME_TYPE = "exist/collection";
114+
private static final String COLLECTION_MIME_TYPE = "elemental/collection";
114115

115116
private int commandStart = 0;
116117

@@ -548,8 +549,9 @@ protected void displayPrompt() {
548549
final String pathString = path.getCollectionPath();
549550
try {
550551
commandStart = doc.getLength();
551-
doc.insertString(commandStart, Messages.getString("ClientFrame.91"), promptAttrs); //$NON-NLS-1$
552-
commandStart += 6;
552+
final String prompt = Messages.getString("ClientFrame.91");
553+
doc.insertString(commandStart, prompt, promptAttrs); //$NON-NLS-1$
554+
commandStart += prompt.length();
553555
doc.insertString(commandStart, pathString + '>', promptAttrs);
554556
commandStart += pathString.length() + 1;
555557
doc.insertString(commandStart++, Messages.getString("ClientFrame.92"), defaultAttrs); //$NON-NLS-1$
@@ -1515,7 +1517,8 @@ private void close() {
15151517
}
15161518

15171519
private void AboutAction() {
1518-
JOptionPane.showMessageDialog(this, client.getNotice());
1520+
final Icon icon = InteractiveClient.getElementalIcon(getClass());
1521+
JOptionPane.showMessageDialog(this, client.getNotice(), "About", INFORMATION_MESSAGE, icon);
15191522
}
15201523

15211524
class TableMouseListener extends MouseAdapter {

‎exist-core/src/main/java/org/exist/client/Connection.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/**
2525
* Represents the Connection detail for
26-
* connecting to either a local or remote eXist-db instance
26+
* connecting to either a local or remote Elemental instance
2727
*
2828
* You can have either:
2929
* 1) Remote Connection, provide a uri and ssl flag.

‎exist-core/src/main/java/org/exist/client/InteractiveClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2178,7 +2178,7 @@ public boolean run(final String args[]) throws Exception {
21782178
// initialize with default properties, before add client properties
21792179
properties = new Properties(defaultProps);
21802180

2181-
// get eXist home
2181+
// get Elemental home
21822182
final Optional<Path> home = ConfigurationHelper.getExistHome();
21832183

21842184
// get default configuration filename from the driver class and set it in properties

‎exist-core/src/main/java/org/exist/launcher/ConfigurationDialog.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* [email protected]
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*

‎exist-core/src/main/java/org/exist/launcher/Launcher.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* [email protected]
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*

‎exist-core/src/main/java/org/exist/launcher/LauncherWrapper.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* [email protected]
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*

‎exist-core/src/main/java/org/exist/launcher/WindowsServiceManager.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* [email protected]
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*

‎exist-core/src/main/resources/org/exist/client/messages.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
ClientFrame.0=Cut
2424
ClientFrame.1=Copy
2525
ClientFrame.2=Paste
26-
ClientFrame.3=eXist Admin Client
26+
ClientFrame.3=Elemental Admin Client
2727
ClientFrame.5=Go to parent collection
2828
ClientFrame.7=Refresh collection view
2929
ClientFrame.9=Create new collection
@@ -37,7 +37,7 @@ ClientFrame.20=icons/keyring-small.png
3737
ClientFrame.21=Manage users
3838
ClientFrame.23=Query the database with XPath
3939
ClientFrame.24=Console Menu
40-
ClientFrame.27=eXist Admin Client connected -
40+
ClientFrame.27=Elemental Admin Client connected -
4141
ClientFrame.31=File
4242
ClientFrame.32=Store files/directories
4343
ClientFrame.34=Create collection
@@ -66,7 +66,7 @@ ClientFrame.66=Shutdown
6666
ClientFrame.67=shutdown\n
6767
ClientFrame.69=Connect
6868
ClientFrame.70=Open login panel to connect to change server or identity.
69-
ClientFrame.71=eXist Admin Client connected -
69+
ClientFrame.71=Elemental Admin Client connected -
7070
ClientFrame.75=Connection to
7171
ClientFrame.77=\ failed\!
7272
ClientFrame.78=Can't reconnect to
@@ -81,7 +81,7 @@ ClientFrame.87=yes
8181
ClientFrame.88=no
8282
ClientFrame.89=Help
8383
ClientFrame.90=About
84-
ClientFrame.91=exist:
84+
ClientFrame.91=elemental:
8585
ClientFrame.92=\
8686
ClientFrame.93=Backspace
8787
ClientFrame.94=cd ..\n
@@ -151,7 +151,7 @@ ClientFrame.209=Owner
151151
ClientFrame.210=Group
152152
ClientFrame.211=Permissions
153153
ClientFrame.212=Column does not eXist\!
154-
ClientFrame.213=eXist Database Login
154+
ClientFrame.213=Elemental Database Login
155155
ClientFrame.214=Message:
156156
ClientFrame.215=Exception Stacktrace:
157157
ClientFrame.216=Error
@@ -173,7 +173,7 @@ LoginPanel.4=Type
173173
LoginPanel.5=Remote
174174
LoginPanel.6=Embedded
175175
LoginPanel.8=Configuration
176-
LoginPanel.9=An eXist configuration file for an embed instance
176+
LoginPanel.9=An Elemental configuration file for an embed instance
177177
LoginPanel.10=Select
178178
LoginPanel.11=Select an alternate conf file for embed mode.
179179
LoginPanel.12=URL

‎exist-core/src/main/resources/org/exist/client/messages_es_ES.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
ClientFrame.0=Cortar
2424
ClientFrame.1=Copiar
2525
ClientFrame.2=Pegar
26-
ClientFrame.3=Cliente de Administraci\u00f3n eXist
26+
ClientFrame.3=Cliente de Administraci\u00f3n Elemental
2727
ClientFrame.5=Ir a la colecci\u00f3n padre
2828
ClientFrame.7=Refrescar la vista de la colecci\u00f3n
2929
ClientFrame.9=Crear nueva colecci\u00f3n
@@ -37,7 +37,7 @@ ClientFrame.20=icons/keyring-small.png
3737
ClientFrame.21=Administrar usuarios
3838
ClientFrame.23=Consultar la base de datos usando XPath
3939
ClientFrame.24=Men\u00fa de Consola
40-
ClientFrame.27=Cliente de Administraci\u00f3n de eXist conectado -
40+
ClientFrame.27=Cliente de Administraci\u00f3n de Elemental conectado -
4141
ClientFrame.31=Fichero
4242
ClientFrame.32=Almacenar ficheros/directorios
4343
ClientFrame.34=Crear colecci\u00f3n
@@ -66,7 +66,7 @@ ClientFrame.66=Desconectar
6666
ClientFrame.67=desconectado\n
6767
ClientFrame.69=Conectar
6868
ClientFrame.70=Abrir panel de login para cambiar el servidor o identidad de la conexi\u00f3n.
69-
ClientFrame.71=Cliente de Administraci\u00f3n de eXist conectado -
69+
ClientFrame.71=Cliente de Administraci\u00f3n de Elemental conectado -
7070
ClientFrame.75=\u00a1La conexi\u00f3n a
7171
ClientFrame.77=\ fall\u00f3\!
7272
ClientFrame.78=Imposible reconectar a
@@ -81,7 +81,7 @@ ClientFrame.87=s\u00ed
8181
ClientFrame.88=no
8282
ClientFrame.89=Ayuda
8383
ClientFrame.90=Acerca de
84-
ClientFrame.91=exist:
84+
ClientFrame.91=elemental:
8585
ClientFrame.92=\
8686
ClientFrame.93=Backspace
8787
ClientFrame.94=cd ..\n
@@ -150,7 +150,7 @@ ClientFrame.209=Propietario
150150
ClientFrame.210=Grupo
151151
ClientFrame.211=Permisos
152152
ClientFrame.212=Column does not eXist\!
153-
ClientFrame.213=eXist Database Login
153+
ClientFrame.213=Elemental Database Login
154154
ClientFrame.214=Mensaje:
155155
ClientFrame.215=Exception Stacktrace:
156156
ClientFrame.216=Error
@@ -173,7 +173,7 @@ LoginPanel.6=Embebida
173173

174174
LoginPanel.8=Configuraci\u00f3n
175175

176-
LoginPanel.9=Un fichero de configuraci\u00f3n eXist para una instancia embebida
176+
LoginPanel.9=Un fichero de configuraci\u00f3n Elemental para una instancia embebida
177177

178178
LoginPanel.10=Seleccionar
179179

@@ -227,7 +227,7 @@ LoginPanel.35=No se puede leer del fichero seleccionado
227227

228228
LoginPanel.36=Error
229229

230-
LoginPanel.37=Seleccione un fichero de configuraci\u00f3n de instancia de eXist
230+
LoginPanel.37=Seleccione un fichero de configuraci\u00f3n de instancia de Elemental
231231
#Leave this value
232232
LoginPanel.42=name
233233
#Leave this value

0 commit comments

Comments
 (0)