Skip to content

Commit 8d5b77d

Browse files
adamretteradamretter
committed
[bugfix] Fix the linking to apps by abbrev package name.
Closes eXist-db#154
1 parent 306e267 commit 8d5b77d

File tree

3 files changed

+43
-19
lines changed

3 files changed

+43
-19
lines changed

‎pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@
5454
<package-name>http://exist-db.org/apps/doc</package-name>
5555
<package-abbrev>${project.artifactId}</package-abbrev>
5656
<package-final-name>${project.artifactId}-${project.version}</package-final-name>
57+
58+
<!-- other packages that the documentation links to; their `abbrev` must match their expath-pkg.xml -->
59+
<dashboard-package-abbrev>dashboard</dashboard-package-abbrev>
60+
<demo-package-abbrev>demo</demo-package-abbrev>
61+
<fundocs-package-abbrev>fundocs</fundocs-package-abbrev>
62+
<exide-package-abbrev>eXide</exide-package-abbrev>
63+
<monex-package-abbrev>monex</monex-package-abbrev>
5764
</properties>
5865

5966
<dependencies>
@@ -95,6 +102,23 @@
95102
</reporting>
96103

97104
<build>
105+
<resources>
106+
<resource>
107+
<directory>src/main/xar-resources</directory>
108+
<filtering>true</filtering>
109+
<includes>
110+
<include>templates/**</include>
111+
</includes>
112+
</resource>
113+
<resource>
114+
<directory>src/main/xar-resources</directory>
115+
<filtering>false</filtering>
116+
<excludes>
117+
<exclude>templates/**</exclude>
118+
</excludes>
119+
</resource>
120+
</resources>
121+
98122
<plugins>
99123
<plugin>
100124
<groupId>com.mycila</groupId>

‎src/main/xar-resources/templates/page.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Home</a>
3131
<ul class="dropdown-menu">
3232
<li>
33-
<a href="{dashboard}/index.html">Dashboard</a>
33+
<a href="{${dashboard-package-abbrev}}/index.html">Dashboard</a>
3434
</li>
3535
<li>
3636
<a href="http://exist-db.org">eXist-db.org</a>
@@ -41,41 +41,41 @@
4141
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Demo</a>
4242
<ul class="dropdown-menu">
4343
<li>
44-
<a href="{demo}/index.html">Overview</a>
44+
<a href="{${demo-package-abbrev}}/index.html">Overview</a>
4545
</li>
4646
<li>
47-
<a href="{demo}/examples/basic/basics.html">Basic XQuery Examples</a>
47+
<a href="{${demo-package-abbrev}}/examples/basic/basics.html">Basic XQuery Examples</a>
4848
</li>
4949
<li>
50-
<a href="{demo}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
50+
<a href="{${demo-package-abbrev}}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
5151
</li>
5252
<li>
53-
<a href="{demo}/examples/web/index.html">Web Examples</a>
53+
<a href="{${demo-package-abbrev}}/examples/web/index.html">Web Examples</a>
5454
</li>
5555
<li>
56-
<a href="{demo}/examples/urlrewriting/index.html">URL Rewriting</a>
56+
<a href="{${demo-package-abbrev}}/examples/urlrewriting/index.html">URL Rewriting</a>
5757
</li>
5858
<li>
59-
<a href="{demo}/examples/special/index.html">Special Features</a>
59+
<a href="{${demo-package-abbrev}}/examples/special/index.html">Special Features</a>
6060
</li>
6161
<li>
62-
<a href="{demo}/examples/templating/templates.html">Templating</a>
62+
<a href="{${demo-package-abbrev}}/examples/templating/templates.html">Templating</a>
6363
</li>
6464
<li>
65-
<a href="{demo}/cex-demo.html">Content Extraction</a>
65+
<a href="{${demo-package-abbrev}}/cex-demo.html">Content Extraction</a>
6666
</li>
6767
<li>
68-
<a href="{demo}/examples/tests/test.html">Unit Testing</a>
68+
<a href="{${demo-package-abbrev}}/examples/tests/test.html">Unit Testing</a>
6969
</li>
7070
<li>
71-
<a href="{demo}/examples/contacts/html/home.html?browseContacts">RestXQ and
71+
<a href="{${demo-package-abbrev}}/examples/contacts/html/home.html?browseContacts">RestXQ and
7272
AngularJS</a>
7373
</li>
7474
<li>
75-
<a href="{demo}/examples/xforms/">XForms and RestXQ</a>
75+
<a href="{${demo-package-abbrev}}/examples/xforms/">XForms and RestXQ</a>
7676
</li>
7777
<li>
78-
<a href="{demo}/examples/contacts/html/home.html">Contacts RestXQ Demo</a>
78+
<a href="{${demo-package-abbrev}}/examples/contacts/html/home.html">Contacts RestXQ Demo</a>
7979
</li>
8080
</ul>
8181
</li>
@@ -86,7 +86,7 @@
8686
<a href="documentation.xml">Documentation</a>
8787
</li>
8888
<li>
89-
<a href="{fundocs}/index.html">XQuery Functions</a>
89+
<a href="{${fundocs-package-abbrev}}/index.html">XQuery Functions</a>
9090
</li>
9191
<li>
9292
<a href="getting-help.xml">Get Support</a>
@@ -103,7 +103,7 @@
103103
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Development</a>
104104
<ul class="dropdown-menu">
105105
<li>
106-
<a href="{eXide}/index.html">eXide</a>
106+
<a href="{${exide-package-abbrev}}/index.html">eXide</a>
107107
</li>
108108
<li>
109109
<a href="http://exist-db.org/api/index.html">Javadocs</a>
@@ -124,13 +124,13 @@
124124
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Administration</a>
125125
<ul class="dropdown-menu">
126126
<li>
127-
<a href="{dashboard}/index.html">Dashboard</a>
127+
<a href="{${dashboard-package-abbrev}}/index.html">Dashboard</a>
128128
</li>
129129
<li>
130130
<a href="/webstart/exist.jnlp">Webstart Client</a>
131131
</li>
132132
<li>
133-
<a href="{monex}/">Monitoring and Profiling</a>
133+
<a href="{${monex-package-abbrev}}/">Monitoring and Profiling</a>
134134
</li>
135135
</ul>
136136
</li>
@@ -162,7 +162,7 @@
162162
<a href="documentation.xml">Documentation</a>
163163
</li>
164164
<li>
165-
<a href="{demo}/index.html">Demo</a>
165+
<a href="{${demo-package-abbrev}}/index.html">Demo</a>
166166
</li>
167167
<li class="hidden-xs-inline">
168168
<a href="/status">Status</a>

‎xar-assembly.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</includes>
6161
</fileSet>
6262
<fileSet>
63-
<directory>${basedir}/src/main/xar-resources</directory>
63+
<directory>${project.build.outputDirectory}</directory>
6464
</fileSet>
6565
</fileSets>
6666

0 commit comments

Comments
 (0)