Author: hboutemy
Date: Wed Apr 18 22:12:21 2012
New Revision: 1327704
URL: http://svn.apache.org/viewvc?rev=1327704&view=rev
Log:
[MSITE-582] Make it possible to remove breadcrumbs in child projects again
(merged from trunk r1327701)
Added:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml
(with props)
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml
(with props)
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml
(with props)
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml
(with props)
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy
(with props)
Added:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml?rev=1327704&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml
(added)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml
Wed Apr 18 22:12:21 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>MSITE-582-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>MSITE-582 IT child</name>
+</project>
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml?rev=1327704&view=auto
==============================================================================
---
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml
(added)
+++
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml
Wed Apr 18 22:12:21 2012
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+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";>
+ <body>
+ <breadcrumbs>
+ <item name="C" href="A/B/C"/>
+ <item name="M" href="A/B/C/M"/>
+ <item name="N" href="A/B/C/M/N"/>
+ <item name="O" href="A/B/C/M/N/O"/>
+ </breadcrumbs>
+ </body>
+</project>
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/child/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml?rev=1327704&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml
(added)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml Wed
Apr 18 22:12:21 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.site.its</groupId>
+ <artifactId>MSITE-582-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>MSITE-582 IT parent</name>
+ <description>Make it possible to remove breadcrumbs in child projects
again</description>
+ <url>http://www.example.com/parent/</url>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.2</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml?rev=1327704&view=auto
==============================================================================
---
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml
(added)
+++
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml
Wed Apr 18 22:12:21 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+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";>
+ <body>
+ <breadcrumbs>
+ <item name="A" href="A"/>
+ <item name="B" href="A/B"/>
+ <item name="C" href="A/B/C"/>
+ <item name="D" href="A/B/C/D"/>
+ <item name="E" href="A/B/C/D/E"/>
+ <item name="F" href="A/B/C/D/E/F"/>
+ </breadcrumbs>
+ </body>
+</project>
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy?rev=1327704&view=auto
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy
(added)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy
Wed Apr 18 22:12:21 2012
@@ -0,0 +1,26 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+content = new File( basedir, 'child/target/site/index.html' ).text;
+
+assert !content.contains( '<a href="A/B/C/D" title="D">D</a>' );
+assert content.contains( '<a href="A/B/C/M" title="M">M</a>' );
+
+return true;
\ No newline at end of file
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/maven-site-plugin-2.x/src/it/MSITE-582/verify.groovy
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
