From e1807abfbc8bae12ccb493d5b1ff54954b0168fa Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Tue, 28 May 2013 22:02:39 +0200
Subject: [PATCH] Replace package.html with package-info.java

---
 .../repository/internal/package-info.java     | 23 +++++++++++++++
 .../maven/repository/internal/package.html    | 22 --------------
 .../maven/model/io/xpp3/package-info.java     | 29 +++++++++++++++++++
 .../apache/maven/model/io/xpp3/package.html   | 28 ------------------
 .../maven/model/merge/package-info.java       | 23 +++++++++++++++
 .../org/apache/maven/model/merge/package.html | 22 --------------
 .../org/apache/maven/model/package-info.java  | 24 +++++++++++++++
 .../java/org/apache/maven/model/package.html  | 23 ---------------
 8 files changed, 99 insertions(+), 95 deletions(-)
 create mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
 delete mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package.html
 create mode 100644 maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
 delete mode 100644 maven-model/src/main/java/org/apache/maven/model/io/xpp3/package.html
 create mode 100644 maven-model/src/main/java/org/apache/maven/model/merge/package-info.java
 delete mode 100644 maven-model/src/main/java/org/apache/maven/model/merge/package.html
 create mode 100644 maven-model/src/main/java/org/apache/maven/model/package-info.java
 delete mode 100644 maven-model/src/main/java/org/apache/maven/model/package.html

diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package-info.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
new file mode 100644
index 0000000000..826a5c0fe9
--- /dev/null
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package-info.java
@@ -0,0 +1,23 @@
+/**
+ * <a href="http://www.eclipse.org/aether/">Aether</a> extensions for utilizing the Maven POM and Maven repository metadata.
+ */
+package org.apache.maven.repository.internal;
+
+/*
+ * 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.
+ */
\ No newline at end of file
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package.html b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package.html
deleted file mode 100644
index bfe6692fbb..0000000000
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-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.
--->
-
-<body>
-  <p><a href="http://www.eclipse.org/aether/">Aether</a> extensions for utilizing the Maven POM and Maven repository metadata.</p>
-</body>
\ No newline at end of file
diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
new file mode 100644
index 0000000000..4180b55bfe
--- /dev/null
+++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
@@ -0,0 +1,29 @@
+/**
+ * XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
+ * These classes use
+ * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
+ * XML Pull Parser API</a> for their internal XML handling and
+ * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> + 
+ * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
+ * DOM content representation (see <code>&lt;configuration&gt;</code> elements).
+ */
+package org.apache.maven.model.io.xpp3;
+
+/*
+ * 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.
+ */
\ No newline at end of file
diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package.html b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package.html
deleted file mode 100644
index 8aa92f217b..0000000000
--- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-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.
--->
-
-<body>
-XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
-These classes use
-<a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
-XML Pull Parser API</a> for their internal XML handling and
-<a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> + 
-<a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
-DOM content representation (see <code>&lt;configuration&gt;</code> elements).
-</body>
\ No newline at end of file
diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java b/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java
new file mode 100644
index 0000000000..156ae704ea
--- /dev/null
+++ b/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java
@@ -0,0 +1,23 @@
+/**
+ * POM merger.
+ */
+package org.apache.maven.model.merge;
+
+/*
+ * 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.
+ */
diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/package.html b/maven-model/src/main/java/org/apache/maven/model/merge/package.html
deleted file mode 100644
index 605a03ba6d..0000000000
--- a/maven-model/src/main/java/org/apache/maven/model/merge/package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-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.
--->
-
-<body>
-POM merger.
-</body>
diff --git a/maven-model/src/main/java/org/apache/maven/model/package-info.java b/maven-model/src/main/java/org/apache/maven/model/package-info.java
new file mode 100644
index 0000000000..0a546d176a
--- /dev/null
+++ b/maven-model/src/main/java/org/apache/maven/model/package-info.java
@@ -0,0 +1,24 @@
+/**
+ * Maven POM (Project Object Model) classes, generated from <code>maven.mdo</code> model.
+ * The root class is {@link org.apache.maven.model.Model}.
+ */
+package org.apache.maven.model;
+
+/*
+ * 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.
+ */
\ No newline at end of file
diff --git a/maven-model/src/main/java/org/apache/maven/model/package.html b/maven-model/src/main/java/org/apache/maven/model/package.html
deleted file mode 100644
index 997530c9d8..0000000000
--- a/maven-model/src/main/java/org/apache/maven/model/package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-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.
--->
-
-<body>
-Maven POM (Project Object Model) classes, generated from <code>maven.mdo</code> model.
-The root class is <a href="Model.html">Model</a>.
-</body>