You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2006/11/11 01:41:52 UTC
svn commit: r473599 - in /maven/plugins/trunk/maven-site-plugin/src:
main/java/org/apache/maven/plugins/site/ test/projects/site-plugin-test11/
test/projects/site-plugin-test11/framework/
test/projects/site-plugin-test11/framework/source/ test/projects...
Author: dennisl
Date: Fri Nov 10 16:41:49 2006
New Revision: 473599
URL: http://svn.apache.org/viewvc?view=rev&rev=473599
Log:
[MSITE-91] "src/site/site.xml" hardcoded in AbstractSiteMojo.java.
o By using getRelativePath(...) the relativity between parent and child can be maintained.
Added:
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/ (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/ (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/ (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/App.java (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/test.apt (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/App.java (with props)
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?view=diff&rev=473599&r1=473598&r2=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java Fri Nov 10 16:41:49 2006
@@ -246,13 +246,13 @@
*/
protected File getSiteDescriptorFile( File basedir, Locale locale )
{
- // TODO: get proper siteDirectory from site configuration of the project this relates to
+ String relativePath = getRelativePath( siteDirectory.getAbsolutePath(), basedir.getAbsolutePath() );
- File siteDescriptor = new File( basedir, "src/site/site_" + locale.getLanguage() + ".xml" );
+ File siteDescriptor = new File( relativePath, "site_" + locale.getLanguage() + ".xml" );
if ( !siteDescriptor.exists() )
{
- siteDescriptor = new File( basedir, "src/site/site.xml" );
+ siteDescriptor = new File( relativePath, "site.xml" );
}
return siteDescriptor;
}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 10 16:41:49 2006
@@ -0,0 +1 @@
+target
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 10 16:41:49 2006
@@ -0,0 +1 @@
+target
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml Fri Nov 10 16:41:49 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.site.test11</groupId>
+ <artifactId>site-plugin-test11</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.maven.plugin.site.test11</groupId>
+ <artifactId>framework</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <inceptionYear>2005</inceptionYear>
+ <name>Framework module for the Maven Site Plugin Test11</name>
+ <description>Framework module to test the Site descriptor and site source in non-standard location</description>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>vsiveton@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt Fri Nov 10 16:41:49 2006
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 29 July 2005
+ ------
+
+
+Site Plugin Site descriptor and site source in non-standard location. (framework module)
+
+ Test
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt Fri Nov 10 16:41:49 2006
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+ Test
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml Fri Nov 10 16:41:49 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 name="Maven Site">
+ <bannerLeft>
+ <name>Maven Site</name>
+ <src>http://maven.apache.org/images/apache-maven-project.png</src>
+ <href>http://maven.apache.org/</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>http://maven.apache.org/images/maven-small.gif</src>
+ </bannerRight>
+ <body>
+ <links>
+ <item name="framework" href="."/>
+ </links>
+
+ <menu name="Framework">
+ <item name="Test1" href="/test1.html"/>
+ </menu>
+
+ ${parentProject}
+ ${modules}
+ ${reports}
+ </body>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java Fri Nov 10 16:41:49 2006
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test11;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java Fri Nov 10 16:41:49 2006
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test11;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 10 16:41:49 2006
@@ -0,0 +1 @@
+target
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml Fri Nov 10 16:41:49 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.site.test11</groupId>
+ <artifactId>site-plugin-test11</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.maven.plugin.site.test11</groupId>
+ <artifactId>framework2</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <inceptionYear>2005</inceptionYear>
+ <name>Framework2 module for the Maven Site Plugin Test11</name>
+ <description>Framework2 module to test the Site descriptor and site source in non-standard location</description>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>vsiveton@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt Fri Nov 10 16:41:49 2006
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 29 July 2005
+ ------
+
+
+Site Plugin Site descriptor and site source in non-standard location. (framework2 module)
+
+ Test
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt Fri Nov 10 16:41:49 2006
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+ Test
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml Fri Nov 10 16:41:49 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 name="Maven Site">
+ <bannerLeft>
+ <name>Maven Site</name>
+ <src>http://maven.apache.org/images/apache-maven-project.png</src>
+ <href>http://maven.apache.org/</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>http://maven.apache.org/images/maven-small.gif</src>
+ </bannerRight>
+ <body>
+ <links>
+ <item name="framework2" href="."/>
+ </links>
+
+ <menu name="Framework2">
+ <item name="Test2" href="/test2.html"/>
+ </menu>
+
+ ${parentProject}
+ ${modules}
+ ${reports}
+ </body>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/App.java?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/App.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/App.java Fri Nov 10 16:41:49 2006
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test11;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/org/apache/maven/plugin/site/test11/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java Fri Nov 10 16:41:49 2006
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test11;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml Fri Nov 10 16:41:49 2006
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.site.test11</groupId>
+ <artifactId>site-plugin-test11</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <inceptionYear>2005</inceptionYear>
+ <name>Maven Site Plugin Test11</name>
+ <description>Site descriptor and site source in non-standard location.</description>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>vsiveton@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <siteDirectory>${basedir}/source/mysite</siteDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>framework</module>
+ <module>framework2</module>
+ </modules>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/test.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/test.apt?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/test.apt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/test.apt Fri Nov 10 16:41:49 2006
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+ Test
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/apt/test.apt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml Fri Nov 10 16:41:49 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 name="Maven Site">
+ <bannerLeft>
+ <name>Maven Site</name>
+ <src>http://maven.apache.org/images/apache-maven-project.png</src>
+ <href>http://maven.apache.org/</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>http://maven.apache.org/images/maven-small.gif</src>
+ </bannerRight>
+ <body>
+ <links>
+ <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+ </links>
+
+ <menu name="Overview">
+ <item name="Test" href="/test.html"/>
+ </menu>
+
+ ${parentProject}
+ ${modules}
+ ${reports}
+ </body>
+</project>
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/App.java?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/App.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/App.java Fri Nov 10 16:41:49 2006
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test11;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/main/java/org/apache/maven/plugin/site/test11/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java?view=auto&rev=473599
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (added)
+++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java Fri Nov 10 16:41:49 2006
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test11;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native