Author: manaRH Date: 2012-04-29 16:49:53 -0400 (Sun, 29 Apr 2012) New Revision: 14643 Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/application.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev-war.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod-war.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test-war.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/faces-config.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/web.xml branches/community/Seam_2_3/jboss-seam-gen/dist/resources/datasource-ds.xml Log: JBSEAM-4918 migrations for persistence.xml, datasource, web.xml and faces-config.xml Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/application.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/application.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/application.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <application 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/application_5.xsd" - version="5"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd" + version="6"> <display-name>@projectName@</display-name> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev-war.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev-war.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev-war.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -2,8 +2,8 @@ <!-- Persistence deployment descriptor for dev profile --> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> <persistence-unit name="@projectName@" transaction-type="JTA"> <provider>org.hibernate.ejb.HibernatePersistence</provider> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-dev.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -2,8 +2,8 @@ <!-- Persistence deployment descriptor for dev profile --> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> <persistence-unit name="@projectName@"> <provider>org.hibernate.ejb.HibernatePersistence</provider> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod-war.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod-war.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod-war.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -2,8 +2,8 @@ <!-- Persistence deployment descriptor for prod profile --> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> <persistence-unit name="@projectName@" transaction-type="JTA"> <provider>org.hibernate.ejb.HibernatePersistence</provider> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-prod.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -2,8 +2,8 @@ <!-- Persistence deployment descriptor for prod profile --> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> <persistence-unit name="@projectName@"> <provider>org.hibernate.ejb.HibernatePersistence</provider> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test-war.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test-war.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test-war.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -2,12 +2,12 @@ <!-- Persistence deployment descriptor for tests --> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> <persistence-unit name="@projectName@" transaction-type="JTA"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/DefaultDS</jta-data-source> + <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/META-INF/persistence-test.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -2,12 +2,12 @@ <!-- Persistence deployment descriptor for tests --> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> <persistence-unit name="@projectName@"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/DefaultDS</jta-data-source> + <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/faces-config.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/faces-config.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" +<faces-config version="2.0" 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/web-facesconfig_1_2.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> <application> <locale-config> @@ -14,8 +14,7 @@ <supported-locale>it</supported-locale> <supported-locale>tr</supported-locale> <supported-locale>da</supported-locale> - </locale-config> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </locale-config> </application> </faces-config> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/web.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/WEB-INF/web.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -7,36 +7,30 @@ <!-- RichFaces --> <context-param> - <param-name>org.richfaces.SKIN</param-name> + <param-name>org.richfaces.skin</param-name> <param-value>@skin@</param-value> </context-param> <!-- Suppress spurious stylesheets --> <context-param> - <param-name>org.richfaces.CONTROL_SKINNING</param-name> + <param-name>org.richfaces.enableControlSkinning</param-name> <param-value>disable</param-value> </context-param> <context-param> - <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> + <param-name>org.richfaces.enableControlSkinningClasses</param-name> <param-value>disable</param-value> </context-param> <!-- Change load strategy to DEFAULT to disable sending scripts/styles as packs --> <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>ALL</param-value> + <param-name>org.richfaces.resourceOptimization.enabled</param-name> + <param-value>true</param-value> </context-param> - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>ALL</param-value> - </context-param> - <!-- Seam --> - <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> </listener> @@ -61,15 +55,13 @@ <url-pattern>/seam/resource/*</url-pattern> </servlet-mapping> - <!-- Facelets development mode (disable in production) --> +<!-- Change to "Production" when you are ready to deploy --> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>@debug@</param-value> - </context-param> - <!-- JSF --> - <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/datasource-ds.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/datasource-ds.xml 2012-04-29 20:49:37 UTC (rev 14642) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/datasource-ds.xml 2012-04-29 20:49:53 UTC (rev 14643) @@ -1,16 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> -<datasources> - - <local-tx-datasource> - <jndi-name>@projectName@Datasource</jndi-name> - <use-java-context>true</use-java-context> - <connection-url>@jdbcUrl@</connection-url> - <driver-class>@driverClass@</driver-class> - <user-name>@username@</user-name> - <password>@password@</password> - </local-tx-datasource> - +<datasources xmlns="http://www.jboss.org/ironjacamar/schema"> + <datasource + jndi-name=@projectName@Datasource + enabled="true" + use-java-context="true" pool-name="@projectName@Datasource_pool"> + <connection-url>@jdbcUrl@</connection-url> + <driver&gt;@database.type(a)&lt;/driver&gt; + <security> + <user-name>@username@</user-name> + <password>@password@</password> + </security> + </datasource> </datasources>