[weld-commits] Weld SVN: r7030 - in archetypes/eap51-weld-jsf-webapp/trunk: src/deploy/resources and 1 other directories.

Author: dan.j.allen Date: 2010-10-12 21:41:24 -0400 (Tue, 12 Oct 2010) New Revision: 7030 Added: archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/application-ds.xml Removed: archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/default-ds.xml Modified: archetypes/eap51-weld-jsf-webapp/trunk/create-archetype.sh archetypes/eap51-weld-jsf-webapp/trunk/pom.xml archetypes/eap51-weld-jsf-webapp/trunk/src/main/resources/META-INF/persistence.xml Log: make data source file and name dynamic (linked to artifactId) Modified: archetypes/eap51-weld-jsf-webapp/trunk/create-archetype.sh =================================================================== --- archetypes/eap51-weld-jsf-webapp/trunk/create-archetype.sh 2010-10-12 19:18:16 UTC (rev 7029) +++ archetypes/eap51-weld-jsf-webapp/trunk/create-archetype.sh 2010-10-13 01:41:24 UTC (rev 7030) @@ -30,6 +30,9 @@ sed -i 's; ;;' $ARCHETYPE_RESOURCES_DIR/readme.txt sed -i 's;<name>eap51-weld-jsf-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml +sed -i 's;\(<jndi-name>\)[^<]\+\(</jndi-name>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/deploy/resources/application-ds.xml +sed -i 's;\(<jta-data-source>\)[^<]\+\(</jta-data-source>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources/META-INF/persistence.xml +mv $ARCHETYPE_RESOURCES_DIR/src/deploy/resources/application-ds.xml $ARCHETYPE_RESOURCES_DIR/src/deploy/resources/__artifactId__-ds.xml # fix the archetype plugin being an idiot find $ARCHETYPE_RESOURCES_DIR -type f -exec sed -i 's;packageInPathFormat;package;g' {} \; # remove local file that NetBeans add to source project Modified: archetypes/eap51-weld-jsf-webapp/trunk/pom.xml =================================================================== --- archetypes/eap51-weld-jsf-webapp/trunk/pom.xml 2010-10-12 19:18:16 UTC (rev 7029) +++ archetypes/eap51-weld-jsf-webapp/trunk/pom.xml 2010-10-13 01:41:24 UTC (rev 7030) @@ -272,7 +272,7 @@ <serverName>${jboss-eap.conf}</serverName> <fileNames> <!-- JNDI DataSource that connects to in-memory HSQLDB to demonstrate JPA --> - <fileName>src/deploy/resources/default-ds.xml</fileName> + <fileName>src/deploy/resources/${project.artifactId}-ds.xml</fileName> <!-- DataSource needs to go before the application --> <fileName>${project.build.directory}/${project.build.finalName}.war</fileName> </fileNames> Copied: archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/application-ds.xml (from rev 7026, archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/default-ds.xml) =================================================================== --- archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/application-ds.xml (rev 0) +++ archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/application-ds.xml 2010-10-13 01:41:24 UTC (rev 7030) @@ -0,0 +1,15 @@ +<?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>jdbc/eap51-weld-jsf-webapp</jndi-name> + <use-java-context>false</use-java-context> + <connection-url>jdbc:hsqldb:.</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + </local-tx-datasource> +</datasources> Deleted: archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/default-ds.xml =================================================================== --- archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/default-ds.xml 2010-10-12 19:18:16 UTC (rev 7029) +++ archetypes/eap51-weld-jsf-webapp/trunk/src/deploy/resources/default-ds.xml 2010-10-13 01:41:24 UTC (rev 7030) @@ -1,15 +0,0 @@ -<?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>jdbc/__default</jndi-name> - <use-java-context>false</use-java-context> - <connection-url>jdbc:hsqldb:.</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - <min-pool-size>5</min-pool-size> - <max-pool-size>20</max-pool-size> - </local-tx-datasource> -</datasources> Modified: archetypes/eap51-weld-jsf-webapp/trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- archetypes/eap51-weld-jsf-webapp/trunk/src/main/resources/META-INF/persistence.xml 2010-10-12 19:18:16 UTC (rev 7029) +++ archetypes/eap51-weld-jsf-webapp/trunk/src/main/resources/META-INF/persistence.xml 2010-10-13 01:41:24 UTC (rev 7030) @@ -6,8 +6,8 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> <persistence-unit name="primary"> - <!-- DataSource defined in default-ds.xml --> - <jta-data-source>jdbc/__default</jta-data-source> + <!-- DataSource defined in src/deploy/resources/*-ds.xml --> + <jta-data-source>jdbc/eap51-weld-jsf-webapp</jta-data-source> <properties> <!-- Properties for Hibernate (default provider for JBoss AS) --> <property name="hibernate.hbm2ddl.auto" value="create-drop"/>