You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/12/15 15:29:45 UTC
svn commit: r487567 [1/4] - in /maven/plugins/trunk/maven-site-plugin: ./
src/main/java/org/apache/maven/doxia/sink/
src/main/java/org/apache/maven/plugins/site/
src/main/java/org/apache/maven/plugins/site/webapp/
src/main/java/org/apache/maven/reporti...
Author: jvanzyl
Date: Fri Dec 15 06:29:35 2006
New Revision: 487567
URL: http://svn.apache.org/viewvc?view=rev&rev=487567
Log:
o update compat notes
o add copyright for release
Modified:
maven/plugins/trunk/maven-site-plugin/compatibility-notes.txt
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/doxia/sink/SinkFactory.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaBean.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/Commandline.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/interpolation/EnvarBasedValueSource.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/interpolation/MapBasedValueSource.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/interpolation/ObjectBasedValueSource.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolator.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/interpolation/ValueSource.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
maven/plugins/trunk/maven-site-plugin/src/main/resources/default-site.xml
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_de.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_es.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_hu.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_it.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_ja.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_nl.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_no.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pl.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_pt_BR.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_zh_CN.properties
maven/plugins/trunk/maven-site-plugin/src/main/resources/webapp/web.xml
maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-site-plugin/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/framework1111/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework111/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/framework112/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework11/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework12/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework13/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14111/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/framework14112/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1411/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/framework1412/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/framework141/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/framework14/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework1/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework21/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/framework22111/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2211/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/framework2212/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework221/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/framework22211/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2221/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/framework2222/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/framework222/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework22/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/framework23/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/framework2/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-multiproject/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test10/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/source/mysite/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/xdoc/index.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test6/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test6/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/framework2/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test8/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/src/site/fr/xdoc/source-repository.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/src/site/fr/xdoc/test1.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/src/site/site_fr.xml
maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/src/site/xdoc/test1.xml
maven/plugins/trunk/maven-site-plugin/src/test/resources/unit/interpolated-site/pom.xml
maven/plugins/trunk/maven-site-plugin/src/test/resources/unit/interpolated-site/src/site/site.xml
Modified: maven/plugins/trunk/maven-site-plugin/compatibility-notes.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/compatibility-notes.txt?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/compatibility-notes.txt (original)
+++ maven/plugins/trunk/maven-site-plugin/compatibility-notes.txt Fri Dec 15 06:29:35 2006
@@ -1,22 +1,10 @@
-This is an "svn status" after I created a bridge to make the site plugin work with doxia-1.0-alpha-7.
-I have also added the necessary plexus-utils code to make the site descriptor
-interpolation work in 2.0.4
+For use in 2.0.4 we need to have the:
-When maven can move doxia and plexus out of the core then the site plugin
-can be upgraded to the new doxia and plexus-utils and these directories
-can be removed.
+1. The SinkFactory from doxia-sink-api
+2. The MavenMultiPageReport from maven-reporting
? src/main/java/org/apache/maven/doxia
+? src/main/java/org/apache/maven/reporting
? src/main/java/org/codehaus
-? src/main/resources/site-renderer_zh_CN.properties
-? src/main/resources/org
-? src/main/resources/site-renderer_pt_BR.properties
-? src/main/resources/site-renderer_es.properties
-? src/main/resources/site-renderer_fr.properties
-? src/main/resources/site-renderer_nl.properties
-? src/main/resources/site-renderer_pl.properties
-? src/main/resources/site-renderer_it.properties
-? src/main/resources/site-renderer.properties
-? src/main/resources/site-renderer_de.properties
-? src/main/resources/site-renderer_ja.properties
+plexus-utils 1.1 is in the core but that can easily be upgraded for 2.0.5.
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Dec 15 06:29:35 2006
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2004-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 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">
<parent>
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/doxia/sink/SinkFactory.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/doxia/sink/SinkFactory.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/doxia/sink/SinkFactory.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/doxia/sink/SinkFactory.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.doxia.sink;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.io.File;
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=487567&r1=487566&r2=487567
==============================================================================
--- 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 Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.artifact.Artifact;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportComparator.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.reporting.MavenReport;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.artifact.Artifact;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.artifact.Artifact;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.doxia.siterenderer.RendererException;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2004-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.artifact.manager.WagonManager;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.model.Site;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaBean.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaBean.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaBean.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaBean.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site.webapp;
/*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/webapp/DoxiaFilter.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.plugins.site.webapp;
/*
- * Copyright 2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.doxia.siterenderer.DocumentRenderer;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java Fri Dec 15 06:29:35 2006
@@ -1,19 +1,22 @@
package org.apache.maven.reporting;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.maven.doxia.sink.Sink;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java Fri Dec 15 06:29:35 2006
@@ -1,27 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT 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
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.
*/
/**
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java Fri Dec 15 06:29:35 2006
@@ -1,27 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT 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
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.
*/
import java.io.BufferedReader;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/Commandline.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/Commandline.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/Commandline.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/Commandline.java Fri Dec 15 06:29:35 2006
@@ -1,81 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/********************************************************************************
- * CruiseControl, a Continuous Integration Toolkit
- * Copyright (c) 2001-2003, ThoughtWorks, Inc.
- * 651 W Washington Ave. Suite 500
- * Chicago, IL 60661 USA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * + Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * + Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * + Neither the name of ThoughtWorks, Inc., CruiseControl, nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ********************************************************************************/
-
-/* ====================================================================
- * Copyright 2003-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.
- * ====================================================================
+ * 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.
*/
import org.codehaus.plexus.util.cli.shell.Shell;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java Fri Dec 15 06:29:35 2006
@@ -1,44 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* ====================================================================
- * Copyright 2003-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.
- * ====================================================================
+ * 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.
*/
/**
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java Fri Dec 15 06:29:35 2006
@@ -1,44 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/* ====================================================================
- * Copyright 2003-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.
- * ====================================================================
+ * 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.
*/
import java.util.StringTokenizer;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java Fri Dec 15 06:29:35 2006
@@ -1,65 +1,23 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.
*/
-
-/********************************************************************************
- * CruiseControl, a Continuous Integration Toolkit
- * Copyright (c) 2003, ThoughtWorks, Inc.
- * 651 W Washington Ave. Suite 500
- * Chicago, IL 60661 USA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * + Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * + Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * + Neither the name of ThoughtWorks, Inc., CruiseControl, nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ********************************************************************************/
/**
* Works in concert with the StreamPumper class to
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java Fri Dec 15 06:29:35 2006
@@ -1,27 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT 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
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.
*/
import java.io.IOException;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java Fri Dec 15 06:29:35 2006
@@ -1,81 +1,22 @@
package org.codehaus.plexus.util.cli;
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/********************************************************************************
- * CruiseControl, a Continuous Integration Toolkit
- * Copyright (c) 2001-2003, ThoughtWorks, Inc.
- * 651 W Washington Ave. Suite 500
- * Chicago, IL 60661 USA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * + Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * + Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * + Neither the name of ThoughtWorks, Inc., CruiseControl, nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ********************************************************************************/
-
-/* ====================================================================
- * Copyright 2003-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.
- * ====================================================================
+ * 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.
*/
import org.codehaus.plexus.util.IOUtil;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java Fri Dec 15 06:29:35 2006
@@ -1,35 +1,30 @@
+package org.codehaus.plexus.util.cli;
+
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
+ * 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.
*/
-package org.codehaus.plexus.util.cli;
-
import java.io.PrintWriter;
import java.io.Writer;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class WriterStreamConsumer
implements StreamConsumer
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java?view=diff&rev=487567&r1=487566&r2=487567
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java Fri Dec 15 06:29:35 2006
@@ -1,5 +1,24 @@
package org.codehaus.plexus.util.cli.shell;
+/*
+ * 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.
+ */
+
/**
* @author Jason van Zyl
*/