Author: dan.j.allen Date: 2009-12-17 16:57:40 -0500 (Thu, 17 Dec 2009) New Revision: 5341 Added: archetypes/tags/1.0.0-BETA1/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml Removed: archetypes/tags/1.0.0-BETA1/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/ archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml Log: move beans.xml to WEB-INF to be compliant with JSR-299 packaging rules Deleted: archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml =================================================================== --- archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-12-17 21:55:11 UTC (rev 5340) +++ archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml 2009-12-17 21:57:40 UTC (rev 5341) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> - <alternatives/> - <decorators/> - <interceptors/> -</beans> Copied: archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (from rev 5326, archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml) =================================================================== --- archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (rev 0) +++ archetypes/tags/1.0.0-BETA1/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml 2009-12-17 21:57:40 UTC (rev 5341) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> + <alternatives/> + <decorators/> + <interceptors/> +</beans> Copied: archetypes/tags/1.0.0-BETA1/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (from rev 5326, archetypes/tags/1.0.0-BETA1/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml) =================================================================== --- archetypes/tags/1.0.0-BETA1/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (rev 0) +++ archetypes/tags/1.0.0-BETA1/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml 2009-12-17 21:57:40 UTC (rev 5341) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + The contents of this file is permitted to be empty. + The schema definition is provided for your convenience. +--> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> +</beans>