Skip to content

Commit

Permalink
[MSITE-996] Rewrite site.xml in ITs for new site model
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-o committed Nov 21, 2023
1 parent 9d72298 commit 7f7b333
Show file tree
Hide file tree
Showing 42 changed files with 194 additions and 165 deletions.
7 changes: 4 additions & 3 deletions src/it/projects/MSITE-159/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -40,4 +41,4 @@ under the License.
<item name="Menu" href="http://webhost.company.com/"/>
</menu>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-265/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="MSITE-265">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
Expand All @@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
</project>
</site>
6 changes: 4 additions & 2 deletions src/it/projects/MSITE-458/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -28,4 +30,4 @@ under the License.
<body>
<menu ref="modules"/>
</body>
</project>
</site>
7 changes: 4 additions & 3 deletions src/it/projects/MSITE-497/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -35,4 +36,4 @@ under the License.
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
</body>
</project>
</site>
7 changes: 4 additions & 3 deletions src/it/projects/MSITE-566/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -32,4 +33,4 @@ under the License.
<!-- a comment -->
</menu>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-582/child/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -35,4 +35,4 @@ under the License.
<item name="O" href="A/B/C/M/N/O"/>
</breadcrumbs>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-582/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -37,4 +37,4 @@ under the License.
<item name="F" href="A/B/C/D/E/F"/>
</breadcrumbs>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-609/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="MSITE-265" xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="MSITE-609">
<publishDate format="dd MMM yyyy HH:mm"/>
<version position="left"/>
<skin>
Expand All @@ -41,4 +41,4 @@ under the License.
<menu ref="reports"/>
<menu ref="modules"/>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-658/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -33,4 +33,4 @@ under the License.
<item name="Home" href="http://maven.apache.org/sub-directory/index.html"/>
</menu>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-658/src/site/site_de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -33,4 +33,4 @@ under the License.
<item name="Heim" href="http://maven.apache.org/sub-directory/de/index.html"/>
</menu>
</body>
</project>
</site>
7 changes: 4 additions & 3 deletions src/it/projects/MSITE-842/project/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="Maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.plugins.site.its</groupId>
<artifactId>MSITE-842-skin</artifactId>
Expand All @@ -36,4 +37,4 @@ under the License.
<!--<item name="Xdoc Example" href="xdoc.html"/>-->
</menu>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-856/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -33,4 +33,4 @@ under the License.
<item name="My first item"/>
</menu>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/MSITE-856/src/site/site_de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -33,4 +33,4 @@ under the License.
<item name="Mein erstes Element"/>
</menu>
</body>
</project>
</site>
9 changes: 4 additions & 5 deletions src/it/projects/doxia-formats/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
name="${project.name}">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -43,4 +42,4 @@ under the License.
<item name="Doxia Formats IT" href="index.html" />
</breadcrumbs>
</body>
</project>
</site>
9 changes: 4 additions & 5 deletions src/it/projects/doxia-formats/src/site/site_de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
name="${project.name}">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -43,4 +42,4 @@ under the License.
<item name="Doxia-Formate IT" href="index.html" />
</breadcrumbs>
</body>
</project>
</site>
8 changes: 4 additions & 4 deletions src/it/projects/effective-site/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="MSITE-680" xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="MSITE-680">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -34,4 +34,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.6.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
<bannerLeft>
<name>project.artifactId = ${project.artifactId}</name>
</bannerLeft>
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="${project.name}">
<bannerLeft name="project.artifactId = ${project.artifactId}" />

<skin>
<groupId>org.apache.maven.skins</groupId>
Expand All @@ -38,4 +36,4 @@ under the License.
<item name="${this.name}" href="http://maven.apache.org/${this.artifactId}" />
</breadcrumbs>
</body>
</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="Grand Child As Ref Site">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="Grand Child As Ref Site">

<body>

Expand All @@ -32,4 +34,4 @@ under the License.

</body>

</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="Child As Ref Site">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="Child As Ref Site">

<body>

Expand All @@ -32,4 +34,4 @@ under the License.

</body>

</project>
</site>
7 changes: 4 additions & 3 deletions src/it/projects/inheritedMenus/parentAsRef/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<project name="Parent As Ref Site">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="Parent As Ref Site">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand Down Expand Up @@ -49,4 +50,4 @@ under the License.

</body>

</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ specific language governing permissions and limitations
under the License.
-->

<project name="Grand Child Not As Ref Site">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="Grand Child Not As Ref Site">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
Expand All @@ -37,4 +39,4 @@ under the License.

</body>

</project>
</site>
Loading

0 comments on commit 7f7b333

Please sign in to comment.