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.

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

Drop dependency on shared-resources #309

Merged
merged 26 commits into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a29f91c
Add required ace version as submodule
wolfgangmm Jun 4, 2021
c158704
Use bundled ace version
wolfgangmm Jun 4, 2021
90195a3
Move documentation to separate .md
wolfgangmm Jun 4, 2021
e6abd81
Get rid of remaining deps on shared-resources
wolfgangmm Jun 4, 2021
3c1dbff
Correct links to documentation
wolfgangmm Jun 4, 2021
2575f1a
Remove app generation feature
wolfgangmm Jun 4, 2021
df80913
Remove dependency on shared resources
wolfgangmm Jun 4, 2021
fe991dd
Switch build from ant to esbuild
wolfgangmm Jun 4, 2021
105c00d
Use fixed version of xqlint
wolfgangmm Jun 4, 2021
fb6e363
Fix build
wolfgangmm Jun 4, 2021
e495723
Remove closure compiler
wolfgangmm Jun 4, 2021
36eef83
Fix another hidden dependency on jquery
wolfgangmm Jun 4, 2021
8d7b14c
Replace outdated and unmaintained slickgrid with ag-grid; drops jquer…
wolfgangmm Jun 8, 2021
46129ad
Update version to 2.5.0
wolfgangmm Jun 8, 2021
ac6e90b
File manager: make columns resizable
wolfgangmm Jun 9, 2021
c4821f0
File browser: fix for opening currently selected document
wolfgangmm Jun 9, 2021
5b6201f
Re-enable rename feature
wolfgangmm Jun 14, 2021
334fa43
Resource browser: restrict filter options to single 'contains' filter
wolfgangmm Jun 14, 2021
746ac51
Resource browser: enable editing only after activated by user to avoi…
wolfgangmm Jun 14, 2021
0d33e1a
fix travis build configuration
line-o Jun 14, 2021
72b88f2
fix order of commands in travis conf
line-o Jun 14, 2021
5a24c65
switch to nodejs build in travis conf
line-o Jun 14, 2021
05b3fe0
[ignore] Add cypress artifacts to gitignore
joewiz Jun 14, 2021
c88733b
[ignore] Add cypress artifacts to gitignore
joewiz Jun 14, 2021
7337722
Resource browser: allow cell editing in filename only
wolfgangmm Jun 14, 2021
41a6dfe
Increment version to 3.0.0
wolfgangmm Jun 14, 2021
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
20 changes: 20 additions & 0 deletions .existdb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"servers": {
"localhost": {
"server": "http://localhost:8080/exist",
"user": "admin",
"password": ""
}
},
"sync": {
"server": "localhost",
"root": "/db/apps/eXide",
"active": true,
"ignore": [
".existdb.json",
".git/**",
"node_modules/**",
"bower_components/**"
]
}
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ build/*
expath-pkg.xml

resources/scripts/xqlint.min.js
resources/scripts/ace
resources/scripts/eXide.min.*
resources/scripts/jquery/jquery.plugins.min.*

tools/r.js

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "support/xqlint"]
path = support/xqlint
url=https://github.com/eXist-db/xqlint.git
[submodule "support/ace"]
path = support/ace
url = https://github.com/ajaxorg/ace.git
16 changes: 12 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ eXide consists of two parts:
1. a javascript library for the client-side application
2. a set of XQuery scripts which are called via AJAX

## Documentation

* [short documentation of all features](./docs/docs.md)

## Dependencies

eXide requires the [shared-resources](https://github.com/eXist-db/shared-resources) package, which bundles the [ace editor](https://github.com/ajaxorg/ace) files and is included in eXist-db distributions.
Expand All @@ -38,8 +42,6 @@ You can upgrade to new releases of eXide via the Dashboard app's Package Manager

You can also build eXide from source and install it.

Read eXide's [usage documentation](https://exist-db.org/exist/apps/eXide/docs/doc.html) on eXist-db.org, or on a local system, open `http://localhost:8080/exist/apps/eXide/docs/doc.html`.

## Building

To build eXide from scratch:
Expand All @@ -50,10 +52,16 @@ cd eXide
git submodule update --init --recursive
```

Next, call ant on the `build.xml` file in eXide:
Next, call `npm install` once:

```bash
npm install
```

And each time you want to build the application:

```bash
ant
npm run build
```

You should now find a `.xar` file in the `build/` directory: `build/eXide-*.*.*.xar`. The `.xar` file is an EXPath Application package containing eXide. Install this into any compatible eXist-db instance using the Dashboard's Package Manager.
Expand Down
1 change: 0 additions & 1 deletion build.properties

This file was deleted.

177 changes: 0 additions & 177 deletions build.xml

This file was deleted.

14 changes: 0 additions & 14 deletions controller.xql
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,6 @@ else if ($exist:resource = "index.html") then
<status>fail</status>
)

(: Documentation :)
else if (matches($exist:path, "/docs/.*\.html")) then
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
<view>
<!-- pass the results through documentation.xql -->
<forward url="{$exist:controller}/modules/documentation.xql">
</forward>
</view>
</dispatch>

else if ($exist:resource eq 'execute') then
let $query := request:get-parameter("qu", ())
let $base := request:get-parameter("base", ())
Expand Down Expand Up @@ -263,10 +253,6 @@ else if (ends-with($exist:path, ".xql")) then
<set-attribute name="app-root" value="{$exist:prefix}{$exist:controller}"/>
</dispatch>

else if (contains($exist:path, "/$shared/")) then
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
<forward url="/shared-resources/{substring-after($exist:path, '/$shared/')}"/>
</dispatch>
else
(: everything else is passed through :)
<dispatch xmlns="http://exist.sourceforge.net/NS/exist">
Expand Down
Loading