Skip to content

Commit

Permalink
[feature] switch to new dashboard
Browse files Browse the repository at this point in the history
URL remains the same, but package URI and abbrev changes to avoid conflating old and new app. See eXist-db/existdb-dashboard#13.
  • Loading branch information
joewiz committed Jan 26, 2019
1 parent e228de4 commit 24d5915
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ keystore.validity = 100000
# The EnsureLockAspect enforces the locking contracts by annotation
enable.ensurelocking.aspect=false

autodeploy=dashboard,shared,eXide,monex,functx,usermanager
autodeploy=existdb-dashboard,packageservice,shared,eXide,monex,functx
autodeploy.repo=http://demo.exist-db.org/exist/apps/public-repo
use.autodeploy.feature=true

Expand Down
2 changes: 1 addition & 1 deletion installer/apps.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
apps.repo=http://demo.exist-db.org/exist/apps/public-repo
apps=shared,dashboard,functx,usermanager,eXide,monex,doc,fundocs,markdown
apps=shared,existdb-dashboard,packageservice,functx,eXide,monex,exist-documentation,fundocs,markdown
2 changes: 1 addition & 1 deletion installer/install.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<pack name="{$package/@abbrev}" required="no" preselected="yes" parent="Apps">
<xsl:attribute name="required">
<xsl:choose>
<xsl:when test="$package/@abbrev = 'shared' or $package/@abbrev = 'dashboard'">yes</xsl:when>
<xsl:when test="$package/@abbrev = 'shared' or $package/@abbrev = 'existdb-dashboard'">yes</xsl:when>
<xsl:otherwise>no</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
Expand Down
2 changes: 1 addition & 1 deletion src/org/exist/launcher/Launcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class Launcher extends Observable implements Observer {
private MenuItem showServices;
private MenuItem quitItem;

public final static String PACKAGE_DASHBOARD = "http://exist-db.org/apps/dashboard";
public final static String PACKAGE_DASHBOARD = "http://exist-db.org/apps/existdb-dashboard";
public final static String PACKAGE_EXIDE = "http://exist-db.org/apps/eXide";
public final static String PACKAGE_MONEX = "http://exist-db.org/apps/monex";

Expand Down
2 changes: 1 addition & 1 deletion webapp/controller.xql
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import module namespace request="http://exist-db.org/xquery/request";
import module namespace xdb = "http://exist-db.org/xquery/xmldb";

declare function local:get-dashboard() {
let $path := collection(repo:get-root())//expath:package[@name = "http://exist-db.org/apps/dashboard"]
let $path := collection(repo:get-root())//expath:package[@name = "http://exist-db.org/apps/existdb-dashboard"]
return
if ($path) then
substring-after(util:collection-name($path), repo:get-root())
Expand Down

0 comments on commit 24d5915

Please sign in to comment.