Author: aheritier
Date: Sun Feb 5 16:13:10 2006
New Revision: 375139
URL: http://svn.apache.org/viewcvs?rev=375139&view=rev
Log:
New subproject to store the main site for plugins.
It's needed to avoid conflicts between settings for the site and settings for
multiproject goals (to test plugins for example).
Added:
maven/maven-1/plugins-sandbox/trunk/plugins-site/
maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml (with props)
maven/maven-1/plugins-sandbox/trunk/plugins-site/project.properties (with
props)
maven/maven-1/plugins-sandbox/trunk/plugins-site/project.xml (with props)
maven/maven-1/plugins-sandbox/trunk/plugins-site/xdocs/
- copied from r375129, maven/maven-1/plugins-sandbox/trunk/xdocs/
Removed:
maven/maven-1/plugins-sandbox/trunk/xdocs/
Modified:
maven/maven-1/plugins-sandbox/trunk/maven.xml
maven/maven-1/plugins-sandbox/trunk/project.properties
maven/maven-1/plugins-sandbox/trunk/project.xml
Modified: maven/maven-1/plugins-sandbox/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/maven.xml?rev=375139&r1=375138&r2=375139&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/maven.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/maven.xml Sun Feb 5 16:13:10 2006
@@ -15,37 +15,20 @@
* limitations under the License.
*/
-->
-<project xmlns:ant="jelly:ant" xmlns:i="jelly:interaction"
xmlns:j="jelly:core" xmlns:maven="jelly:maven">
+<project xmlns:maven="jelly:maven">
<goal name="plugins:install-all" description="Install all plugins">
- <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}" goals="clean,plugin:install"
banner="Install" ignoreFailures="false"/>
+ <maven:reactor basedir="${basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}" goals="clean,plugin:install"
banner="Install" ignoreFailures="false"/>
</goal>
<goal name="plugins:repository-deploy-all" description="Deploy all plugins
in a remote repository">
- <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}"
goals="clean,plugin:repository-deploy" banner="Deploy" ignoreFailures="false"/>
+ <maven:reactor basedir="${basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}"
goals="clean,plugin:repository-deploy" banner="Deploy" ignoreFailures="false"/>
</goal>
<goal name="plugins:test-all" description="Test all plugins">
- <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}" goals="plugin:test" banner="Test"
ignoreFailures="false"/>
+ <maven:reactor basedir="${basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}" goals="plugin:test" banner="Test"
ignoreFailures="false"/>
</goal>
<goal name="plugins:site" description="Create the web site root for all
plugins">
- <attainGoal name="multiproject:site"/>
+ <maven:maven descriptor="${basedir}/plugins-site/project.xml"
goals="plugins:site" ignoreFailures="false"/>/>
</goal>
<goal name="plugins:deploy-all-sites" description="Create and deploy the web
site for all plugins">
- <!-- We don't want to have the question about to deploy the root site
after each plugin -->
- <j:set var="skipQuestion" value="true" scope="parent"/>
- <j:set var="goal" value="site:deploy"/>
- <attainGoal name="multiproject:goal"/>
- <attainGoal name="multiproject:site"/>
- <attainGoal name="site:deploy"/>
+ <maven:maven descriptor="${basedir}/plugins-site/project.xml"
goals="plugins:deploy-all-sites" ignoreFailures="false"/>/>
</goal>
- <goal name="confirm-and-deploy-site">
- <j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
- <i:ask question="Would you like to regenerate and deploy the main
plugins site (y/n)?" answer="ok" default="y"/>
- <j:if test="${ok == 'y'}">
- <attainGoal name="multiproject:site"/>
- <attainGoal name="site:sshdeploy"/>
- </j:if>
- </j:if>
- </goal>
- <postGoal name="site">
- <ant:move file="${maven.docs.dest}/projects-overview.html"
tofile="${maven.docs.dest}/index.html"/>
- </postGoal>
</project>
Added: maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml?rev=375139&view=auto
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml (added)
+++ maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml Sun Feb 5
16:13:10 2006
@@ -0,0 +1,42 @@
+<!--
+/*
+ * Copyright 2001-2006 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:ant="jelly:ant" xmlns:i="jelly:interaction"
xmlns:j="jelly:core" xmlns:maven="jelly:maven">
+ <goal name="plugins:site" description="Create the web site root for all
plugins">
+ <attainGoal name="multiproject:site"/>
+ </goal>
+ <goal name="plugins:deploy-all-sites" description="Create and deploy the web
site for all plugins">
+ <!-- We don't want to have the question about to deploy the root site
after each plugin -->
+ <j:set var="skipQuestion" value="true" scope="parent"/>
+ <j:set var="goal" value="site:deploy"/>
+ <attainGoal name="multiproject:goal"/>
+ <attainGoal name="multiproject:site"/>
+ <attainGoal name="site:deploy"/>
+ </goal>
+ <goal name="confirm-and-deploy-site">
+ <j:if test="${(skipQuestion == null) or not (skipQuestion == 'true')}">
+ <i:ask question="Would you like to regenerate and deploy the main
plugins site (y/n)?" answer="ok" default="y"/>
+ <j:if test="${ok == 'y'}">
+ <attainGoal name="multiproject:site"/>
+ <attainGoal name="site:sshdeploy"/>
+ </j:if>
+ </j:if>
+ </goal>
+ <postGoal name="site">
+ <ant:move file="${maven.docs.dest}/projects-overview.html"
tofile="${maven.docs.dest}/index.html"/>
+ </postGoal>
+</project>
Propchange: maven/maven-1/plugins-sandbox/trunk/plugins-site/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/maven-1/plugins-sandbox/trunk/plugins-site/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugins-site/project.properties?rev=375139&view=auto
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugins-site/project.properties (added)
+++ maven/maven-1/plugins-sandbox/trunk/plugins-site/project.properties Sun Feb
5 16:13:10 2006
@@ -0,0 +1,86 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2006 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.
+# -------------------------------------------------------------------
+
+#====================================================================
+# WARNING: All these properties are for the master site only and
+# should *not* be inherited by the plugin projects. Plugin projects
+# must now inherit from /plugin-parent/project.xml.
+#====================================================================
+
+#=====
+# Changelog plugin properties
+#=====
+maven.changelog.svn.baseurl=http://svn.apache.org/viewcvs.cgi
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+
+#=====
+# Changes plugin settings
+#=====
+# Changes issue template
+maven.changes.issue.template = %URL%/%ISSUE%
+
+#=====
+# Checkstyle plugin settings
+#=====
+maven.checkstyle.header.file =
${basedir}/../plugin-parent/checkstyle-license.txt
+maven.checkstyle.properties = ${basedir}/../plugin-parent/checkstyle.xml
+
+#=====
+# Clover plugin settings
+#=====
+# Make sure we generate a Clover XML report so that the dashboard
+# Clover aggregator can extract Clover data
+maven.clover.report.xml=true
+
+#=====
+# Dashboard plugin properties
+#=====
+# Choose aggregators to use for the dashboard plugin report
+maven.dashboard.aggregators =
csall,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,simiantdl,tasklist,jiraopen,jirascheduled
+
+#=====
+# License plugin settings
+#=====
+maven.license.licenseFile=${basedir}/../plugin-parent/LICENSE.txt
+
+#=====
+# LinkCheck plugin settings
+#=====
+maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl}
+
+#=====
+# Multiproject plugin settings
+#=====
+maven.multiproject.navigation=independent
+maven.multiproject.overviewPage.title=Maven Plugins in the Sandbox
+maven.multiproject.overviewPage.text=The following Maven plugins are available
in the sandbox, some of them because they are still in early development and
others because they are no longer mantained:
+maven.multiproject.includes=../*/project.xml
+maven.multiproject.excludes=plugin-parent/project.xml
+
+#=====
+# Site plugin settings
+#=====
+maven.site.stage.address=people.apache.org
+maven.site.stage.directory=/home/brett/public_html/maven-stage-site/${pom.siteDirectory.substring(22)}
+maven.site.deploy.method=rsync
+
+#=====
+# XDOC plugin settings
+#=====
+maven.xdoc.date = left
+maven.xdoc.date.format = dd MMMM yyyy HH:mm z
+maven.xdoc.version =
+maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css
Propchange: maven/maven-1/plugins-sandbox/trunk/plugins-site/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/maven-1/plugins-sandbox/trunk/plugins-site/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/plugins-site/project.xml?rev=375139&view=auto
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/plugins-site/project.xml (added)
+++ maven/maven-1/plugins-sandbox/trunk/plugins-site/project.xml Sun Feb 5
16:13:10 2006
@@ -0,0 +1,102 @@
+<?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/3.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
http://maven.apache.org/maven-v3_0_0.xsd";>
+ <pomVersion>3</pomVersion>
+ <id>plugins-sandbox-site-master</id>
+ <name>Maven Plugins Sandbox</name>
+ <groupId>maven</groupId>
+ <currentVersion>1.0</currentVersion>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ <logo>http://maven.apache.org/images/apache-maven-project-2.png</logo>
+ </organization>
+ <inceptionYear>2001</inceptionYear>
+ <package>org.apache.maven</package>
+ <logo>http://maven.apache.org/images/maven-logo-2.gif</logo>
+ <url>http://maven.apache.org/maven-1.x/reference/plugins-sandbox/</url>
+
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10030</issueTrackingUrl>
+ <siteAddress>people.apache.org</siteAddress>
+
<siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins-sandbox/</siteDirectory>
+ <distributionSite>people.apache.org</distributionSite>
+
<distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
+ <mailingLists>
+ <mailingList>
+ <name>Maven User List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://www.mail-archive.com/users%40maven.apache.org/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Maven Developer List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <archive>http://www.mail-archive.com/dev%40maven.apache.org/</archive>
+ </mailingList>
+ </mailingLists>
+ <repository>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/</developerConnection>
+
<url>http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/</url>
+ </repository>
+ <developers>
+ <developer>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Zenplex</organization>
+ <roles>
+ <role>Architect</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>f2 network</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+10</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-interaction</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <defaultGoal>plugins:site</defaultGoal>
+ </build>
+ <reports>
+ <report>maven-changelog-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-dashboard-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-faq-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-linkcheck-plugin</report>
+ <report>maven-multichanges-plugin</report>
+ <report>maven-multiproject-plugin</report>
+ </reports>
+</project>
Propchange: maven/maven-1/plugins-sandbox/trunk/plugins-site/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/maven-1/plugins-sandbox/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/project.properties?rev=375139&r1=375138&r2=375139&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/project.properties (original)
+++ maven/maven-1/plugins-sandbox/trunk/project.properties Sun Feb 5 16:13:10
2006
@@ -21,70 +21,7 @@
#====================================================================
#=====
-# Changelog plugin properties
-#=====
-maven.changelog.svn.baseurl=http://svn.apache.org/viewcvs.cgi
-maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-
-#=====
-# Changes plugin settings
-#=====
-# Changes issue template
-maven.changes.issue.template = %URL%/%ISSUE%
-
-#=====
-# Checkstyle plugin settings
-#=====
-maven.checkstyle.header.file = ${basedir}/plugin-parent/checkstyle-license.txt
-maven.checkstyle.properties = ${basedir}/plugin-parent/checkstyle.xml
-
-#=====
-# Clover plugin settings
-#=====
-# Make sure we generate a Clover XML report so that the dashboard
-# Clover aggregator can extract Clover data
-maven.clover.report.xml=true
-
-#=====
-# Dashboard plugin properties
-#=====
-# Choose aggregators to use for the dashboard plugin report
-maven.dashboard.aggregators =
csall,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,simiantdl,tasklist,jiraopen,jirascheduled
-
-#=====
-# License plugin settings
-#=====
-maven.license.licenseFile=${basedir}/plugin-parent/LICENSE.txt
-
-#=====
-# LinkCheck plugin settings
-#=====
-maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl}
-
-#=====
-# Multichanges plugin settings
-#=====
-maven.multichanges.excludes=${maven.multiproject.excludes}
-
-#=====
# Multiproject plugin settings
#=====
-maven.multiproject.navigation=independent
-maven.multiproject.overviewPage.title=Maven Plugins in the Sandbox
-maven.multiproject.overviewPage.text=The following Maven plugins are available
in the sandbox, some of them because they are still in early development and
others because they are no longer mantained:
-maven.multiproject.excludes=plugin-parent/project.xml
-
-#=====
-# Site plugin settings
-#=====
-maven.site.stage.address=people.apache.org
-maven.site.stage.directory=/home/brett/public_html/maven-stage-site/${pom.siteDirectory.substring(22)}
-maven.site.deploy.method=rsync
-
-#=====
-# XDOC plugin settings
-#=====
-maven.xdoc.date = left
-maven.xdoc.date.format = dd MMMM yyyy HH:mm z
-maven.xdoc.version =
-maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css
+maven.multiproject.includes=*/project.xml
+maven.multiproject.excludes=plugin-parent/project.xml,plugins-site/project.xml
Modified: maven/maven-1/plugins-sandbox/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/project.xml?rev=375139&r1=375138&r2=375139&view=diff
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/project.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/project.xml Sun Feb 5 16:13:10 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -18,7 +18,7 @@
-->
<project xmlns="http://maven.apache.org/POM/3.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
http://maven.apache.org/maven-v3_0_0.xsd";>
<pomVersion>3</pomVersion>
- <id>plugin-sandbox-root</id>
+ <id>plugins-sandbox-root</id>
<name>Maven Plugins Sandbox</name>
<groupId>maven</groupId>
<currentVersion>1.0</currentVersion>
@@ -28,75 +28,7 @@
<logo>http://maven.apache.org/images/apache-maven-project-2.png</logo>
</organization>
<inceptionYear>2001</inceptionYear>
- <package>org.apache.maven</package>
- <logo>http://maven.apache.org/images/maven-logo-2.gif</logo>
- <url>http://maven.apache.org/maven-1.x/reference/plugins-sandbox/</url>
-
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10030</issueTrackingUrl>
- <siteAddress>people.apache.org</siteAddress>
-
<siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins-sandbox/</siteDirectory>
- <distributionSite>people.apache.org</distributionSite>
-
<distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
- <mailingLists>
- <mailingList>
- <name>Maven User List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://www.mail-archive.com/users%40maven.apache.org/</archive>
- </mailingList>
- <mailingList>
- <name>Maven Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <archive>http://www.mail-archive.com/dev%40maven.apache.org/</archive>
- </mailingList>
- </mailingLists>
- <repository>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins-sandbox/trunk/</developerConnection>
-
<url>http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/</url>
- </repository>
- <developers>
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Zenplex</organization>
- <roles>
- <role>Architect</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- <developer>
- <name>Brett Porter</name>
- <id>brett</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>f2 network</organization>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+10</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-interaction</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
<build>
- <defaultGoal>plugins:site</defaultGoal>
+ <defaultGoal>plugins:install-all</defaultGoal>
</build>
- <reports>
- <report>maven-changelog-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-dashboard-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-faq-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-jdepend-plugin</report>
- <report>maven-linkcheck-plugin</report>
- <report>maven-multichanges-plugin</report>
- <report>maven-multiproject-plugin</report>
- </reports>
</project>
