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 2008/05/16 21:59:52 UTC
svn commit: r657190 - in /maven/enforcer/trunk:
enforcer-api/src/site/site.xml enforcer-rules/src/site/site.xml
maven-enforcer-plugin/pom.xml maven-enforcer-plugin/src/site/site.xml
pom.xml src/site/site.xml
Author: dennisl
Date: Fri May 16 12:59:52 2008
New Revision: 657190
URL: http://svn.apache.org/viewvc?rev=657190&view=rev
Log:
o Use site.xml inheritance.
o Connect the different sites.
o Set proper license headers.
Modified:
maven/enforcer/trunk/enforcer-api/src/site/site.xml
maven/enforcer/trunk/enforcer-rules/src/site/site.xml
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml
maven/enforcer/trunk/pom.xml
maven/enforcer/trunk/src/site/site.xml
Modified: maven/enforcer/trunk/enforcer-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/site.xml?rev=657190&r1=657189&r2=657190&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/site/site.xml (original)
+++ maven/enforcer/trunk/enforcer-api/src/site/site.xml Fri May 16 12:59:52 2008
@@ -1,63 +1,30 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- ~ Copyright 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.
- -->
+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
-<project name="Enforcer Rule API">
- <!-- TODO: banners, skin, publish date, version should be inherited from Maven itself -->
- <bannerLeft>
- <name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
- <href>http://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maven-logo-2.gif</src>
- </bannerRight>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- </skin>
- <publishDate format="dd MMM yyyy" position="left" />
- <version position="left" />
+ 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>
<body>
- <!-- TODO: Link, head, reports should be inherited -->
- <!-- TODO: use breadcrumbs more structure, links for links, and inherit subprojects as a menu or not at all -->
- <links>
- <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
- <item name="Maven 2.x" href="http://maven.apache.org/"/>
- <item name="Maven 2.x Plugins" href="http://maven.apache.org/plugins/"/>
- <item name="SCM" href="http://maven.apache.org/scm"/>
- <item name="Wagon" href="http://maven.apache.org/wagon"/>
- <item name="JXR" href="http://maven.apache.org/jxr"/>
- <item name="Doxia" href="http://maven.apache.org/doxia"/>
- </links>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Writing a custom rule" href="writing-a-custom-rule.html"/>
</menu>
- <menu name="Rule Execution Engines">
- <item name="Maven Enforcer Plugin" href="http://maven.apache.org/plugins/maven-enforcer-plugin"/>
- </menu>
- <menu ref="reports" inherit="bottom" />
+ <menu name="Rule Execution Engines">
+ <item name="Maven Enforcer Plugin" href="http://maven.apache.org/plugins/maven-enforcer-plugin"/>
+ </menu>
</body>
</project>
\ No newline at end of file
Modified: maven/enforcer/trunk/enforcer-rules/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/site.xml?rev=657190&r1=657189&r2=657190&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/site/site.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/site.xml Fri May 16 12:59:52 2008
@@ -1,30 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- ~ Copyright 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.
- -->
+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>
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Standard Rules" href="rules/index.html"/>
<item name="Rule API" href="http://maven.apache.org/enforcer/enforcer-api/"/>
- <item name="Enforcer Plugin" href="http://maven.apache.org/plugins/maven-enforcer-plugin/"/>
+ <item name="Maven Enforcer Plugin" href="http://maven.apache.org/plugins/maven-enforcer-plugin/"/>
</menu>
<menu name="Custom Rules">
- <item name="Writing a custom rule" href="http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html"/>
+ <item name="Writing a custom rule" href="http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html"/>
</menu>
</body>
</project>
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=657190&r1=657189&r2=657190&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Fri May 16 12:59:52 2008
@@ -32,6 +32,7 @@
<name>Maven Enforcer Plugin</name>
<description>The Loving Iron Fist of Maven</description>
<version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org/plugins/maven-enforcer-plugin/</url>
<issueManagement>
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MENFORCER</url>
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml?rev=657190&r1=657189&r2=657190&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml Fri May 16 12:59:52 2008
@@ -1,60 +1,24 @@
<?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.
- *
--->
+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>
- <bannerLeft>
- <name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
- <href>http://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maven-logo-2.gif</src>
- </bannerRight>
- <publishDate format="dd MMM yyyy" position="left" />
- <version position="left" />
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- </skin>
<body>
- <!-- TODO: Link, head, reports should be inherited -->
- <!-- TODO: use breadcrumbs more structure, links for links, and inherit subprojects as a menu or not at all -->
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
- <item name="Maven 2.x" href="http://maven.apache.org/"/>
- <item name="Maven 2.x Plugins" href="http://maven.apache.org/plugins/"/>
- <item name="SCM" href="http://maven.apache.org/scm"/>
- <item name="Wagon" href="http://maven.apache.org/wagon"/>
- <item name="JXR" href="http://maven.apache.org/jxr"/>
- <item name="Doxia" href="http://maven.apache.org/doxia"/>
- </links>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Goals" href="plugin-info.html"/>
@@ -63,7 +27,7 @@
<item name="Standard Rules" href="rules/index.html"/>
</menu>
<menu name="Custom Rules">
- <item name="Writing a custom rule" href="http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html"/>
+ <item name="Writing a custom rule" href="http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html"/>
</menu>
<menu name="Resources">
<item name="Maven 2.0.x Version Range Syntax" href="http://docs.codehaus.org/display/MAVEN/Dependency+Mediation+and+Conflict+Resolution#DependencyMediationandConflictResolution-DependencyVersionRanges" />
Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=657190&r1=657189&r2=657190&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Fri May 16 12:59:52 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
<packaging>pom</packaging>
- <name>Enforcer Parent</name>
+ <name>Enforcer</name>
<version>1-SNAPSHOT</version>
<description>Enforcer is a build rule execution framework.</description>
<url>http://maven.apache.org/enforcer</url>
Modified: maven/enforcer/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/src/site/site.xml?rev=657190&r1=657189&r2=657190&view=diff
==============================================================================
--- maven/enforcer/trunk/src/site/site.xml (original)
+++ maven/enforcer/trunk/src/site/site.xml Fri May 16 12:59:52 2008
@@ -1,23 +1,27 @@
-<project name="${project.name}">
- <!-- TODO: banners, skin, publish date, version should be inherited from Maven itself -->
- <bannerLeft>
- <name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
- <href>http://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maven-logo-2.gif</src>
- </bannerRight>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- </skin>
- <publishDate format="dd MMM yyyy" position="left" />
- <version position="left" />
+<?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>
<body>
- <!-- TODO: Link, head, reports should be inherited -->
- <!-- TODO: use breadcrumbs more structure, links for links, and inherit subprojects as a menu or not at all -->
+ <!-- TODO: use breadcrumbs more structure -->
<links>
+ <item name="Apache" href="http://www.apache.org/"/>
<item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
<item name="Maven 2.x" href="http://maven.apache.org/"/>
<item name="Maven 2.x Plugins" href="http://maven.apache.org/plugins/"/>
@@ -26,14 +30,7 @@
<item name="JXR" href="http://maven.apache.org/jxr"/>
<item name="Doxia" href="http://maven.apache.org/doxia"/>
</links>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
- <menu ref="reports" inherit="bottom" />
+
+ <menu ref="modules" />
</body>
</project>