This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/3 by this push:
     new 5a1b0d3c Forward ported from 2.3-gae (kind of): Converted 
package.html-s to package-info.java-s
5a1b0d3c is described below

commit 5a1b0d3c3135b1c5c638c362ccb2f88b49504986
Author: ddekany <[email protected]>
AuthorDate: Tue Jun 4 19:34:09 2024 +0200

    Forward ported from 2.3-gae (kind of): Converted package.html-s to 
package-info.java-s
---
 .../core/arithmetic/impl/package-info.java         | 24 +++++++++++++++++
 .../freemarker/core/arithmetic/impl/package.html   | 26 -------------------
 .../freemarker/core/arithmetic/package-info.java   | 23 +++++++++++++++++
 .../apache/freemarker/core/arithmetic/package.html | 25 ------------------
 .../apache/freemarker/core/debug/package-info.java | 25 ++++++++++++++++++
 .../org/apache/freemarker/core/debug/package.html  | 27 -------------------
 .../freemarker/core/model/impl/package-info.java   | 24 +++++++++++++++++
 .../apache/freemarker/core/model/impl/package.html | 26 -------------------
 .../apache/freemarker/core/model/package-info.java | 23 +++++++++++++++++
 .../org/apache/freemarker/core/model/package.html  | 25 ------------------
 .../core/outputformat/impl/package-info.java       | 24 +++++++++++++++++
 .../freemarker/core/outputformat/impl/package.html | 26 -------------------
 .../freemarker/core/outputformat/package-info.java | 23 +++++++++++++++++
 .../freemarker/core/outputformat/package.html      | 25 ------------------
 .../org/apache/freemarker/core/package-info.java   | 25 ++++++++++++++++++
 .../java/org/apache/freemarker/core/package.html   | 27 -------------------
 .../core/templateresolver/impl/package-info.java   | 24 +++++++++++++++++
 .../core/templateresolver/impl/package.html        | 26 -------------------
 .../core/templateresolver/package-info.java        | 23 +++++++++++++++++
 .../freemarker/core/templateresolver/package.html  | 25 ------------------
 .../apache/freemarker/core/util/package-info.java  | 23 +++++++++++++++++
 .../org/apache/freemarker/core/util/package.html   | 25 ------------------
 .../core/valueformat/impl/package-info.java        | 24 +++++++++++++++++
 .../freemarker/core/valueformat/impl/package.html  | 26 -------------------
 .../freemarker/core/valueformat/package-info.java  | 23 +++++++++++++++++
 .../freemarker/core/valueformat/package.html       | 25 ------------------
 .../org/apache/freemarker/dom/package-info.java    | 25 ++++++++++++++++++
 .../java/org/apache/freemarker/dom/package.html    | 30 ----------------------
 .../freemarker/servlet/jsp/package-info.java       | 23 +++++++++++++++++
 .../org/apache/freemarker/servlet/jsp/package.html | 26 -------------------
 .../apache/freemarker/servlet/package-info.java    | 26 +++++++++++++++++++
 .../org/apache/freemarker/servlet/package.html     | 26 -------------------
 .../freemarker/spring/model/package-info.java      | 23 +++++++++++++++++
 .../apache/freemarker/spring/model/package.html    | 23 -----------------
 .../org/apache/freemarker/spring/package-info.java | 23 +++++++++++++++++
 .../java/org/apache/freemarker/spring/package.html | 23 -----------------
 .../freemarker/spring/web/view/package-info.java   | 23 +++++++++++++++++
 .../apache/freemarker/spring/web/view/package.html | 23 -----------------
 38 files changed, 451 insertions(+), 485 deletions(-)

diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/package-info.java
new file mode 100644
index 00000000..37d94732
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Arithmetic used in templates: Standard implementations. This package is 
part of the
+ * published API, that is, user code can safely depend on it.
+ */
+package org.apache.freemarker.core.arithmetic.impl;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
deleted file mode 100644
index 65688e22..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Arithmetic used in templates: Standard implementations. This package is 
part of the
-published API, that is, user code can safely depend on it.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/package-info.java
new file mode 100644
index 00000000..92a5a5d4
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Arithmetic used in templates: Base classes/interfaces.
+ */
+package org.apache.freemarker.core.arithmetic;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/package.html
deleted file mode 100644
index 62566ea3..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/arithmetic/package.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Arithmetic used in templates: Base classes/interfaces.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/debug/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/debug/package-info.java
new file mode 100644
index 00000000..269cb293
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/debug/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * Debugging API; experimental status, might change!
+ * This is to support debugging in IDE-s. If you are working on a client for 
this,
+ * don't hesitate to contact us!
+ */
+package org.apache.freemarker.core.debug;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/debug/package.html 
b/freemarker-core/src/main/java/org/apache/freemarker/core/debug/package.html
deleted file mode 100644
index 677b8422..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/debug/package.html
+++ /dev/null
@@ -1,27 +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.
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>Debugging API; experimental status, might change!
-This is to support debugging in IDE-s. If you are working on a client for this,
-don't hesitate to contact us!</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/package-info.java
new file mode 100644
index 00000000..3aef9bf6
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Data model and template language type system: Standard implementations. 
This package is part of the
+ * published API, that is, user code can safely depend on it.
+ */
+package org.apache.freemarker.core.model.impl;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/package.html
deleted file mode 100644
index b3db7461..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/impl/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Data model and template language type system: Standard implementations. 
This package is part of the
-published API, that is, user code can safely depend on it.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/package-info.java
new file mode 100644
index 00000000..038bd5af
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Data model and template language type system: Base classes/interfaces.
+ */
+package org.apache.freemarker.core.model;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/package.html 
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/package.html
deleted file mode 100644
index a2a9cfe0..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/model/package.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Data model and template language type system: Base classes/interfaces.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/package-info.java
new file mode 100644
index 00000000..46ff12c3
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Template output format: Standard implementations. This package is part of 
the
+ * published API, that is, user code can safely depend on it.
+ */
+package org.apache.freemarker.core.outputformat.impl;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
deleted file mode 100644
index 6cb5c21b..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Template output format: Standard implementations. This package is part of 
the
-published API, that is, user code can safely depend on it.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/package-info.java
new file mode 100644
index 00000000..19609d43
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Template output format: Base classes/interfaces
+ */
+package org.apache.freemarker.core.outputformat;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/package.html
deleted file mode 100644
index b25de837..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/outputformat/package.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Template output format: Base classes/interfaces</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/package-info.java 
b/freemarker-core/src/main/java/org/apache/freemarker/core/package-info.java
new file mode 100644
index 00000000..78f9cb29
--- /dev/null
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * <b>The most commonly used API-s of FreeMarker;</b>
+ * start with {@link freemarker.template.Configuration Configuration} (see 
also the
+ * <a href="http://freemarker.org/docs/pgui_quickstart.html"; 
target="_blank">Getting Stared</a> in the Manual.)
+ */
+package org.apache.freemarker.core;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/package.html 
b/freemarker-core/src/main/java/org/apache/freemarker/core/package.html
deleted file mode 100644
index be9dab91..00000000
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/package.html
+++ /dev/null
@@ -1,27 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p><b>The most commonly used API-s of FreeMarker;</b>
-start with {@link freemarker.template.Configuration Configuration} (see also 
the
-<a href="http://freemarker.org/docs/pgui_quickstart.html"; 
target="_blank">Getting Stared</a> in the Manual.)</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/package-info.java
new file mode 100644
index 00000000..fb034582
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Template lookup, loading and caching: Standard implementations. This 
package is part of the
+ * published API, that is, user code can safely depend on it.
+ */
+package org.apache.freemarker.core.templateresolver.impl;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
deleted file mode 100644
index c595bd87..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Template lookup, loading and caching: Standard implementations. This 
package is part of the
-published API, that is, user code can safely depend on it.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/package-info.java
new file mode 100644
index 00000000..3aa304bd
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Template lookup, loading, and caching: Base classes/interfaces
+ */
+package org.apache.freemarker.core.templateresolver;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/package.html
deleted file mode 100644
index dd015868..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/package.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Template lookup, loading, and caching: Base classes/interfaces</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/util/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/util/package-info.java
new file mode 100644
index 00000000..8a6797be
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/util/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Various classes used by core FreeMarker code but might be useful outside of 
it too.
+ */
+package org.apache.freemarker.core.util;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/util/package.html 
b/freemarker-core/src/main/java/org/apache/freemarker/core/util/package.html
deleted file mode 100644
index e90df613..00000000
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/util/package.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>Various classes used by core FreeMarker code but might be useful outside of 
it too.</p>
-</body>
-</html>
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/package-info.java
new file mode 100644
index 00000000..0991c312
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Formatting values shown in templates: Standard implementations. This 
package is part of the published API, that
+ * is, user code can safely depend on it.
+ */
+package org.apache.freemarker.core.valueformat.impl;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
deleted file mode 100644
index ecfd725b..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Formatting values shown in templates: Standard implementations. This 
package is part of the published API, that
-is, user code can safely depend on it.</p>
-</body>
-</html>
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/package-info.java
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/package-info.java
new file mode 100644
index 00000000..0ee636fd
--- /dev/null
+++ 
b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Formatting values shown in templates: Base classes/interfaces
+ */
+package org.apache.freemarker.core.valueformat;
\ No newline at end of file
diff --git 
a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/package.html
 
b/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/package.html
deleted file mode 100644
index 21d4c1b5..00000000
--- 
a/freemarker-core/src/main/java/org/apache/freemarker/core/valueformat/package.html
+++ /dev/null
@@ -1,25 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>Formatting values shown in templates: Base classes/interfaces</p>
-</body>
-</html>
diff --git 
a/freemarker-dom/src/main/java/org/apache/freemarker/dom/package-info.java 
b/freemarker-dom/src/main/java/org/apache/freemarker/dom/package-info.java
new file mode 100644
index 00000000..2eb86514
--- /dev/null
+++ b/freemarker-dom/src/main/java/org/apache/freemarker/dom/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * Exposes DOM XML nodes to templates as easily traversable trees;
+ * see <a href="http://freemarker.org/docs/xgui.html"; target="_blank">in the 
Manual</a>.
+ * The default object wrapper of FreeMarker can automatically wraps W3C nodes 
with this.
+ */
+package org.apache.freemarker.dom;
\ No newline at end of file
diff --git 
a/freemarker-dom/src/main/java/org/apache/freemarker/dom/package.html 
b/freemarker-dom/src/main/java/org/apache/freemarker/dom/package.html
deleted file mode 100644
index 61b17378..00000000
--- a/freemarker-dom/src/main/java/org/apache/freemarker/dom/package.html
+++ /dev/null
@@ -1,30 +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.
--->
-<html>
-<head>
-<title></title>
-</head>
-<body>
-
-<p>Exposes DOM XML nodes to templates as easily traversable trees;
-see <a href="http://freemarker.org/docs/xgui.html"; target="_blank">in the 
Manual</a>.
-The default object wrapper of FreeMarker can automatically wraps W3C nodes 
with this.
-
-</body>
-</html>
diff --git 
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/package-info.java
 
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/package-info.java
new file mode 100644
index 00000000..a47deeda
--- /dev/null
+++ 
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Allows JSP custom tags to be used inside FreeMarker templates as if they 
where FreeMarker directives.
+ */
+package org.apache.freemarker.servlet.jsp;
\ No newline at end of file
diff --git 
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/package.html
 
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/package.html
deleted file mode 100644
index 8d65a1c4..00000000
--- 
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<head>
-</head>
-<body>
-<p>
-Allows JSP custom tags to be used inside FreeMarker templates as if they where 
FreeMarker directives.
-</body>
-</html>
\ No newline at end of file
diff --git 
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/package-info.java
 
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/package-info.java
new file mode 100644
index 00000000..fc6c9afa
--- /dev/null
+++ 
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/package-info.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+/**
+ * Servlet for legacy "Model 2" frameworks that allows using FreeMarker
+ * templates instead of JSP as the MVC View
+ * (see <a href="http://freemarker.org/docs/pgui_misc_servlet.html"; 
target="_blank">in the Manual</a>), also
+ * custom JSP tag support.
+ */
+package org.apache.freemarker.servlet;
\ No newline at end of file
diff --git 
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/package.html 
b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/package.html
deleted file mode 100644
index c364bb0e..00000000
--- 
a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/package.html
+++ /dev/null
@@ -1,26 +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.
--->
-<html>
-<body>
-<p>Servlet for legacy "Model 2" frameworks that allows using FreeMarker
-templates instead of JSP as the MVC View
-(see <a href="http://freemarker.org/docs/pgui_misc_servlet.html"; 
target="_blank">in the Manual</a>), also
-custom JSP tag support.</p>
-</body>
-</html>
diff --git 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package-info.java
 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package-info.java
new file mode 100644
index 00000000..a76e9808
--- /dev/null
+++ 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * FreeMarker Directives and Functions Support for Spring Framework MVC
+ */
+package org.apache.freemarker.spring.model;
\ No newline at end of file
diff --git 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package.html
 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/model/package.html
deleted file mode 100644
index 5a98e442..00000000
--- 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/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.
--->
-<html>
-<body>
-<p>FreeMarker Directives and Functions Support for Spring Framework MVC</p>
-</body>
-</html>
diff --git 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/package-info.java
 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/package-info.java
new file mode 100644
index 00000000..be782238
--- /dev/null
+++ 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Framework (MVC) Support
+ */
+package org.apache.freemarker.spring;
\ No newline at end of file
diff --git 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/package.html 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/package.html
deleted file mode 100644
index 05ba1ff3..00000000
--- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/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.
--->
-<html>
-<body>
-<p>Spring Framework (MVC) Support</p>
-</body>
-</html>
diff --git 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package-info.java
 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package-info.java
new file mode 100644
index 00000000..a9506828
--- /dev/null
+++ 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Spring Framework MVC View Support
+ */
+package org.apache.freemarker.spring.web.view;
\ No newline at end of file
diff --git 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package.html
 
b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/package.html
deleted file mode 100644
index 98b1417d..00000000
--- 
a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/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.
--->
-<html>
-<body>
-<p>Spring Framework MVC View Support</p>
-</body>
-</html>

Reply via email to