[7.x.x] Fix Patch packageservice XAR to report existdb-compatible version - #233
[7.x.x] Fix Patch packageservice XAR to report existdb-compatible version#233Laurettta wants to merge 1 commit into
Conversation
Not up to standards ⛔
|
f0a0fbd to
a41e6e6
Compare
c442c35 to
b605ad8
Compare
Laurettta
changed the title
Laurettta
changed the title
98957ba to
6fc6baf
Compare
Laurettta
changed the title
6fc6baf to
ba4874c
Compare
| <execution> | ||
| <id>unzip-dashboard</id> | ||
| <phase>process-resources</phase> | ||
| <id>resolve-dashboard-xar-path</id> |
There was a problem hiding this comment.
We can remove the resolve-dashboard-xar-path execution, as setting the dashboard-xar-path property is already done by the expath-package-repository-plugin above.
| <replace file="${expath.pkg.dir}-dashboard-staging/doc.html" token="title>existdb-dashboard<" value="title>Dashboard :: Elemental<" /> | ||
| <replace file="${expath.pkg.dir}-dashboard-staging/guest.html" token="title>existdb-dashboard<" value="title>Dashboard :: Elemental<" /> | ||
| <replace file="${expath.pkg.dir}-dashboard-staging/index.html" token="title>existdb-dashboard<" value="title>Dashboard :: Elemental<" /> | ||
| <replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg" /> |
There was a problem hiding this comment.
We need to come up with a way to replace the last part of the patch-dashboard-branding execution, i.e. these lines:
<replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg" />
<loadfile property="elemental-web-svg" srcFile="${project.build.outputDirectory}/elemental-web.svg" />
<replaceregexp file="${expath.pkg.dir}-dashboard-staging/bower_components/existdb-launcher/existdb-branding.html" match="<svg.+</svg>" replace="${elemental-web-svg}" />
with an a different way of doing this that does not use the antrun plugin. One way would be to create further patch files to do this. You might want to leave this to last, think about how to do it, and then please discuss it with me before making the changes.
| </execution> | ||
| <execution> | ||
| <id>zip-patched-monex</id> | ||
| <id>delete-original-xars</id> |
There was a problem hiding this comment.
Please remove the delete-original-xars execution. We don't need to do that.
| </executions> | ||
| </plugin> | ||
|
|
||
| <!-- <plugin>--> |
There was a problem hiding this comment.
Remove this commented out code please
| <execution> | ||
| <id>patch-dashboard</id> | ||
| <phase>process-resources</phase> | ||
| <goals><goal>apply</goal></goals> |
| <execution> | ||
| <id>patch-monex</id> | ||
| <phase>process-resources</phase> | ||
| <goals><goal>apply</goal></goals> |
| <artifactId>patch-maven-plugin</artifactId> | ||
| <version>1.1.0</version> | ||
| <configuration> | ||
| <targetDirectory>${expath.pkg.dir}-packageservice-staging</targetDirectory> |
There was a problem hiding this comment.
Move the package service config into the package service execution please
| @@ -0,0 +1,11 @@ | |||
| --- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/admin.xql 2026-07-29 08:48:15 | |||
There was a problem hiding this comment.
This will only work on your computer. Please change this to use paths that are relevant to the working directory of where the uncompressed app is staged. So in this patch you would change:
/Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/admin.xql->admin.xql
Please do the equivalent in each one of your patch files.
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> |
There was a problem hiding this comment.
Once you remove the set properties parts of the antrun plugin, this can also be removed because the properties, for example: the dashboard-xar-path property is already set by the expath-package-repository-plugin above.
…compatible version and migrate XAR patching to compress-uncompress-maven-plugin Closes #225
ba4874c to
43111ab
Compare
Laurettta
changed the title
2 participants
Ensures that only compatible versions of eXist-db Apps are downloaded during the build, and improves on how these Apps are patched for Elemental.
Closes #225
Closes eXist-db/eXide#822
Closes eXist-db/expath-crypto-module#111