+ JavaDoc updates

+ added objectweb.asm back to .classpath to satisfy transitive need from groovy tests
+ package.html -> package-info.java


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@788 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context/.classpath

@@ -9,6 +9,8 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-3.1.0.jar" sourcepath="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-sources-3.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-3.1.0.jar" sourcepath="IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-sources-3.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.4.0/com.springsource.org.apache.commons.pool-1.4.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.4.0/com.springsource.org.apache.commons.pool-sources-1.4.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.jruby/com.springsource.org.jruby/1.1.0/com.springsource.org.jruby-1.1.0.jar" sourcepath="/IVY_CACHE/org.jruby/com.springsource.org.jruby/1.1.0/com.springsource.org.jruby-sources-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-1.5.1.jar" sourcepath="/IVY_CACHE/org.codehaus.groovy/com.springsource.org.codehaus.groovy/1.5.1/com.springsource.org.codehaus.groovy-sources-1.5.1.jar"/>

org.springframework.context/src/main/java/org/springframework/context/annotation/Bean.java

@@ -21,8 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.context.annotation.Scope;
-
 
 /**
  * Indicates that a method produces a bean to be managed by the Spring container. The
@@ -59,6 +57,9 @@ import org.springframework.context.annotation.Scope;
  * @author Chris Beams
  * @since 3.0
  * @see Configuration
+ * @see Lazy
+ * @see Primary
+ * @see Scope
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
@@ -98,6 +99,5 @@ public @interface Bean {
 
 // TODO: test @Lazy @Bean
 // TODO: test @Primary @Bean
-// TODO: test Bean alias scenarios
 // TODO: test init/destroy method scenarios
 // TODO: test dependsOn

org.springframework.context/src/main/java/org/springframework/context/annotation/Configuration.java

@@ -22,8 +22,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 
@@ -32,9 +32,10 @@ import org.springframework.stereotype.Component;
  * by the Spring container to generate bean definitions and service requests for those beans
  * at runtime.
  * 
- * <p>Configuration is itself annotated as a {@link Component}, therefore Configuration
+ * <p>Configuration is meta-annotated as a {@link Component}, therefore Configuration
  * classes are candidates for component-scanning and may also take advantage of
- * {@link Autowire} at the field and method and constructor level.
+ * {@link Autowired} at the field, method and constructor level. Externalized values
+ * may be wired into Configuration classes using the {@link Value} annotation.
  * 
  * <p>May be used in conjunction with the {@link Lazy} annotation to indicate that all Bean
  * methods declared within this class are by default lazily initialized.
@@ -43,17 +44,17 @@ import org.springframework.stereotype.Component;
  * <ul>
  *    <li>Configuration classes must be non-final
  *    <li>Configuration classes must be non-local (may not be declared within a method)
- *    <li>Configuration classes must have a default/no-arg constructor or an
+ *    <li>Configuration classes must have a default/no-arg constructor or at least one
  *        {@link Autowired} constructor
  * </ul>
  * 
- * 
  * @author Rod Johnson
  * @author Chris Beams
  * @since 3.0
- * @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
  * @see Bean
  * @see Lazy
+ * @see Value
+ * @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
  */
 @Component
 @Target( { ElementType.TYPE })
@@ -64,6 +65,6 @@ public @interface Configuration {
 
 }
 
-// TODO: test constructor autowiring<br>
-// TODO: test private Configuration classes<br>
-// TODO: test @Lazy @Configuration<br>
+// TODO: test @Configuration constructor autowiring
+// TODO: test @Lazy @Configuration
+

org.springframework.context/src/main/java/org/springframework/context/annotation/package-info.java

@@ -0,0 +1,10 @@
+/**
+ * Annotation support for context configuration, including classpath scanning for
+ * {@link org.springframework.beans.factory.annotation.Autowired} candidates
+ * and {@link Configuration} class processing.
+ * 
+ * @author Juergen Hoeller
+ * @author Mark Fisher
+ * @author Chris Beams
+ */
+package org.springframework.context.annotation;

org.springframework.context/src/main/java/org/springframework/context/annotation/package.html

@@ -1,8 +0,0 @@
-<html>
-<body>
-
-Annotation support for context configuration,
-including classpath scanning for autowire candidates.
-
-</body>
-</html>