slachiewicz opened a new pull request, #1646:
URL: https://github.com/apache/maven-site/pull/1646
Moves the `/doxia/**` pages out of `apache/maven-doxia-site` and into this
repo, so the whole
of maven.apache.org is built from one source tree. Plan and open questions
in #1645.
No `/doxia/` URL changes. Merging this is safe on its own: `svnwcsub` still
mounts `/doxia`
from `maven/doxia/website/content/`, which shadows the `doxia/` directory
this build starts
committing to `maven/website/content/`. The INFRA ticket that removes that
mount is drafted in
#1645 and only goes in after this has merged and deployed.
`content/markdown/**` and `content/resources/**` from maven-doxia-site land
under
`content/{markdown,resources}/doxia/` with their structure preserved, so
relative links and
the `components.links` symlink targets keep resolving. `doxiaVersion` moves
to `pom.xml`
because two `.vm` pages read it.
Three things do not survive the move:
- **Skin assets.** The skin writes its icons, fonts, `js/` and CSS into the
*site root*, which
is `/` here rather than `/doxia/`. The format table now loads
`/images/icon_*_sml.gif`, and
the two `*-archives/` rules in `/doxia/.htaccess` point at `/images/` and
`/css/` so the
archived release sites keep getting theirs.
- **Five project information pages.** `team`, `mailing-lists`,
`ci-management` and
`issue-management` redirect to the root equivalents; `project-info.html`
redirects to
`/doxia/`.
- **The site descriptor.** A build has one `site.xml`, so the second commit
folds Doxia's
menus into the Documentation menu next to Maven Tools. This is the part
most worth
reviewing — it is a judgement call, not a mechanical move, and question 1
in #1645.
Doxia's `site.css` turned out to be a strict subset of this repo's, so it is
dropped rather
than duplicated.
If dev@ decides on the history graft (question 2 in #1645), this PR is
superseded by that
merge rather than amended.
Verified: `mvn clean verify site` succeeds; `diff -rq` between the old
standalone build and
`target/site/doxia` shows only the five report pages, `avatars/`, `css/`,
`fonts/`, `img/`,
`js/` and the skin icons, all of which are served from the site root instead
— and nothing
present in the new build that was not in the old. Resolving all 1554 local
links in the built
Doxia pages leaves 36 dangling, down from 50: the remainder are the
component symlinks and
`/download.cgi`, which exist only on the live server (200 today), and 14
links into the main
site that were broken in the standalone build and now resolve.
*This change was created with AI assistance.*
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
