brett 2004/12/14 01:55:13
Modified: . checkstyle-license.txt checkstyle.xml maven.xml
project.properties project.xml
surefire project.xml
Added: plugin-parent .cvsignore README.txt maven.xml
project.properties project.xml
Log:
setup sandbox, needs checking with site
Revision Changes Path
1.3 +3 -3 maven-plugins-sandbox/checkstyle-license.txt
Index: checkstyle-license.txt
===================================================================
RCS file: /home/cvs/maven-plugins-sandbox/checkstyle-license.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checkstyle-license.txt 30 Apr 2004 19:05:12 -0000 1.2
+++ checkstyle-license.txt 14 Dec 2004 09:55:12 -0000 1.3
@@ -1,7 +1,7 @@
-
+[This line is ignored by checkstyle. Put the package declaration here]
/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright [year. ex: 2001-2004] 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.
@@ -15,4 +15,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
- */
\ No newline at end of file
+ */
1.2 +1 -1 maven-plugins-sandbox/checkstyle.xml
Index: checkstyle.xml
===================================================================
RCS file: /home/cvs/maven-plugins-sandbox/checkstyle.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkstyle.xml 30 Apr 2004 17:24:23 -0000 1.1
+++ checkstyle.xml 14 Dec 2004 09:55:12 -0000 1.2
@@ -48,7 +48,7 @@
<!-- **************************************************************
-->
<module name="Header">
<property name="headerFile"
value="${maven.checkstyle.header.file}"/>
- <property name="ignoreLines" value="1,2,3,4,5,6"/>
+ <property name="ignoreLines" value="1, 4"/>
</module>
<property name="tabWidth" value="4"/>
<module name="LeftCurly">
1.2 +8 -2 maven-plugins-sandbox/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins-sandbox/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 30 Apr 2004 17:24:23 -0000 1.1
+++ maven.xml 14 Dec 2004 09:55:12 -0000 1.2
@@ -1,6 +1,6 @@
<!--
/*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2001-2004 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.
@@ -15,5 +15,11 @@
* limitations under the License.
*/
-->
-<project>
+<project xmlns:j="jelly:core">
+
+ <goal name="plugins:test-all">
+ <j:set var="goal" value="plugin:test"/>
+ <j:set var="maven.multiproject.excludes" value="plugin-parent/**" />
+ <attainGoal name="multiproject:goal"/>
+ </goal>
</project>
1.2 +14 -13 maven-plugins-sandbox/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins-sandbox/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 30 Apr 2004 17:24:23 -0000 1.1
+++ project.properties 14 Dec 2004 09:55:12 -0000 1.2
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# Copyright 2004 The Apache Software Foundation.
+# Copyright 2001-2004 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.
@@ -14,9 +14,11 @@
# limitations under the License.
# -------------------------------------------------------------------
-# Display the date on the Maven web site
-maven.xdoc.date = left
-maven.xdoc.date.format = dd MMMM yyyy HH:mm z
+#====================================================================
+# WARNING: All these properties are for the master build only and
+# should *not* be inherited by the plugin projects. Plugin projects
+# must now inherit from /plugin-parent/project.xml.
+#====================================================================
# Enable HTML to xdoc transformation
maven.html2xdoc.enabled=true
@@ -28,13 +30,12 @@
# Clover aggregator can extract Clover data
maven.clover.report.xml=true
-# Checkstyle
-maven.checkstyle.header.file = ${basedir}/../checkstyle-license.txt
-
-#------------------------------------------------------------------
-# M U L T I P R O J E C T - A L L P L U G I N G S
-#------------------------------------------------------------------
+# Multiproject plugin settings
maven.multiproject.navigation=independent
-maven.multiproject.overviewPage.title=Maven Optional Sandbox Plugins
-maven.multiproject.overviewPage.link=sandbox
-maven.multiproject.overviewPage.text=The following plugins are optional
+maven.multiproject.overviewPage.title=Maven Plugins Sandbox
+maven.multiproject.overviewPage.link=plugins-sandbox
+maven.multiproject.overviewPage.text=The following Maven plugins are
available:
+maven.multiproject.excludes=plugin-parent/project.xml
+
+maven.xdoc.date = left
+maven.xdoc.date.format = dd MMMM yyyy HH:mm z
1.2 +23 -14 maven-plugins-sandbox/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins-sandbox/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 30 Apr 2004 17:24:23 -0000 1.1
+++ project.xml 14 Dec 2004 09:55:12 -0000 1.2
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
<!--
/*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2001-2004 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.
@@ -21,23 +20,23 @@
<project>
<pomVersion>3</pomVersion>
- <id>plugin-parent</id>
- <name>Optional Sandbox Maven Plugins</name>
+ <id>plugin-sandbox-root</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.png</logo>
</organization>
- <inceptionYear>2004</inceptionYear>
+ <inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
<logo>http://maven.apache.org/images/maven.gif</logo>
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10030</issueTrackingUrl>
<siteAddress>maven.apache.org</siteAddress>
-
<siteDirectory>/www/maven.apache.org/reference/plugins/sandbox/</siteDirectory>
-
<distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
<siteDirectory>/www/maven.apache.org/reference/plugins-sandbox/</siteDirectory>
+ <distributionSite>cvs.apache.org</distributionSite>
+
<distributionDirectory>/www/cvs.apache.org/repository/</distributionDirectory>
<mailingLists>
<mailingList>
@@ -61,14 +60,24 @@
<developers>
<developer>
- <name>Vincent Massol</name>
- <id>vmassol</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Pivolis</organization>
+ <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>Java Developer</role>
+ <role>Developer</role>
</roles>
- <timezone>+1</timezone>
+ <timezone>+10</timezone>
</developer>
</developers>
1.1 maven-plugins-sandbox/plugin-parent/.cvsignore
Index: .cvsignore
===================================================================
target
1.1 maven-plugins-sandbox/plugin-parent/README.txt
Index: README.txt
===================================================================
This directory contains Maven build configuration inherited by all
sandbox plugin projects.
The top level project is reserved for the master build and plugins
should no longer inherit from it as it contains configurations that
make sense only for the master build.
1.1 maven-plugins-sandbox/plugin-parent/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 2001-2004 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:j="jelly:core"
xmlns:maven="jelly:maven">
<!-- XXX: must be a nicer way - maybe SCM can read the POM and recursively
checkout parent directories
project.xml, maven.xml, project.properties, but tag will not be set -->
<!-- perhaps copy extended project.xml into current directory, merge higher
extends, commit & tag, replace extends
in main POM? -->
<postGoal name="scm:cvs-checkout-project">
<maven:pluginVar plugin="maven-scm-plugin"
property="maven.scm.checkout.dir" var="dir" />
<ant:mkdir dir="${dir}/maven-plugins/plugin-parent" />
<ant:copy todir="${dir}/maven-plugins/plugin-parent">
<ant:fileset dir="${pom.parent.file.parent}" />
</ant:copy>
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../LICENSE.txt" />
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../NOTICE.txt" />
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../checkstyle.xml" />
<ant:copy todir="${dir}/maven-plugins"
file="${pom.parent.file.parent}/../checkstyle-license.txt" />
<j:set var="executionDir" value="${basedir}" scope="parent" />
</postGoal>
</project>
1.1 maven-plugins-sandbox/plugin-parent/project.properties
Index: project.properties
===================================================================
# -------------------------------------------------------------------
# Copyright 2001-2004 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 inherited by the plugin projects
#====================================================================
# Display the date on the Maven web site
maven.xdoc.date = left
maven.xdoc.date.format = dd MMMM yyyy HH:mm z
# Checkstyle plugin settings
maven.checkstyle.header.file = ${basedir}/../checkstyle-license.txt
maven.checkstyle.properties = ${basedir}/../checkstyle.xml
# License plugin settings
maven.license.licenseFile=${basedir}/../LICENSE.txt
# Force artifact deployment. You must setup your environment appropriately
maven.artifact.legacy=false
# Changes issue template
maven.changes.issue.template = %URL%/%ISSUE%
# Repository to deploy to
maven.repo.list=apache
# Repository to deploy snapshots
maven.repo.apachecvs=scp://cvs.apache.org
maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
maven.repo.apachecvs.username=${maven.repo.apache.username}
maven.repo.apachecvs.privatekey=${maven.repo.apache.privatekey}
maven.repo.apachecvs.passphrase=${maven.repo.apache.passphrase}
maven.repo.apachecvs.group=maven
maven.multiproject.type=plugin
# We are targetting the 1.3 JVM and above
maven.compile.target=1.3
maven.compile.source=1.3
1.1 maven-plugins-sandbox/plugin-parent/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
* Copyright 2001-2004 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>
<pomVersion>3</pomVersion>
<artifactId>plugin-sandbox-parent</artifactId>
<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.png</logo>
</organization>
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
<logo>http://maven.apache.org/images/maven.gif</logo>
<issueTrackingUrl>http://jira.codehaus.org/browse/MAVEN</issueTrackingUrl>
<siteAddress>maven.apache.org</siteAddress>
<siteDirectory>/www/maven.apache.org/reference/plugins-sandbox/</siteDirectory>
<distributionSite>cvs.apache.org</distributionSite>
<distributionDirectory>/www/cvs.apache.org/repository/</distributionDirectory>
<mailingLists>
<mailingList>
<name>Maven User List</name>
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>[EMAIL PROTECTED]</unsubscribe>
<archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
</mailingList>
<mailingList>
<name>Maven Developer List</name>
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>[EMAIL PROTECTED]</unsubscribe>
<archive>http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]</archive>
</mailingList>
</mailingLists>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-plugins-sandbox/</connection>
<url>http://cvs.apache.org/viewcvs/maven-plugins-sandbox/</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>
<build>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
</unitTest>
<resources>
<resource>
<directory>..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
</includes>
</resource>
<resource>
<directory>src/plugin-resources</directory>
<targetPath>plugin-resources</targetPath>
</resource>
<resource>
<directory>.</directory>
<includes>
<include>plugin.jelly</include>
<include>plugin.properties</include>
<include>project.properties</include>
<include>project.xml</include>
</includes>
</resource>
</resources>
</build>
<reports>
<report>maven-changes-plugin</report>
<report>maven-changelog-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-developer-activity-plugin</report>
<report>maven-tasklist-plugin</report>
<report>maven-linkcheck-plugin</report>
<report>maven-javadoc-plugin</report>
<report>maven-jxr-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-checkstyle-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
<report>maven-faq-plugin</report>
</reports>
</project>
1.2 +1 -1 maven-plugins-sandbox/surefire/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins-sandbox/surefire/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 3 May 2004 13:57:44 -0000 1.1
+++ project.xml 14 Dec 2004 09:55:13 -0000 1.2
@@ -19,7 +19,7 @@
-->
<project>
- <extend>../project.xml</extend>
+ <extend>../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
<id>maven-surefire-plugin</id>
<name>Maven surefire plugin</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
