Skip to content

Commit e0f642c

Browse files
committed
fixup! WIP Rebrand eXist-db to Elemental
1 parent 31fc2c1 commit e0f642c

File tree

190 files changed

+431
-960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+431
-960
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@ To be able to better understand you problem or suggestion, please add as much in
55
Please fill in the following sections:
66

77
### What is the problem
8-
> Describe exactly what you see (e.g. an output of an XQuery)
8+
> Describe exactly what you see (e.g. the output of an XQuery)
99
1010
### What did you expect
11-
> Describe what you expected to happen. Add for example a reference to a [specification](https://www.w3.org/TR/xquery-3/).
11+
> Describe what you expected to happen. Add for example a reference to a [specification](https://www.w3.org/TR/xquery-31/).
1212
1313
### Describe how to reproduce or add a test
14-
> Describe how we can can reproduce the problem.
14+
> Describe how we can reproduce the problem.
1515
16-
> The *best* way is to provide an [SSCCE (Short, Self Contained, Correct (Compilable), Example)](http://sscce.org/). One type of SSCCE could be a small test which reproduces the issue and can be run without dependencies. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it very easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) (XQuery - Run as Test)
16+
> The *best* way is to provide an [SSCCE (Short, Self Contained, Correct (Compilable), Example)](http://sscce.org/). One type of SSCCE could be a small test which reproduces the issue and can be run without dependencies. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) via `XQuery` > `Run as Test`.
1717
1818
### Context information
19-
Please always add the following information
20-
- eXist-db version + Git Revision hash e.g. eXist-db 3.0 / acd0c14
21-
- Java version (e.g. Java8u121)
22-
- Operating system (Windows 7, Linux, MacOs)
23-
- 32 or 64 bit
24-
- How is eXist-db installed? (JAR installer, DMG, .tar.gz/.zip distribution, clone from GitHub)
25-
- Any custom changes in e.g. conf.xml
19+
Please always add the following information:
20+
- Elemental version + Git Revision hash e.g. Elemental 6.3.1 / 31fc2c1
21+
- Java version (e.g. Java 8u121)
22+
- Operating system (Windows 11, Linux, macOS)
23+
- How is Elemental installed? (JAR installer, DMG, .tar.gz/.zip distribution, clone from GitHub)
24+
- Any custom config changes in e.g. conf.xml
Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
name: Bug report
3-
about: Thank you for reporting your issue and helping us to improve!
3+
about: Thank you for helping us to improve Elemental by reporting a bug.
44
title: "[BUG]"
55
labels: ''
66
assignees: ''
77

88
---
99

10-
> To be able to better understand you problem, please add as much information as possible to this ticket. Always test your bugs against the latest stable release of exist. We cannot provide support for older versions here on GitHub. If the version of eXist that is experiencing the issue is more than 1 major version behind the most recent release, please consider posting a question on our mailing list.
10+
> To be able to better understand you problem, please add as much information as possible to this ticket. Please also test your bugs against the latest stable release of Elemental to check whether it has already been fixed.
1111
1212

1313
**Describe the bug**
@@ -17,29 +17,30 @@ A clear and concise description of what the bug is.
1717
A clear and concise description of what you expected to happen.
1818

1919
**To Reproduce**
20-
> The *best* way is to provide an [SSCCE (Short, Self Contained, Correct (Compilable), Example)](http://sscce.org/). One type of SSCCE could be a small test which reproduces the issue and can be run without dependencies. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it very easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) (XQuery - Run as Test)
20+
> The *best* way is to provide an [SSCCE (Short, Self Contained, Correct (Compilable), Example)](http://sscce.org/). One type of SSCCE could be a small test which reproduces the issue and can be run without dependencies. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it very easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) `XQuery` > `Run as Test`.
2121
22-
```Xquery
22+
```xquery
2323
xquery version "3.1";
2424
2525
module namespace t="http://exist-db.org/xquery/test";
2626
2727
declare namespace test="http://exist-db.org/xquery/xqsuite";
2828
29-
<!-- replace root with your data -->
29+
(: Replace root with your data :)
3030
declare variable $t:XML := document {
31-
<root/>
31+
<root/>
3232
};
3333
34-
<!-- replace index config if needed -->
35-
declare variable $t:xconf :=
34+
(: Replace index config if needed :)
35+
declare variable $t:xconf := document {
3636
<collection xmlns="http://exist-db.org/collection-config/1.0">
37-
<index xmlns:xs="http://www.w3.org/2001/XMLSchema">
38-
<fulltext default="none" attributes="false"/>
39-
</index>
40-
</collection>;
37+
<index xmlns:xs="http://www.w3.org/2001/XMLSchema">
38+
<fulltext default="none" attributes="false"/>
39+
</index>
40+
</collection>
41+
};
4142
42-
<!-- collections and indexes can be configured here -->
43+
(: Collections and Indexes can be configured here :)
4344
declare
4445
%test:setUp
4546
function t:setup() {
@@ -60,33 +61,33 @@ function t:tearDown() {
6061
xmldb:remove("/db/system/config/db/test")
6162
};
6263
63-
<-- Adjust to your reported issue -->
64+
(: Adjust to your reported issue :)
6465
declare
65-
%test:assertTrue
66-
function t:test() {
66+
%test:assertEquals(1)
67+
function t:test-1() {
6768
let $test-data := collection('/db/test')
6869
for $result in $test-data//root
6970
return
70-
count($result) eq 1
71+
count($result)
7172
};
7273
```
7374

74-
If the above isn't working, please tell us the exact steps you took when you encountered the problem:
75-
1. Go to '...'
76-
2. Click on '....'
77-
3. Scroll down to '....'
78-
4. See error
75+
If the above isn't working, please tell us the exact steps you took when you encountered the problem, e.g.
76+
1. Go to ...
77+
2. Click on ...
78+
3. Scroll down to ...
79+
4. Results in the error ...
7980

8081
**Screenshots**
8182
If applicable, add screenshots to help explain your problem.
8283

8384
**Context (please always complete the following information)**
84-
One option is to use [xst](https://www.npmjs.com/package/@existdb/xst), and copy and paste the output produced by running `xst info` here:**
8585

86-
- Build: [eXist-6.1.0]
87-
- Java: [1.8.0_352]
88-
- OS: [Mac OS X 12.6.2]
86+
* Version: [Elemental 6.3.1]
87+
* Java: [1.8.0_352]
88+
* OS: [macOS X 12.6.2]
8989

9090
**Additional context**
91-
- How is eXist-db installed? [e.g. JAR installer, DMG, … ]
92-
- Any custom changes in e.g. `conf.xml`?
91+
92+
* How is Elemental installed? [e.g. JAR installer, DMG, … ]
93+
* Any custom changes in e.g. `conf.xml`?

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Thank you for your contribution to eXist-db!
1+
Thank you for contributing to Elemental!
22

3-
To help the community judge your pull request (PR), please include the following:
3+
To help the community judge your PR (Pull Request), please include the following:
44

5-
- A (short) description of the content of changes.
6-
- A context reference to a [Github Issue](https://github.com/evolvedbinary/elemental/issues), a message in the [eXist-open mailinglist](http://exist-open.markmail.org), or a [specification](https://www.w3.org/TR/xquery-31/).
7-
- Tests. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it very easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) via XQuery > Run as Test.
5+
- A (short) description of the content of your changes.
6+
- A context reference to a [Github Issue](https://github.com/evolvedbinary/elemental/issues), a message in the [Elemental users mailing list](https://groups.google.com/u/1/a/elemental.xyz/g/users), or a [specification](https://www.w3.org/TR/xquery-31/).
7+
- Tests. The [XQSuite - Annotation-based Test Framework for XQuery](http://exist-db.org/exist/apps/doc/xqsuite.xml) makes it easy for you to create tests. These tests can be executed from the [eXide editor](http://exist-db.org/exist/apps/eXide/index.html) via `XQuery` > `Run as Test`.
88

9-
Your PR will be tested using [GitHub Actions](https://github.com/evolvedbinary/elemental/actions) against a number of operating systems and environments. The build status is visible in the PR.
9+
Your PR will be tested using [CircleCI](https://github.com/evolvedbinary/elemental/actions) against a number of operating systems and environments. The build status is visible in the PR.
1010

11-
To detect errors in your PR before submitting it, please run eXist's full test suite on your own system via `mvn -V clean verify`.
11+
To detect errors in your PR before submitting it, please run Elemental's full test suite on your own system via `mvn -V clean site`.
1212

1313
------
1414

1515
### Description:
1616

1717
### Reference:
1818

19-
### Type of tests:
19+
### Tests:

.github/opencollective.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

exist-ant/src/test/resources-filtered/conf.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
- minDiskSpace:
165165
The amount of disk space (in megabytes) which should be available for
166166
the database to continue operations. If free disk space goes below
167-
the configured limit, eXist-db will flush all buffers to disk and
167+
the configured limit, Elemental will flush all buffers to disk and
168168
switch to read-only mode in order to prevent potential data loss.
169169
Set the limit large enough to allow all pending operations to
170170
complete. Set to -1 to disable. The default is 1 gigabyte.

exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ throws PermissionDeniedException, EXistException, XPathException
738738
throw xpe;
739739
}
740740
// We ought to do this for now until Dannes can say it works. /ljo
741-
//throw new XPathException(s, ErrorCodes.XQST0009, "The eXist-db XQuery implementation does not support the Schema Import Feature quite yet.");
741+
//throw new XPathException(s, ErrorCodes.XQST0009, "The XQuery implementation does not support the Schema Import Feature quite yet.");
742742
}
743743
)
744744
;

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@
8585
import static org.exist.util.FileUtils.humanSize;
8686

8787
/**
88-
* Main frame of the eXist GUI
88+
* @author <a href="mailto:[email protected]">Adam Retter</a>
89+
*
90+
* Main frame of the Elemental Java Admin client GUI
8991
*/
9092
public class ClientFrame extends JFrame implements WindowFocusListener, KeyListener, ActionListener, MouseListener {
9193

@@ -130,7 +132,7 @@ public class ClientFrame extends JFrame implements WindowFocusListener, KeyListe
130132
/**
131133
* Constructor.
132134
*
133-
* @param client Existdb client
135+
* @param client Elemental client
134136
* @param path Database connection URL.
135137
* @param properties Configuration items.
136138
* @throws java.awt.HeadlessException Environment does not support a keyboard, display, or mouse.
@@ -143,7 +145,7 @@ public ClientFrame(final InteractiveClient client, final XmldbURI path, final Pr
143145
this.processRunnable = new ProcessRunnable();
144146
this.processThread = client.newClientThread("process", processRunnable);
145147

146-
this.setIconImage(InteractiveClient.getExistIcon(getClass()).getImage());
148+
this.setIconImage(InteractiveClient.getElementalIcon(getClass()).getImage());
147149

148150
setupComponents();
149151
addWindowListener(new WindowAdapter() {
@@ -1724,7 +1726,7 @@ protected static Properties getLoginData(final Properties props) {
17241726

17251727
final ConnectionDialog connectionDialog = new ConnectionDialog(null, true, defaultConnectionSettings, Boolean.parseBoolean(props.getProperty(InteractiveClient.LOCAL_MODE, InteractiveClient.LOCAL_MODE_DEFAULT)), Boolean.parseBoolean(props.getProperty(InteractiveClient.NO_EMBED_MODE, InteractiveClient.NO_EMBED_MODE_DEFAULT)));
17261728

1727-
connectionDialog.setTitle(SystemProperties.getInstance().getSystemProperty("product-name", "eXist-db") + " " + SystemProperties.getInstance().getSystemProperty("product-version", "unknown") + " Database Login");
1729+
connectionDialog.setTitle(SystemProperties.getInstance().getSystemProperty("product-name", "Elemental") + " " + SystemProperties.getInstance().getSystemProperty("product-version", "unknown") + " Database Login");
17281730

17291731
connectionDialog.addDialogCompleteWithResponseCallback(connection -> {
17301732
properties.setProperty(InteractiveClient.USER, connection.getUsername());

exist-core/src/main/java/org/exist/client/ConnectionDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public ConnectionDialog(final java.awt.Frame parent, final boolean modal, final
7272
this.defaultConnectionSettings = defaultConnectionSettings;
7373
this.config = Paths.get(defaultConnectionSettings.getConfiguration());
7474
this.disableEmbeddedConnectionType = disableEmbeddedConnectionType;
75-
this.setIconImage(InteractiveClient.getExistIcon(getClass()).getImage());
75+
this.setIconImage(InteractiveClient.getElementalIcon(getClass()).getImage());
7676
initComponents();
7777

7878
if (disableEmbeddedConnectionType) {
@@ -240,7 +240,7 @@ protected final void paintTabBorder(final java.awt.Graphics g, final int tabPlac
240240
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
241241
setTitle("Database Connection");
242242

243-
lblExistLogo.setIcon(InteractiveClient.getExistIcon(getClass()));
243+
lblExistLogo.setIcon(InteractiveClient.getElementalIcon(getClass()));
244244

245245
lblUsername.setText(getLabelText("LoginPanel.2"));
246246

exist-core/src/main/java/org/exist/client/DocumentView.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.awt.Cursor;
2626
import java.awt.Dimension;
2727
import java.awt.Toolkit;
28-
import java.awt.event.ActionEvent;
29-
import java.awt.event.ActionListener;
3028
import java.awt.event.KeyEvent;
3129
import java.awt.event.WindowAdapter;
3230
import java.awt.event.WindowEvent;
@@ -75,8 +73,9 @@
7573
import org.xmldb.api.base.XMLDBException;
7674
import org.xmldb.api.modules.XMLResource;
7775

78-
import static java.nio.charset.StandardCharsets.UTF_8;
79-
76+
/**
77+
* @author <a href="mailto:[email protected]">Adam Retter</a>
78+
*/
8079
class DocumentView extends JFrame {
8180

8281
private static final long serialVersionUID = 1L;
@@ -101,7 +100,7 @@ public DocumentView(InteractiveClient client, XmldbURI resourceName, Resource re
101100
this.resourceName = resourceName;
102101
this.resource = resource;
103102
this.client = client;
104-
this.setIconImage(InteractiveClient.getExistIcon(getClass()).getImage());
103+
this.setIconImage(InteractiveClient.getElementalIcon(getClass()).getImage());
105104
this.collection = client.getCollection();
106105
this.properties = properties;
107106
getContentPane().setLayout(new BorderLayout());

exist-core/src/main/java/org/exist/client/IndexDialog.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import javax.swing.table.TableCellRenderer;
3434
import javax.swing.table.TableColumn;
3535
import java.awt.*;
36-
import java.awt.event.ActionEvent;
37-
import java.awt.event.ActionListener;
3836
import java.awt.event.WindowAdapter;
3937
import java.awt.event.WindowEvent;
4038
import java.awt.event.WindowListener;
@@ -43,9 +41,7 @@
4341
/**
4442
* Dialog for viewing and editing Indexes in the Admin Client
4543
*
46-
* @author <a href="mailto:[email protected]">Adam Retter</a>
47-
* @serial 2006-03-12
48-
* @version 1.0
44+
* @author <a href="mailto:[email protected]">Adam Retter</a>
4945
*/
5046
class IndexDialog extends JFrame {
5147

@@ -77,7 +73,7 @@ public IndexDialog(String title, InteractiveClient client)
7773
{
7874
super(title);
7975
this.client = client;
80-
this.setIconImage(InteractiveClient.getExistIcon(getClass()).getImage());
76+
this.setIconImage(InteractiveClient.getElementalIcon(getClass()).getImage());
8177
//capture the frame's close event
8278
final WindowListener windowListener = new WindowAdapter()
8379
{

0 commit comments

Comments
 (0)