Lots of JavaDoc cleanup preparing for release (mostly moving from package.html to package-info.java representation)

git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@711074 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/org/jsecurity/aop/package-info.java b/src/org/jsecurity/aop/package-info.java
new file mode 100644
index 0000000..bdf70e7
--- /dev/null
+++ b/src/org/jsecurity/aop/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.

+ */

+/**

+ * Components used to support the framework's AOP/interception support classes.

+ * <p/>

+ * As this package is a root-level package under <tt>org.jsecurity</tt>, it contains AOP support classes

+ * useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,

+ * authentication, etc) will use these classes as their base in their respective packages.

+ */

+package org.jsecurity.aop;
\ No newline at end of file
diff --git a/src/org/jsecurity/aop/package.html b/src/org/jsecurity/aop/package.html
deleted file mode 100644
index d55f7d5..0000000
--- a/src/org/jsecurity/aop/package.html
+++ /dev/null
@@ -1,29 +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>Components used to support the framework's AOP/interception support classes.</p>
-
-<p>As this package is a root-level package under <tt>org.jsecurity</tt>, it contains AOP support classes
-    useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
-    authentication, etc) will use these classes as their base in their respective packages.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/authc/credential/package-info.java b/src/org/jsecurity/authc/credential/package-info.java
index 745a31f..514be3f 100644
--- a/src/org/jsecurity/authc/credential/package-info.java
+++ b/src/org/jsecurity/authc/credential/package-info.java
@@ -16,4 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Support for validating <em>credentials</em> (such as passwords or X509 certificates) during
+ * authentication via the {@link org.jsecurity.authc.credential.CredentialsMatcher CredentialsMatcher}
+ * interface and its supporting implementations.
+ */
 package org.jsecurity.authc.credential;
\ No newline at end of file
diff --git a/src/org/jsecurity/authc/package-info.java b/src/org/jsecurity/authc/package-info.java
new file mode 100644
index 0000000..6cd4dd8
--- /dev/null
+++ b/src/org/jsecurity/authc/package-info.java
@@ -0,0 +1,29 @@
+/*

+ * 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.

+ */

+/**

+ * Core interfaces and exceptions concerning Authentication (the act of logging-in).

+ * <p/>

+ * JSecurity abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it seperately from

+ * 'AuthoriZation', abbreviated as <tt>authz</tt>.

+ * <p/>

+ * The primary item of interest in this package is the <tt>Authenticator</tt> interface, which acts as the

+ * entry point (facade) to all other other authentication components. Other components, interfaces and

+ * exceptions are here to support <tt>Authenticator</tt> implementations.

+ */

+package org.jsecurity.authc;
\ No newline at end of file
diff --git a/src/org/jsecurity/authc/package.html b/src/org/jsecurity/authc/package.html
deleted file mode 100644
index 764a7fe..0000000
--- a/src/org/jsecurity/authc/package.html
+++ /dev/null
@@ -1,33 +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>Core interfaces and exceptions concerning Authentication
-    (the act of logging-in).</p>
-
-<p>JSecurity abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it seperately
-    from 'AuthoriZation', abbreviated as <tt>authz</tt>.</p>
-
-<p>The primary item of interest here is the <tt>Authenticator</tt> interface, which acts as the
-    primary entry point (facade) to all other other authentication components. Other
-    components, interfaces and exceptions are here to support <tt>Authenticator</tt> implementations.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/authc/pam/package-info.java b/src/org/jsecurity/authc/pam/package-info.java
new file mode 100644
index 0000000..4763ab6
--- /dev/null
+++ b/src/org/jsecurity/authc/pam/package-info.java
@@ -0,0 +1,32 @@
+/*

+ * 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.

+ */

+/**

+ * Support for <em>PAM</em>, or <b>P</b>luggable <b>A</b>uthentication <b>M</b>odules, which is

+ * the capability to authenticate a user against multiple configurable (pluggable) <em>modules</em> (JSecurity

+ * calls these {@link org.jsecurity.realm.Realm Realm}s).

+ * <p/>

+ * The primary class of interest here is the {@link org.jsecurity.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}

+ * which is an <code>Authenticator</code> implementation that coordinates authentication attempts across

+ * one or more Realm instances.

+ * <p/>

+ * How the <code>ModularRealmAuthenticator</code> actually coordinates this behavior is configurable based on your

+ * application's needs using an injectible

+ * {@link org.jsecurity.authc.pam.ModularAuthenticationStrategy ModularAuthenticationStrategy}.

+ */

+package org.jsecurity.authc.pam;
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/annotation/package-info.java b/src/org/jsecurity/authz/annotation/package-info.java
new file mode 100644
index 0000000..8c1685d
--- /dev/null
+++ b/src/org/jsecurity/authz/annotation/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Annotations used to restrict which methods may be invoked depending on the caller's access abilities.

+ */

+package org.jsecurity.authz.annotation;
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/annotation/package.html b/src/org/jsecurity/authz/annotation/package.html
deleted file mode 100644
index ab86757..0000000
--- a/src/org/jsecurity/authz/annotation/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>
-Annotations used to restrict which methods may be invoked depending on the caller's access abilities.
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/aop/package-info.java b/src/org/jsecurity/authz/aop/package-info.java
new file mode 100644
index 0000000..a4b609b
--- /dev/null
+++ b/src/org/jsecurity/authz/aop/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Contains AOP implementation support classes specifically used for authorization operations.

+ */

+package org.jsecurity.authz.aop;
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/aop/package.html b/src/org/jsecurity/authz/aop/package.html
deleted file mode 100644
index d0f623b..0000000
--- a/src/org/jsecurity/authz/aop/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>
-Contains AOP implementation support classes specifically used for authorization operations.
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/package-info.java b/src/org/jsecurity/authz/package-info.java
new file mode 100644
index 0000000..6a76ee6
--- /dev/null
+++ b/src/org/jsecurity/authz/package-info.java
@@ -0,0 +1,38 @@
+/*

+ * 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.

+ */

+/**

+ * Core interfaces and exceptions supporting Authorization (access control).

+ * <p/>

+ * JSecurity abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it seperately from

+ * 'AuthentiCation', abbreviated as <tt>authc</tt>.

+ * <p/>

+ * This package's primary interface of interest, which is the core of JSecurity authorization functionality,

+ * is the <tt>Authorizer</tt>. This interface handles all aspects of principal-related security and is the

+ * facade to all other JSecurity authorization components.

+ * <p/>

+ * JSecurity has the ability to authorize subjects (a.k.a. users) without being intrusive to the application's

+ * domain model. Most applications will utilize the concepts of <tt>group</tt>s, <tt>role</tt>s, and

+ * <tt>permission</tt>s, but JSecurity tries to be as non-invasive as possible doesn't require any such

+ * interfaces (although a Permission interface is made available for fine-grained access control policies if

+ * you want to use JSecurity's permission support out-of-the-box).

+ * <p/>

+ * Although it is possible for applications to implement this and other interfaces directly, it is not

+ * recommended. JSecurity already has base implementations which should be suitable for 99% of deployments.

+ */

+package org.jsecurity.authz;
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/package.html b/src/org/jsecurity/authz/package.html
deleted file mode 100644
index 3e8a8a6..0000000
--- a/src/org/jsecurity/authz/package.html
+++ /dev/null
@@ -1,53 +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>
-
-Core interfaces and exceptions supporting Authorization (access control).
-
-<p>JSecurity abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it seperately from
-    'AuthentiCation', abbreviated as <tt>authc</tt>.</p>
-
-<p>The primary interface of interest, which is the core of JSecurity authorization functionality,
-    is the <tt>Authorizer</tt>. This interface handles all aspects of principal-related security and is
-    the facade to all other JSecurity authorization components.</p>
-
-<p>JSecurity has the ability to authorize subjects (a.k.a. users) without being intrusive to
-    the application's domain model. Most applications will utilize the concepts of
-    <tt>group</tt>s, <tt>role</tt>s, and <tt>permission</tt>s, but JSecurity tries to be
-    as non-invasive as possible doesn't require any such interfaces (although a Permission interface
-    is made available for fine-grained access control policies if you want to use
-    JSecurity's permission support out-of-the-box).</p>
-
-<p>Although
-    it is possible for applications to implement this and other interfaces directly, it is not
-    recommended. JSecurity already has base implementations in the
-    <tt>org.jsecurity.authz.support</tt> package which
-    should be suitable for 99% of deployments.
-    Most applications should be able to use these
-    existing components via configuration only and be up and running very quickly. See the
-    API or the JSecurity.org website quick-start for how to accomplish this
-    instead of writing an implementation from scratch.</p>
-
-<p>Finally, as is the case with most all of JSecurity interfaces and components, they can be used
-    programmatically, but it is highly recommended to use the JSecurity JDK 1.5 annotations and/or
-    configuration to reduce or eliminate such effort.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/authz/permission/package-info.java b/src/org/jsecurity/authz/permission/package-info.java
new file mode 100644
index 0000000..fededfd
--- /dev/null
+++ b/src/org/jsecurity/authz/permission/package-info.java
@@ -0,0 +1,27 @@
+/*

+ * 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.

+ */

+/**

+ * Support and default implementations for JSecurity's {@link org.jsecurity.authz.Permission Permission}

+ * interface.

+ * <p/>

+ * Also note the {@link org.jsecurity.authz.permission.PermissionResolver PermissionResolver} interface, as

+ * it plays an important part in many of JSecurity's {@link org.jsecurity.realm.Realm Realm} implementations

+ * and AOP support.

+ */

+package org.jsecurity.authz.permission;
\ No newline at end of file
diff --git a/src/org/jsecurity/cache/ehcache/EhCache.java b/src/org/jsecurity/cache/ehcache/EhCache.java
index 573dda9..a40f379 100644
--- a/src/org/jsecurity/cache/ehcache/EhCache.java
+++ b/src/org/jsecurity/cache/ehcache/EhCache.java
@@ -30,7 +30,7 @@
 import java.util.Set;

 

 /**

- * JSecurity {@link org.jsecurity.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache}.

+ * JSecurity {@link org.jsecurity.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache} instance.

  *

  * @author Jeremy Haile

  * @author Les Hazlewood

diff --git a/src/org/jsecurity/cache/ehcache/EhCacheManager.java b/src/org/jsecurity/cache/ehcache/EhCacheManager.java
index cd7dbcb..c2a7429 100644
--- a/src/org/jsecurity/cache/ehcache/EhCacheManager.java
+++ b/src/org/jsecurity/cache/ehcache/EhCacheManager.java
@@ -37,11 +37,11 @@
  * <p>This implementation requires EhCache 1.2 and above. Make sure EhCache 1.1 or earlier

  * is not in the classpath or it will not work.</p>

  *

- * <p>Please see the <a href="http://ehcache.sf.net">Ehcache website</a> for their documentation.</p>

+ * <p>Please see the <a href="http://ehcache.sf.net" target="_top">Ehcache website</a> for their documentation.</p>

  *

  * @author Jeremy Haile

  * @author Les Hazlewood

- * @see <a href="http://ehcache.sf.net">The Ehcache website</a>

+ * @see <a href="http://ehcache.sf.net" target="_top">The Ehcache website</a>

  * @since 0.2

  */

 public class EhCacheManager implements CacheManager, Initializable, Destroyable {

diff --git a/src/org/jsecurity/cache/ehcache/package-info.java b/src/org/jsecurity/cache/ehcache/package-info.java
index 8a3a16c..8724f40 100644
--- a/src/org/jsecurity/cache/ehcache/package-info.java
+++ b/src/org/jsecurity/cache/ehcache/package-info.java
@@ -16,4 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * <a href="http://ehcache.sourceforge.net" target="_top">Ehcache</a>-based implementations of JSecurity's
+ * cache interfaces.
+ */
 package org.jsecurity.cache.ehcache;
\ No newline at end of file
diff --git a/src/org/jsecurity/cache/package-info.java b/src/org/jsecurity/cache/package-info.java
index c69abc8..eddc83d 100644
--- a/src/org/jsecurity/cache/package-info.java
+++ b/src/org/jsecurity/cache/package-info.java
@@ -16,4 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Caching support used to enhance performance for any security operation.
+ */
 package org.jsecurity.cache;
\ No newline at end of file
diff --git a/src/org/jsecurity/codec/package-info.java b/src/org/jsecurity/codec/package-info.java
index 413b99f..3f1350e 100644
--- a/src/org/jsecurity/codec/package-info.java
+++ b/src/org/jsecurity/codec/package-info.java
@@ -16,4 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Components for encoding and decoding of data across multiple formats, especially useful in JSecurity's
+ * cryptography and web functionality.
+ */
 package org.jsecurity.codec;
\ No newline at end of file
diff --git a/src/org/jsecurity/config/package-info.java b/src/org/jsecurity/config/package-info.java
new file mode 100644
index 0000000..d50b156
--- /dev/null
+++ b/src/org/jsecurity/config/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Components that support configuring JSecurity in any application.

+ */

+package org.jsecurity.config;
\ No newline at end of file
diff --git a/src/org/jsecurity/crypto/hash/package-info.java b/src/org/jsecurity/crypto/hash/package-info.java
index 8bc8a40..40e5881 100644
--- a/src/org/jsecurity/crypto/hash/package-info.java
+++ b/src/org/jsecurity/crypto/hash/package-info.java
@@ -16,4 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Cryptographic Hashing components that greatly simplify one-way data hashing in an application.
+ * <p/>
+ * The {@link org.jsecurity.crypto.hash.Hash Hash} interface and its implementations are significantly
+ * easier to understand and use compared to the JDK's <code>MessageDigest</code> mechanism.
+ */
 package org.jsecurity.crypto.hash;
\ No newline at end of file
diff --git a/src/org/jsecurity/crypto/package-info.java b/src/org/jsecurity/crypto/package-info.java
index 022dcbf..cddc094 100644
--- a/src/org/jsecurity/crypto/package-info.java
+++ b/src/org/jsecurity/crypto/package-info.java
@@ -16,4 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Cryptography Cipher and Hashing components that greatly simplify the JDK's cryptography concepts and
+ * add additional convenient behavior.
+ * <p/>
+ * The most important interface in this package is the {@link org.jsecurity.crypto.Cipher Cipher} interface, which
+ * allows other JSecurity components to encrypt and decrypt potentially sensitive data.
+ */
 package org.jsecurity.crypto;
\ No newline at end of file
diff --git a/src/org/jsecurity/io/package-info.java b/src/org/jsecurity/io/package-info.java
index 2655e56..625cd42 100644
--- a/src/org/jsecurity/io/package-info.java
+++ b/src/org/jsecurity/io/package-info.java
@@ -16,4 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Support for reading and writing (input/output) raw data from multiple resource locations.
+ */
 package org.jsecurity.io;
\ No newline at end of file
diff --git a/src/org/jsecurity/jndi/package-info.java b/src/org/jsecurity/jndi/package-info.java
new file mode 100644
index 0000000..1a57b8a
--- /dev/null
+++ b/src/org/jsecurity/jndi/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Enables accessing objects located in JNDI that might be useful when configuring a JSecurity-enabled application.

+ */

+package org.jsecurity.jndi;
\ No newline at end of file
diff --git a/src/org/jsecurity/mgt/package-info.java b/src/org/jsecurity/mgt/package-info.java
index 3c2b431..8e597f2 100644
--- a/src/org/jsecurity/mgt/package-info.java
+++ b/src/org/jsecurity/mgt/package-info.java
@@ -16,4 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Provides the master {@link org.jsecurity.mgt.SecurityManager SecurityManager} interface and a default implementation
+ * hierarchy for managing all aspects of JSecurity's functionality in an application.
+ */
 package org.jsecurity.mgt;
\ No newline at end of file
diff --git a/src/org/jsecurity/package-info.java b/src/org/jsecurity/package-info.java
new file mode 100644
index 0000000..3b36e0f
--- /dev/null
+++ b/src/org/jsecurity/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.

+ */

+/**

+ * This package primarily exists as a root classpath distinction, but it does contain two core classes widely used

+ * by applications, {@link org.jsecurity.SecurityUtils SecurityUtils} and

+ * {@link org.jsecurity.JSecurityException JSecurityException}.

+ */

+package org.jsecurity;
\ No newline at end of file
diff --git a/src/org/jsecurity/package.html b/src/org/jsecurity/package.html
deleted file mode 100644
index 2a51e50..0000000
--- a/src/org/jsecurity/package.html
+++ /dev/null
@@ -1,24 +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>
-This package primarily exists as a root classpath distinction, but it does contain some classes that are core to
-the entire JSecurity framework.
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/activedirectory/package-info.java b/src/org/jsecurity/realm/activedirectory/package-info.java
new file mode 100644
index 0000000..eef68ae
--- /dev/null
+++ b/src/org/jsecurity/realm/activedirectory/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Realms that acquire security data from a Microsoft Active Directory.

+ */

+package org.jsecurity.realm.activedirectory;
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/activedirectory/package.html b/src/org/jsecurity/realm/activedirectory/package.html
deleted file mode 100644
index 8d7172d..0000000
--- a/src/org/jsecurity/realm/activedirectory/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>Provides Realm implementations that specifically support integrating with Microsoft's ActiveDirectory for
-    security data.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/jdbc/package-info.java b/src/org/jsecurity/realm/jdbc/package-info.java
new file mode 100644
index 0000000..f30d383
--- /dev/null
+++ b/src/org/jsecurity/realm/jdbc/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.

+ */

+/**

+ * Realms that acquire security data from an RDBMS (Relational Database Management System) using the 

+ * JDBC API.

+ */

+package org.jsecurity.realm.jdbc;
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/jdbc/package.html b/src/org/jsecurity/realm/jdbc/package.html
deleted file mode 100644
index 6939cde..0000000
--- a/src/org/jsecurity/realm/jdbc/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>Realm implementations that interface with an RDBMS (Relational Database Management System)
-    using the JDBC API.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/jndi/package-info.java b/src/org/jsecurity/realm/jndi/package-info.java
new file mode 100644
index 0000000..58971d1
--- /dev/null
+++ b/src/org/jsecurity/realm/jndi/package-info.java
@@ -0,0 +1,21 @@
+/*

+ * 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.

+ */

+/**

+ * Support for acquiring Realms from JNDI, particularly useful for configuring JSecurity in JEE or EJB environments. */

+package org.jsecurity.realm.jndi;
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/ldap/package-info.java b/src/org/jsecurity/realm/ldap/package-info.java
new file mode 100644
index 0000000..69715e9
--- /dev/null
+++ b/src/org/jsecurity/realm/ldap/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.

+ */

+/**

+ * Realms that acquire security data from an LDAP (Lightweight Directory Access Protocol) server

+ * utilizing LDAP/Naming APIs.

+ */

+package org.jsecurity.realm.ldap;
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/ldap/package.html b/src/org/jsecurity/realm/ldap/package.html
deleted file mode 100644
index 0833deb..0000000
--- a/src/org/jsecurity/realm/ldap/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>Realm implementations that interface with an LDAP (Lightweight Directory Access Protocol) server utilizing
-    LDAP/Naming APIs.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/package-info.java b/src/org/jsecurity/realm/package-info.java
new file mode 100644
index 0000000..6db7cfe
--- /dev/null
+++ b/src/org/jsecurity/realm/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.

+ */

+/**

+ * Components and sub-packages used in supporting the core {@link org.jsecurity.realm.Realm Realm} interface.

+ * <p/>

+ * Take particular note of the multiple sub-packages with existing Realm implementations supporting many

+ * environments that you can use use directly or extend for custom behavior.

+ */

+package org.jsecurity.realm;
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/package.html b/src/org/jsecurity/realm/package.html
deleted file mode 100644
index 93a5636..0000000
--- a/src/org/jsecurity/realm/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.
-  -->
-<html>
-<body>
-
-<p>Base package defining <tt>Realm</tt> components and sub-packages used in supporting this core API interface.</p>
-
-<p>Take particular note to the <tt>support</tt> subpackage to leverage existing Realm implementations in your own
-    environment that you can use directly or extend for custom implementations.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/realm/text/package-info.java b/src/org/jsecurity/realm/text/package-info.java
index 15f5465..8f875db 100644
--- a/src/org/jsecurity/realm/text/package-info.java
+++ b/src/org/jsecurity/realm/text/package-info.java
@@ -16,4 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Realms that acquire security data from text-based data sources such as <code>File</code>s or
+ * text streams.
+ */
 package org.jsecurity.realm.text;
\ No newline at end of file
diff --git a/src/org/jsecurity/session/mgt/eis/package-info.java b/src/org/jsecurity/session/mgt/eis/package-info.java
new file mode 100644
index 0000000..60cbf99
--- /dev/null
+++ b/src/org/jsecurity/session/mgt/eis/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.

+ */

+/**

+ * EIS (Enterprise Information System)-tier components that can perform CRUD operations for sessions

+ * using any EIS API.

+ */

+package org.jsecurity.session.mgt.eis;
\ No newline at end of file
diff --git a/src/org/jsecurity/session/mgt/eis/package.html b/src/org/jsecurity/session/mgt/eis/package.html
deleted file mode 100644
index f080e43..0000000
--- a/src/org/jsecurity/session/mgt/eis/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>Provides EIS (Enterprise Information System) tier components that can perform CRUD operations for sessions
-    (acrossy any EIS tier API).</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/session/mgt/package-info.java b/src/org/jsecurity/session/mgt/package-info.java
new file mode 100644
index 0000000..a8f099c
--- /dev/null
+++ b/src/org/jsecurity/session/mgt/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * {@link org.jsecurity.session.mgt.SessionManager SessionManager} components supporting enterprise session management.

+ */

+package org.jsecurity.session.mgt;
\ No newline at end of file
diff --git a/src/org/jsecurity/session/mgt/package.html b/src/org/jsecurity/session/mgt/package.html
deleted file mode 100644
index 708dc9c..0000000
--- a/src/org/jsecurity/session/mgt/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>
-<body>
-
-<p>Default support implementations of the <tt>SecurityManager</tt> and <tt>SessionFactory</tt> interfaces.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/session/mgt/quartz/package-info.java b/src/org/jsecurity/session/mgt/quartz/package-info.java
new file mode 100644
index 0000000..04e0333
--- /dev/null
+++ b/src/org/jsecurity/session/mgt/quartz/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.

+ */

+/**

+ * <a href="http://www.opensymphony.com/quartz/" target="_top">Quartz</a>-based implementations of

+ * components that help <tt>SessionManager</tt> implementations maintain sessions (timed expiration, orphan cleanup,

+ * etc).

+ */

+package org.jsecurity.session.mgt.quartz;
\ No newline at end of file
diff --git a/src/org/jsecurity/session/mgt/quartz/package.html b/src/org/jsecurity/session/mgt/quartz/package.html
deleted file mode 100644
index 0323b73..0000000
--- a/src/org/jsecurity/session/mgt/quartz/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>
-<body>
-
-<p>Provides <a href="http://www.opensymphony.com/quartz/" target="_top">Quartz</a>-based implementations of
-    components that help <tt>SessionManager</tt> implementations maintain sessions (timed expiration, orphan cleanup,
-    etc).</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/session/package-info.java b/src/org/jsecurity/session/package-info.java
new file mode 100644
index 0000000..ccb013a
--- /dev/null
+++ b/src/org/jsecurity/session/package-info.java
@@ -0,0 +1,36 @@
+/*

+ * 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.

+ */

+/**

+ * Components related to managing sessions, the time-based data contexts in which a Subject

+ * interacts with an application.

+ * <p/>

+ * Sessions in JSecurity are completely POJO-based and do not <em>require</em> an application to use Web-based

+ * or EJB-based session management infrastructure - the client and/or server technoloy is irrelevent in

+ * JSecurity's architecture, allowing session management to be employed in the smallest standalone application

+ * to the largest enterprise deployments.

+ * <p/>

+ * This design decision opens up a new world to Java applications - most notably the ability to participate in

+ * a session regardless if the client is using HTTP, custom sockets, web services, or even non-Java progamming

+ * languages. Aside from JSecurity, there is currently no technology in Java today allows this heterogenous 

+ * client-session capability.

+ * <p/>

+ * Also because of this freedom, JSecurity naturally supports Single Sign-On for any application as well, using

+ * this heterogeneous session support.

+ */

+package org.jsecurity.session;
\ No newline at end of file
diff --git a/src/org/jsecurity/session/package.html b/src/org/jsecurity/session/package.html
deleted file mode 100644
index 04718b2..0000000
--- a/src/org/jsecurity/session/package.html
+++ /dev/null
@@ -1,36 +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>
-The Session package contains all interfaces and exceptions related to managing application
-sessions, the time-based data contexts in which a Subject interacts with an application.
-
-<p>Sessions in JSecurity are completely POJO-based and do not <em>require</em> an application to use
-    Web-based or EJB-based session management infrastructure - the client and/or server technoloy is
-    irrelevent in JSecurity's architecture, allowing session management to be employed in the smallest
-    standalone application to the largest enterprise deployments.</p>
-
-<p>This design decision opens up a new world to Java applications - most notably the ability to
-    participate in a session regardless if the client is using HTTP, custom sockets, web services,
-    or whatever. Aside from JSecurity, there is currently no technology in Java today allows this
-    heterogenous client-session capability. Because of this freedom, JSecurity naturally supports
-    Single Sign-On for any application.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/subject/package-info.java b/src/org/jsecurity/subject/package-info.java
new file mode 100644
index 0000000..81f0a67
--- /dev/null
+++ b/src/org/jsecurity/subject/package-info.java
@@ -0,0 +1,27 @@
+/*

+ * 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.

+ */

+/**

+ * Components supporting the {@link org.jsecurity.subject.Subject Subject} interface, the most important concept in

+ * JSecurity's API.

+ * <p/>

+ * A <code>Subject</code> is <em>the</em> primary component when using JSecurity programatically for single-user

+ * security operations, and it is the handle to any accessible user security data.  All single-user

+ * authentication, authorization and session operations are performed via a <code>Subject</code> instance.

+ */

+package org.jsecurity.subject;
\ No newline at end of file
diff --git a/src/org/jsecurity/subject/package.html b/src/org/jsecurity/subject/package.html
deleted file mode 100644
index d6a3dcb..0000000
--- a/src/org/jsecurity/subject/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>
-<body>
-Classes and interfaces related to JSecurity's root-level concept of a Subject.
-
-<p>A <tt>Subject</tt> is <em>the</em> primary entry point to using JSecurity programatically, and it is the
-    handle to any accessible user security data. All single-user authentication, authorization and session
-    operations are performed via the Subject.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/util/package-info.java b/src/org/jsecurity/util/package-info.java
new file mode 100644
index 0000000..cae7cd0
--- /dev/null
+++ b/src/org/jsecurity/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.

+ */

+/**

+ * Your run-of-the-mill 'util' pacakge for components and logic widely used across the framework that can't

+ * find their home into a proper OO hierarchy (or, most likely for things used across many hierarchies).

+ */

+package org.jsecurity.util;
\ No newline at end of file
diff --git a/src/org/jsecurity/util/package.html b/src/org/jsecurity/util/package.html
deleted file mode 100644
index 3676ab6..0000000
--- a/src/org/jsecurity/util/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>Your run-of-the-mill 'util' pacakge for components and logic widely used across the framework that can't find
-    their home into a proper OO hierarchy (or, for things used across many hierarchies).</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/web/attr/WebAttribute.java b/src/org/jsecurity/web/attr/WebAttribute.java
index cfd1f60..453cb37 100644
--- a/src/org/jsecurity/web/attr/WebAttribute.java
+++ b/src/org/jsecurity/web/attr/WebAttribute.java
@@ -25,7 +25,7 @@
  * A <tt>WebAttribute</tt> is a storage mechanism for a single object accessible during a web request.
  *
  * <p>It is used to make objects associated with the transient request persistent beyond the request so that they can
- * be retrieved upon a later request.
+ * be retrieved at a later time.
  *
  * @author Les Hazlewood
  * @since 0.2
diff --git a/src/org/jsecurity/web/attr/package-info.java b/src/org/jsecurity/web/attr/package-info.java
new file mode 100644
index 0000000..e822720
--- /dev/null
+++ b/src/org/jsecurity/web/attr/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.

+ */

+/**

+ * Supporting implementation of JSecurity's concept of a {@link org.jsecurity.web.attr.WebAttribute WebAttribute}, a

+ * component that can save and recall an object beyond transient requests.

+ */

+package org.jsecurity.web.attr;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/config/package-info.java b/src/org/jsecurity/web/config/package-info.java
new file mode 100644
index 0000000..32791ab
--- /dev/null
+++ b/src/org/jsecurity/web/config/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Web-specific implementation extensions to the <code>org.jsecurity.config</code> components.

+ */

+package org.jsecurity.web.config;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/filter/authc/package-info.java b/src/org/jsecurity/web/filter/authc/package-info.java
new file mode 100644
index 0000000..987c4c5
--- /dev/null
+++ b/src/org/jsecurity/web/filter/authc/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.

+ */

+/**

+ * Servlet {@link javax.servlet.Filter Filter} implementations specific to controlling access based on a

+ * subject's authentication status, or those that can execute authentications (log-ins) directly.

+ */

+package org.jsecurity.web.filter.authc;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/filter/authz/package-info.java b/src/org/jsecurity/web/filter/authz/package-info.java
new file mode 100644
index 0000000..a0aecb3
--- /dev/null
+++ b/src/org/jsecurity/web/filter/authz/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.

+ */

+/**

+ * Servlet {@link javax.servlet.Filter Filter} implementations that perform authorization (access control)

+ * checks based on the Subject's abilities (for example, role or permission checks).

+ */

+package org.jsecurity.web.filter.authz;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/filter/package-info.java b/src/org/jsecurity/web/filter/package-info.java
new file mode 100644
index 0000000..00a652c
--- /dev/null
+++ b/src/org/jsecurity/web/filter/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.

+ */

+/**

+ * Base package supporting all Servlet {@link javax.servlet.Filter Filter} implementations used to control

+ * access to web pages and URL resources.

+ */

+package org.jsecurity.web.filter;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/package-info.java b/src/org/jsecurity/web/package-info.java
new file mode 100644
index 0000000..b10a89b
--- /dev/null
+++ b/src/org/jsecurity/web/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Framework support for any web-enabled application.

+ */

+package org.jsecurity.web;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/package.html b/src/org/jsecurity/web/package.html
deleted file mode 100644
index 0ae0cdc..0000000
--- a/src/org/jsecurity/web/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>
-<body>
-
-<p>Provides interfaces and default implementations for all components used by JSecurity in the web/client-tier.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/web/servlet/package-info.java b/src/org/jsecurity/web/servlet/package-info.java
new file mode 100644
index 0000000..60dd3f3
--- /dev/null
+++ b/src/org/jsecurity/web/servlet/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.

+ */

+/**

+ * Support implementations that depend heavily on the <tt>javax.servlet.*</tt> API and are meant to be

+ * directly used in web.xml (Servlet Filters, Servlet Context Listeners, Servlets, etc)

+ */

+package org.jsecurity.web.servlet;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/servlet/package.html b/src/org/jsecurity/web/servlet/package.html
deleted file mode 100644
index a62056d..0000000
--- a/src/org/jsecurity/web/servlet/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>
-<body>
-
-<p>Provides concrete support implementations that depend heavily on the <tt>javax.servlet.*</tt> API
-    and are meant to be directly used in web.xml (Servlet Filters, Servlet Context Listeners,
-    Servlets, etc).</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/org/jsecurity/web/session/package-info.java b/src/org/jsecurity/web/session/package-info.java
new file mode 100644
index 0000000..8f59c05
--- /dev/null
+++ b/src/org/jsecurity/web/session/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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.

+ */

+/**

+ * Components supporting Session management in web-enabled applications.

+ */

+package org.jsecurity.web.session;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/tags/package-info.java b/src/org/jsecurity/web/tags/package-info.java
new file mode 100644
index 0000000..a89c19f
--- /dev/null
+++ b/src/org/jsecurity/web/tags/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.

+ */

+/**

+ * Provides the JSecurity JSP Tag Library implementations.

+ * <p/>

+ * JSecurity JSP Tags can be used to evalute or not evaluate (show or not show) parts of a JSP page based on the

+ * current user's authentication status and/or authorization (access control) abilities.

+ */

+package org.jsecurity.web.tags;
\ No newline at end of file
diff --git a/src/org/jsecurity/web/tags/package.html b/src/org/jsecurity/web/tags/package.html
deleted file mode 100644
index 5dc41fb..0000000
--- a/src/org/jsecurity/web/tags/package.html
+++ /dev/null
@@ -1,41 +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>Provides the JSecurity JSP Tag Library implementations.</p>
-
-<p>JSecurity JSP Tags can be used to evalute or not evaluate (show or not show) parts of a JSP page based on the
-    current user's authentication status and/or authorization (access control) abilities.</p>
-
-<p>The classes of most interest are:</p>
-
-<ul>
-    <li>AuthenticatedTag</li>
-    <li>NotAuthenticatedTag</li>
-    <li>HasRoleTag</li>
-    <li>LacksRoleTag</li>
-    <li>HasPermissionTag</li>
-    <li>LacksPermissionTag</li>
-</ul>
-
-<p>The other classes in this package are usually superclasses of those above for consolidating common behavior.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/support/spring/src/org/jsecurity/spring/package-info.java b/support/spring/src/org/jsecurity/spring/package-info.java
new file mode 100644
index 0000000..1388bf8
--- /dev/null
+++ b/support/spring/src/org/jsecurity/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.

+ */

+/**

+ * <a href="http://www.springframework.org" target="_top">Spring Application Framework</a> support for enabling

+ * JSecurity in spring applications.

+ */

+package org.jsecurity.spring;
\ No newline at end of file
diff --git a/support/spring/src/org/jsecurity/spring/remoting/package-info.java b/support/spring/src/org/jsecurity/spring/remoting/package-info.java
new file mode 100644
index 0000000..d78a261
--- /dev/null
+++ b/support/spring/src/org/jsecurity/spring/remoting/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.

+ */

+/**

+ * Support to enable Spring-based remote method invocations to carry a JSecurity session ID as part of the

+ * invocation payload, allowing remote clients to perform security operations.

+ */

+package org.jsecurity.spring.remoting;
\ No newline at end of file
diff --git a/support/spring/src/org/jsecurity/spring/security/interceptor/package-info.java b/support/spring/src/org/jsecurity/spring/security/interceptor/package-info.java
new file mode 100644
index 0000000..6cfb959
--- /dev/null
+++ b/support/spring/src/org/jsecurity/spring/security/interceptor/package-info.java
@@ -0,0 +1,22 @@
+/*

+ * 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 AOP support for enabling JSecurity annotations in Spring-configured applications. 

+ */

+package org.jsecurity.spring.security.interceptor;
\ No newline at end of file