Skip to content

Commit b9aecef

Browse files
adamretteradamretter
committed
fixup! WIP Rebrand eXist-db to Elemental
1 parent 2b85c7b commit b9aecef

File tree

13 files changed

+228
-67
lines changed

13 files changed

+228
-67
lines changed

‎exist-distribution/pom.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,16 @@
350350
<configuration>
351351
<licenseSets>
352352
<licenseSet>
353-
<!--
354-
eXist-db's License
355-
-->
356-
<header>${project.parent.relativePath}/existdb-LGPL-21-license.template.txt</header>
353+
<multi>
354+
<header>${project.parent.relativePath}/../elemental-parent/elemental-LGPL-21-ONLY-license.template.txt</header>
355+
<separator><![CDATA[NOTE: Parts of this file contain code from 'The eXist-db Authors'.
356+
The original license header is included below.
357+
358+
=====================================================================
359+
]]></separator>
360+
<header>${project.parent.relativePath}/../exist-parent/existdb-LGPL-21-license.template.txt</header>
361+
</multi>
362+
357363
<excludes>
358364
<exclude>existdb-LGPL-21-license.txt</exclude>
359365
<exclude>src/app/entitlements.plist</exclude>
@@ -1071,7 +1077,7 @@
10711077
<minimumSystemVersion>10.9</minimumSystemVersion>
10721078
<version>${project.version}</version>
10731079
<shortVersion>${project.version}</shortVersion>
1074-
<icon>icon.icns</icon>
1080+
<icon>elemental.icns</icon>
10751081
<copyright>${project.inceptionYear} The eXist-db Project</copyright>
10761082
<applicationCategory>public.app-category.developer-tools</applicationCategory>
10771083
<additionalResourcePaths>

‎exist-distribution/src/appbundler/elemental.icns‎

130 KB
Binary file not shown.

‎exist-distribution/src/appbundler/icon.icns‎

-15.1 KB
Binary file not shown.

‎exist-distribution/src/assembly/dist-assembly-unix.xml‎

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

‎exist-distribution/src/assembly/dist-assembly-win.xml‎

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

‎exist-distribution/src/dmg/VolumeIcon.icns‎

75.8 KB
Binary file not shown.

‎exist-distribution/src/dmg/background.png‎

-29.8 KB
Loading

‎exist-distribution/src/main/config/log4j2.xml‎

Lines changed: 49 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Property name="rollover.max.size">10MB</Property>
66
<Property name="rollover.max">14</Property>
77
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
8-
<Property name="exist.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
8+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
99
</Properties>
1010

1111
<Appenders>
@@ -14,220 +14,207 @@
1414
<PatternLayout pattern="%d{DATE} [%t] %-5p (%F [%M]:%L) - %m %n"/>
1515
</Console>
1616

17-
<RollingRandomAccessFile name="exist.core" filePattern="${logs}/exist.${rollover.file.pattern}.log.gz" fileName="${logs}/exist.log">
17+
<RollingRandomAccessFile name="elemental.core" filePattern="${logs}/elemental.${rollover.file.pattern}.log.gz" fileName="${logs}/elemental.log">
1818
<Policies>
1919
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
2020
</Policies>
2121
<DefaultRolloverStrategy max="${rollover.max}"/>
22-
<PatternLayout pattern="${exist.file.pattern}"/>
22+
<PatternLayout pattern="${elemental.file.pattern}"/>
2323
</RollingRandomAccessFile>
2424

25-
<RollingRandomAccessFile name="exist.locks" filePattern="${logs}/locks.${rollover.file.pattern}.log.gz" fileName="${logs}/locks.log">
25+
<RollingRandomAccessFile name="elemental.locks" filePattern="${logs}/locks.${rollover.file.pattern}.log.gz" fileName="${logs}/locks.log">
2626
<Policies>
2727
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
2828
</Policies>
2929
<DefaultRolloverStrategy max="${rollover.max}"/>
3030
<PatternLayout pattern="%d %-5p - %m %n"/>
3131
</RollingRandomAccessFile>
3232

33-
<RollingRandomAccessFile name="exist.ensurelocking" filePattern="${logs}/locks.${rollover.file.pattern}.log.gz" fileName="${logs}/ensure-locking.log">
33+
<RollingRandomAccessFile name="elemental.ensurelocking" filePattern="${logs}/locks.${rollover.file.pattern}.log.gz" fileName="${logs}/ensure-locking.log">
3434
<Policies>
3535
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
3636
</Policies>
3737
<DefaultRolloverStrategy max="${rollover.max}"/>
3838
<PatternLayout pattern="%d %-5p - %m %n"/>
3939
</RollingRandomAccessFile>
4040

41-
<RollingRandomAccessFile name="exist.xmldb" filePattern="${logs}/xmldb.${rollover.file.pattern}.log.gz" fileName="${logs}/xmldb.log">
41+
<RollingRandomAccessFile name="elemental.xmldb" filePattern="${logs}/xmldb.${rollover.file.pattern}.log.gz" fileName="${logs}/xmldb.log">
4242
<Policies>
4343
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
4444
</Policies>
4545
<DefaultRolloverStrategy max="${rollover.max}"/>
46-
<PatternLayout pattern="${exist.file.pattern}"/>
46+
<PatternLayout pattern="${elemental.file.pattern}"/>
4747
</RollingRandomAccessFile>
4848

49-
<RollingRandomAccessFile name="exist.xmlrpc" filePattern="${logs}/xmlrpc.${rollover.file.pattern}.log.gz" fileName="${logs}/xmlrpc.log">
49+
<RollingRandomAccessFile name="elemental.xmlrpc" filePattern="${logs}/xmlrpc.${rollover.file.pattern}.log.gz" fileName="${logs}/xmlrpc.log">
5050
<Policies>
5151
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
5252
</Policies>
5353
<DefaultRolloverStrategy max="${rollover.max}"/>
54-
<PatternLayout pattern="${exist.file.pattern}"/>
54+
<PatternLayout pattern="${elemental.file.pattern}"/>
5555
</RollingRandomAccessFile>
5656

57-
<RollingRandomAccessFile name="exist.urlrewrite" filePattern="${logs}/urlrewrite.${rollover.file.pattern}.log.gz" fileName="${logs}/urlrewrite.log">
57+
<RollingRandomAccessFile name="elemental.urlrewrite" filePattern="${logs}/urlrewrite.${rollover.file.pattern}.log.gz" fileName="${logs}/urlrewrite.log">
5858
<Policies>
5959
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
6060
</Policies>
6161
<DefaultRolloverStrategy max="${rollover.max}"/>
62-
<PatternLayout pattern="${exist.file.pattern}"/>
62+
<PatternLayout pattern="${elemental.file.pattern}"/>
6363
</RollingRandomAccessFile>
6464

65-
<RollingRandomAccessFile name="exist.profiling" filePattern="${logs}/profile.${rollover.file.pattern}.log.gz" fileName="${logs}/profile.log">
65+
<RollingRandomAccessFile name="elemental.profiling" filePattern="${logs}/profile.${rollover.file.pattern}.log.gz" fileName="${logs}/profile.log">
6666
<Policies>
6767
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
6868
</Policies>
6969
<DefaultRolloverStrategy max="${rollover.max}"/>
70-
<PatternLayout pattern="${exist.file.pattern}"/>
70+
<PatternLayout pattern="${elemental.file.pattern}"/>
7171
</RollingRandomAccessFile>
7272

73-
<RollingRandomAccessFile name="exist.scheduler" filePattern="${logs}/scheduler.${rollover.file.pattern}.log.gz" fileName="${logs}/scheduler.log">
73+
<RollingRandomAccessFile name="elemental.scheduler" filePattern="${logs}/scheduler.${rollover.file.pattern}.log.gz" fileName="${logs}/scheduler.log">
7474
<Policies>
7575
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
7676
</Policies>
7777
<DefaultRolloverStrategy max="${rollover.max}"/>
78-
<PatternLayout pattern="${exist.file.pattern}"/>
78+
<PatternLayout pattern="${elemental.file.pattern}"/>
7979
</RollingRandomAccessFile>
8080

81-
<RollingRandomAccessFile name="exist.ehcache" filePattern="${logs}/ehcache.${rollover.file.pattern}.log.gz" fileName="${logs}/ehcache.log">
81+
<RollingRandomAccessFile name="elemental.ehcache" filePattern="${logs}/ehcache.${rollover.file.pattern}.log.gz" fileName="${logs}/ehcache.log">
8282
<Policies>
8383
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
8484
</Policies>
8585
<DefaultRolloverStrategy max="${rollover.max}"/>
86-
<PatternLayout pattern="${exist.file.pattern}"/>
86+
<PatternLayout pattern="${elemental.file.pattern}"/>
8787
</RollingRandomAccessFile>
8888

89-
<RollingRandomAccessFile name="exist.betterform" filePattern="${logs}/betterform.${rollover.file.pattern}.log.gz" fileName="${logs}/betterform.log">
89+
<RollingRandomAccessFile name="elemental.restxq" filePattern="${logs}/restxq.${rollover.file.pattern}.log.gz" fileName="${logs}/restxq.log">
9090
<Policies>
9191
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
9292
</Policies>
9393
<DefaultRolloverStrategy max="${rollover.max}"/>
94-
<PatternLayout pattern="${exist.file.pattern}"/>
94+
<PatternLayout pattern="${elemental.file.pattern}"/>
9595
</RollingRandomAccessFile>
9696

97-
<RollingRandomAccessFile name="exist.restxq" filePattern="${logs}/restxq.${rollover.file.pattern}.log.gz" fileName="${logs}/restxq.log">
97+
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
9898
<Policies>
9999
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
100100
</Policies>
101101
<DefaultRolloverStrategy max="${rollover.max}"/>
102-
<PatternLayout pattern="${exist.file.pattern}"/>
102+
<PatternLayout pattern="${elemental.file.pattern}"/>
103103
</RollingRandomAccessFile>
104104

105-
<RollingRandomAccessFile name="exist.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
105+
<RollingRandomAccessFile name="elemental.statistics" filePattern="${logs}/statistics.${rollover.file.pattern}.log.gz" fileName="${logs}/statistics.log">
106106
<Policies>
107107
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
108108
</Policies>
109109
<DefaultRolloverStrategy max="${rollover.max}"/>
110-
<PatternLayout pattern="${exist.file.pattern}"/>
111-
</RollingRandomAccessFile>
112-
113-
<RollingRandomAccessFile name="exist.statistics" filePattern="${logs}/statistics.${rollover.file.pattern}.log.gz" fileName="${logs}/statistics.log">
114-
<Policies>
115-
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
116-
</Policies>
117-
<DefaultRolloverStrategy max="${rollover.max}"/>
118-
<PatternLayout pattern="${exist.file.pattern}"/>
110+
<PatternLayout pattern="${elemental.file.pattern}"/>
119111
</RollingRandomAccessFile>
120112

121113
<RollingRandomAccessFile name="expath.repo" filePattern="${logs}/expath-repo.${rollover.file.pattern}.log.gz" fileName="${logs}/expath-repo.log">
122114
<Policies>
123115
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
124116
</Policies>
125117
<DefaultRolloverStrategy max="${rollover.max}"/>
126-
<PatternLayout pattern="${exist.file.pattern}"/>
118+
<PatternLayout pattern="${elemental.file.pattern}"/>
127119
</RollingRandomAccessFile>
128120

129-
<RollingRandomAccessFile name="exist.launcher" filePattern="${logs}/launcher.${rollover.file.pattern}.log.gz" fileName="${logs}/launcher.log">
121+
<RollingRandomAccessFile name="elemental.launcher" filePattern="${logs}/launcher.${rollover.file.pattern}.log.gz" fileName="${logs}/launcher.log">
130122
<Policies>
131123
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
132124
</Policies>
133125
<DefaultRolloverStrategy max="${rollover.max}"/>
134-
<PatternLayout pattern="${exist.file.pattern}"/>
126+
<PatternLayout pattern="${elemental.file.pattern}"/>
135127
</RollingRandomAccessFile>
136128

137129
</Appenders>
138130

139131
<Loggers>
140132

141133
<Logger name="org.exist.storage.lock.LockTable" additivity="false" level="info"> <!-- set to level="trace" to see lock activity -->
142-
<AppenderRef ref="exist.locks"/>
134+
<AppenderRef ref="elemental.locks"/>
143135
</Logger>
144136

145137
<Logger name="org.exist.storage.lock.EnsureLockingAspect" additivity="false" level="trace">
146-
<AppenderRef ref="exist.ensurelocking"/>
138+
<AppenderRef ref="elemental.ensurelocking"/>
147139
</Logger>
148140

149141
<Logger name="org.exist.util.sanity.SanityCheck" additivity="false" level="info"> <!-- set to level="trace" to enable all sanity check logging -->
150-
<AppenderRef ref="exist.core"/>
142+
<AppenderRef ref="elemental.core"/>
151143
</Logger>
152144

153145
<Logger name="org.exist.jetty.JettyStart" additivity="false" level="trace">
154146
<AppenderRef ref="STDOUT"/>
155-
<AppenderRef ref="exist.core"/>
147+
<AppenderRef ref="elemental.core"/>
156148
</Logger>
157149

158150
<Logger name="org.exist.jetty.StandaloneServer" additivity="false" level="trace">
159151
<AppenderRef ref="STDOUT"/>
160-
<AppenderRef ref="exist.core"/>
152+
<AppenderRef ref="elemental.core"/>
161153
</Logger>
162154

163155
<Logger name="xquery.profiling" additivity="false" level="trace">
164-
<AppenderRef ref="exist.profiling"/>
156+
<AppenderRef ref="elemental.profiling"/>
165157
</Logger>
166158

167159
<Logger name="org.exist.statistics" additivity="false" level="debug">
168-
<AppenderRef ref="exist.core"/>
169-
<AppenderRef ref="exist.statistics"/>
160+
<AppenderRef ref="elemental.core"/>
161+
<AppenderRef ref="elemental.statistics"/>
170162
</Logger>
171163

172164
<Logger name="org.exist.backup.SystemExport" additivity="false" level="trace">
173-
<AppenderRef ref="exist.backup"/>
165+
<AppenderRef ref="elemental.backup"/>
174166
</Logger>
175167

176168
<Logger name="org.exist.xmldb" additivity="false" level="info">
177-
<AppenderRef ref="exist.xmldb"/>
169+
<AppenderRef ref="elemental.xmldb"/>
178170
</Logger>
179171

180172
<Logger name="org.exist.xmlrpc" additivity="false" level="info">
181-
<AppenderRef ref="exist.xmlrpc"/>
173+
<AppenderRef ref="elemental.xmlrpc"/>
182174
</Logger>
183175

184176
<Logger name="org.apache.xmlrpc" additivity="false" level="info">
185-
<AppenderRef ref="exist.xmlrpc"/>
177+
<AppenderRef ref="elemental.xmlrpc"/>
186178
</Logger>
187179

188180
<Logger name="org.exist.http.urlrewrite" additivity="false" level="info">
189181
<!-- set to "trace" to get detailed info on URL rewriting -->
190-
<AppenderRef ref="exist.urlrewrite"/>
182+
<AppenderRef ref="elemental.urlrewrite"/>
191183
</Logger>
192184

193185
<Logger name="org.exist.extensions.exquery.restxq" additivity="false" level="info">
194-
<AppenderRef ref="exist.restxq"/>
186+
<AppenderRef ref="elemental.restxq"/>
195187
</Logger>
196188

197189
<Logger name="org.eclipse.jetty" additivity="false" level="info">
198-
<AppenderRef ref="exist.core"/>
190+
<AppenderRef ref="elemental.core"/>
199191
</Logger>
200192

201193
<Logger name="httpclient" additivity="false" level="info">
202-
<AppenderRef ref="exist.core"/>
194+
<AppenderRef ref="elemental.core"/>
203195
</Logger>
204196

205197
<Logger name="net.sf.ehcache" additivity="false" level="info">
206-
<AppenderRef ref="exist.ehcache"/>
198+
<AppenderRef ref="elemental.ehcache"/>
207199
</Logger>
208200

209201
<!-- Milton WebDAV framework -->
210202
<Logger name="com.bradmcevoy" additivity="false" level="info">
211-
<AppenderRef ref="exist.core"/>
203+
<AppenderRef ref="elemental.core"/>
212204
</Logger>
213205

214206
<!-- Apache Axis: 'debug' produces a large amount of debugging output -->
215207
<Logger name="org.apache" additivity="false" level="off">
216-
<AppenderRef ref="exist.core"/>
208+
<AppenderRef ref="elemental.core"/>
217209
</Logger>
218210

219211
<!-- Quartz scheduler -->
220212
<Logger name="org.quartz" additivity="false" level="info">
221-
<AppenderRef ref="exist.scheduler"/>
213+
<AppenderRef ref="elemental.scheduler"/>
222214
</Logger>
223215

224216
<Logger name="org.exist.storage.SystemTask" additivity="false" level="debug">
225-
<AppenderRef ref="exist.scheduler"/>
226-
</Logger>
227-
228-
<!-- betterFORM extension -->
229-
<Logger name="de.betterform" additivity="false" level="warn">
230-
<AppenderRef ref="exist.betterform"/>
217+
<AppenderRef ref="elemental.scheduler"/>
231218
</Logger>
232219

233220
<!-- expath pkg repo -->
@@ -238,11 +225,11 @@
238225
<AppenderRef ref="expath.repo"/>
239226
</Logger>
240227
<Logger name="org.exist.launcher" additivity="false" level="warn">
241-
<AppenderRef ref="exist.launcher"/>
228+
<AppenderRef ref="elemental.launcher"/>
242229
</Logger>
243230

244231
<Root level="info">
245-
<AppenderRef ref="exist.core"></AppenderRef>
232+
<AppenderRef ref="elemental.core"></AppenderRef>
246233
</Root>
247234

248235
</Loggers>

0 commit comments

Comments
 (0)