May 2010 - seam-commits - Jboss List Archives

Seam SVN: r12706 - in modules/jms/trunk: api and 2 other directories.

by seam-commits＠lists.jboss.org

Author: jganoff Date: 2010-05-10 21:00:09 -0400 (Mon, 10 May 2010) New Revision: 12706 Modified: modules/jms/trunk/api/pom.xml modules/jms/trunk/docs/reference/pom.xml modules/jms/trunk/impl/pom.xml modules/jms/trunk/pom.xml Log: [maven-release-plugin] prepare release 3.0.0.Alpha1 Modified: modules/jms/trunk/api/pom.xml =================================================================== --- modules/jms/trunk/api/pom.xml 2010-05-11 00:53:04 UTC (rev 12705) +++ modules/jms/trunk/api/pom.xml 2010-05-11 01:00:09 UTC (rev 12706) @@ -1,31 +1,30 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jms-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>seam-jms</artifactId> - <name>Seam JMS API</name> - <description>Client View of the Seam JMS Module</description> - - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-parent</artifactId> + <version>3.0.0.Alpha1</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>seam-jms</artifactId> + <name>Seam JMS API</name> + <description>Client View of the Seam JMS Module</description> + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> Modified: modules/jms/trunk/docs/reference/pom.xml =================================================================== --- modules/jms/trunk/docs/reference/pom.xml 2010-05-11 00:53:04 UTC (rev 12705) +++ modules/jms/trunk/docs/reference/pom.xml 2010-05-11 01:00:09 UTC (rev 12706) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.seam</groupId> <artifactId>seam-jms-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.Alpha1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: modules/jms/trunk/impl/pom.xml =================================================================== --- modules/jms/trunk/impl/pom.xml 2010-05-11 00:53:04 UTC (rev 12705) +++ modules/jms/trunk/impl/pom.xml 2010-05-11 01:00:09 UTC (rev 12706) @@ -1,102 +1,101 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jms-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>seam-jms-impl</artifactId> - <name>Seam JMS Implementation</name> - <description>Implementation of the Seam JMS Module</description> - - <properties> - <arquillian.version>1.0.0.Alpha1</arquillian.version> - </properties> - - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jms</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-junit</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-jbossas-remote-60</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-parent</artifactId> + <version>3.0.0.Alpha1</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>seam-jms-impl</artifactId> + <name>Seam JMS Implementation</name> + <description>Implementation of the Seam JMS Module</description> + + <properties> + <arquillian.version>1.0.0.Alpha1</arquillian.version> + </properties> + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-jbossas-remote-60</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>code-coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Modified: modules/jms/trunk/pom.xml =================================================================== --- modules/jms/trunk/pom.xml 2010-05-11 00:53:04 UTC (rev 12705) +++ modules/jms/trunk/pom.xml 2010-05-11 01:00:09 UTC (rev 12706) @@ -1,258 +1,254 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>9</version> - </parent> - - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jms-parent</artifactId> - <packaging>pom</packaging> - <name>Seam JMS Parent</name> - <version>3.0.0-SNAPSHOT</version> - - <url>http://sfwk.org/Seam3/JMSModule</url> - - <properties> - <seam.jms.version>3.0.0-SNAPSHOT</seam.jms.version> - <weld.api.version>1.0-SP1</weld.api.version> - <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> - <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> - <jboss.maven.plugin.version>1.4</jboss.maven.plugin.version> - <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version> - <cargo.maven2.plugin.version>1.0-beta-2</cargo.maven2.plugin.version> - </properties> - - <modules> - <module>api</module> - <module>impl</module> - <module>docs/reference</module> -  - </modules> - -  - <profiles> - <profile> - <id>distribution</id> - <modules> - <module>dist</module> - </modules> - </profile> - <profile> - <id>code-coverage</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>${emma.maven.plugin.version}</version> - <inherited>true</inherited> - <executions> - <execution> - <id>instrumentation</id> - <phase>process-classes</phase> - <goals> - <goal>instrument</goal> - </goals> - <configuration> - <verbose>true</verbose> - </configuration> - </execution> - <execution> - <id>cleaning</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <forkMode>once</forkMode> - <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>${cargo.maven2.plugin.version}</version> - <executions> - <execution> - <id>start-container</id> - <phase>process-test-classes</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - - <configuration> - <wait>false</wait> - <container> - <containerId>jboss5x</containerId> - <home>${env.JBOSS_HOME}</home> - <timeout>300000</timeout>  - </container> - <configuration> - <type>existing</type> - <home>${env.JBOSS_HOME}/server/default</home> - <properties> - <cargo.jboss.configuration>default</cargo.jboss.configuration> - <cargo.rmi.port>1099</cargo.rmi.port> - </properties> - </configuration> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven.antrun.plugin.version}</version> - <executions> - <execution> - <id>deploy-emma-jar</id> - <phase>process-test-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <echo message="Deploying emma jar to server lib directory" /> - <copy file="${emma.jar.file}" todir="${env.JBOSS_HOME}/server/default/lib" - overwrite="true" /> - </tasks> - </configuration> - </execution> - <execution> - <id>retrieve-coverage-file</id> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <echo - message="Moving coverage.ec file to current modele from parent module" /> - <property name="coverage.file" value="${basedir}/../coverage.ec" /> - <waitfor maxwait="30" maxwaitunit="second"> - <available file="${coverage.file}" /> - </waitfor> - <move file="${coverage.file}" todir="${basedir}" - failonerror="false" /> - <delete file="${basedir}/transaction.log" failonerror="false" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - <version>${emma4it.maven.plugin.version}</version> - <executions> - <execution> - <id>report</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <sourceSets> - <sourceSet> - <directory>${project.build.sourceDirectory}</directory> - </sourceSet> - </sourceSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> - - <developers> - <developer> - <name>Jordan Ganoff</name> - <email>jganoff(a)gmail.com</email> - <timezone>EST</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - </developers> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions</artifactId> - <version>1.0.0.Alpha1</version> - </dependency> - -  - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jms</artifactId> - <version>${seam.jms.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jms-impl</artifactId> - <version>${seam.jms.version}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> - </dependency> - </dependencies> - </dependencyManagement> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/jms/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/jms/trunk</url> - </scm> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>9</version> + </parent> + + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-parent</artifactId> + <packaging>pom</packaging> + <name>Seam JMS Parent</name> + <version>3.0.0.Alpha1</version> + + <url>http://sfwk.org/Seam3/JMSModule</url> + + <properties> + <seam.jms.version>3.0.0.Alpha1</seam.jms.version> + <weld.api.version>1.0-SP1</weld.api.version> + <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> + <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> + <jboss.maven.plugin.version>1.4</jboss.maven.plugin.version> + <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version> + <cargo.maven2.plugin.version>1.0-beta-2</cargo.maven2.plugin.version> + </properties> + + <modules> + <module>api</module> + <module>impl</module> + <module>docs/reference</module> +  + </modules> + +  + <profiles> + <profile> + <id>distribution</id> + <modules> + <module>dist</module> + </modules> + </profile> + <profile> + <id>code-coverage</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <version>${emma.maven.plugin.version}</version> + <inherited>true</inherited> + <executions> + <execution> + <id>instrumentation</id> + <phase>process-classes</phase> + <goals> + <goal>instrument</goal> + </goals> + <configuration> + <verbose>true</verbose> + </configuration> + </execution> + <execution> + <id>cleaning</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <forkMode>once</forkMode> + <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargo.maven2.plugin.version}</version> + <executions> + <execution> + <id>start-container</id> + <phase>process-test-classes</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + + <configuration> + <wait>false</wait> + <container> + <containerId>jboss5x</containerId> + <home>${env.JBOSS_HOME}</home> + <timeout>300000</timeout>  + </container> + <configuration> + <type>existing</type> + <home>${env.JBOSS_HOME}/server/default</home> + <properties> + <cargo.jboss.configuration>default</cargo.jboss.configuration> + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> + </configuration> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven.antrun.plugin.version}</version> + <executions> + <execution> + <id>deploy-emma-jar</id> + <phase>process-test-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo message="Deploying emma jar to server lib directory" /> + <copy file="${emma.jar.file}" todir="${env.JBOSS_HOME}/server/default/lib" overwrite="true" /> + </tasks> + </configuration> + </execution> + <execution> + <id>retrieve-coverage-file</id> + <phase>test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo message="Moving coverage.ec file to current modele from parent module" /> + <property name="coverage.file" value="${basedir}/../coverage.ec" /> + <waitfor maxwait="30" maxwaitunit="second"> + <available file="${coverage.file}" /> + </waitfor> + <move file="${coverage.file}" todir="${basedir}" failonerror="false" /> + <delete file="${basedir}/transaction.log" failonerror="false" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + <version>${emma4it.maven.plugin.version}</version> + <executions> + <execution> + <id>report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <sourceSets> + <sourceSet> + <directory>${project.build.sourceDirectory}</directory> + </sourceSet> + </sourceSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> + + <developers> + <developer> + <name>Jordan Ganoff</name> + <email>jganoff(a)gmail.com</email> + <timezone>EST</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + </developers> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <version>1.0.0.Alpha1</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms</artifactId> + <version>${seam.jms.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-jms-impl</artifactId> + <version>${seam.jms.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.10</version> + </dependency> + </dependencies> + </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/tags/3.0.0.Alpha1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/jms/tags/3.0.0.Alpha1</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/jms/tags/3.0.0.Alpha1</url> + </scm> +</project>

13 years, 11 months

1
0
0 / 0

Seam SVN: r12705 - modules/jms/trunk.

by seam-commits＠lists.jboss.org

Author: jganoff Date: 2010-05-10 20:53:04 -0400 (Mon, 10 May 2010) New Revision: 12705 Modified: modules/jms/trunk/readme.txt Log: Updated readme to match description on http://sfwk.org/Seam3/JMSModule Modified: modules/jms/trunk/readme.txt =================================================================== --- modules/jms/trunk/readme.txt 2010-05-11 00:00:15 UTC (rev 12704) +++ modules/jms/trunk/readme.txt 2010-05-11 00:53:04 UTC (rev 12705) @@ -16,6 +16,6 @@ - Message Producer - Message Consumer -Forwarding of Events - - Implicit - use a stereotype annotation when firing events - - Explicit - events and qualifiers are registered explicitly \ No newline at end of file +Event Bridge + - Egress: Routes CDI events to JMS destinations + - Ingress: Fires CDI events based on the reception of JMS messages \ No newline at end of file

13 years, 11 months

1
0
0 / 0

Seam SVN: r12704 - modules/jms/trunk/docs/reference/src/main/docbook/en-US.

by seam-commits＠lists.jboss.org

Author: jganoff Date: 2010-05-10 20:00:15 -0400 (Mon, 10 May 2010) New Revision: 12704 Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml Removed: modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml Log: Updated documentation Deleted: modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml =================================================================== --- modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml 2010-05-10 11:57:27 UTC (rev 12703) +++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml 2010-05-11 00:00:15 UTC (rev 12704) @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []> -<chapter id="gettingstarted"> - <title>Getting Started</title> - - <para> - In this chapter we'll look at how to inject JMS resources and route events over JMS. - </para> - - <section id="injection"> - <title>JMS Resource Injection</title> - - <para>The following JMS resources are now available for injection:</para> - - <itemizedlist> - <listitem> - javax.jms.Connection - </listitem> - <listitem> - javax.jms.Session - </listitem> - </itemizedlist> - - <para>Destination-based resources:</para> - <itemizedlist> - <listitem> - javax.jms.Topic - </listitem> - <listitem> - javax.jms.Queue - </listitem> - <listitem> - javax.jms.TopicPublisher - </listitem> - <listitem> - javax.jms.QueueSender - </listitem> - <listitem> - javax.jms.TopicSubscriber - </listitem> - <listitem> - javax.jms.QueueReceiver - </listitem> - </itemizedlist> - -  - - <section id="injection.destination-based"> - <title>Destination Based Injection</title> - - <para> - The injection of resources that are themselves a <literal>javax.jms.Destination</literal> or require one needs - a hint: What destination do you want to work with? This is provided by the - <literal>@JmsDestination</literal> annotatation. - - <programlisting role="Java"> -@Inject @JmsDestination(jndiName="jms/MyTopic") Topic t; -@Inject @JmsDestination(jndiName="jms/MyQueue") Queue q;</programlisting> - </para> - - <para> - You should create your own qualifier to provide type safe injection of predefined destinations: - <programlisting role="Java"> -@Qualifier -@JmsDestination(jndiName = "jms/MyTopic") -public @interface MyTopic {}</programlisting> - </para> - - <para> - You can then use it in place of the <literal>@JmsDestination</literal> qualifier anywhere it's required: - - <programlisting role="Java"> -@Inject @MyTopic TopicPublisher myPub;</programlisting> - </para> - </section> - </section> - - <section id="routing-egress"> - <title>Routing Events over JMS</title> - - <para>TODO</para> - </section> -</chapter> Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml =================================================================== --- modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-05-10 11:57:27 UTC (rev 12703) +++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-05-11 00:00:15 UTC (rev 12704) @@ -25,15 +25,20 @@ <chapter id="installation"> <title>Installation</title> + + <para> + Seam JMS can be used by including a few libraries in your application's library folder: + </para> + + <itemizedlist> + <listitem>seam-jms.jar</listitem> + <listitem>seam-jms-impl.jar</listitem> + <listitem>weld-extensions.jar</listitem> + </itemizedlist> <para> - Most features of Seam JMS are installed automatically by - including the seam-jms.jar in your application's library folder. - If you are using - <ulink - url="http://maven.apache.org/">Maven - </ulink> - as your build tool use the following dependency: + If you are using <ulink url="http://maven.apache.org/">Maven</ulink> as your build tool use the following + dependency: </para> <programlisting role="XML"><![CDATA[<dependency> @@ -43,6 +48,8 @@ </dependency>]]></programlisting> <tip> - <para>Define or replace the property ${seam.jms.version} with a valid version of Seam JMS.</para> + <para> + Define or replace the property ${seam.jms.version} with a valid version of Seam JMS. + </para> </tip> </chapter> Modified: modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml =================================================================== --- modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-05-10 11:57:27 UTC (rev 12703) +++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-05-11 00:00:15 UTC (rev 12704) @@ -27,5 +27,6 @@ <toc /> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro.xml" /> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml" /> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettingstarted.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="resource-injection.xml" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="routing.xml" /> </book> Copied: modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml (from rev 12703, modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml) =================================================================== --- modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml (rev 0) +++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/resource-injection.xml 2010-05-11 00:00:15 UTC (rev 12704) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []> +<chapter id="resource-injection"> + <title>Resource Injection</title> + + <para> + In this chapter we'll look at how to inject some of the common JMS resource types. + </para> + + <section id="injection"> + <title>JMS Resource Injection</title> + + <para>The following JMS resources are now available for injection:</para> + + <itemizedlist> + <listitem> + javax.jms.Connection + </listitem> + <listitem> + javax.jms.Session + </listitem> + </itemizedlist> + + <para>Destination-based resources:</para> + <itemizedlist> + <listitem> + javax.jms.Topic + </listitem> + <listitem> + javax.jms.Queue + </listitem> + <listitem> + javax.jms.TopicPublisher + </listitem> + <listitem> + javax.jms.QueueSender + </listitem> + <listitem> + javax.jms.TopicSubscriber + </listitem> + <listitem> + javax.jms.QueueReceiver + </listitem> + </itemizedlist> + + <section id="injection.destination-based"> + <title>Destination Based Injection</title> + + <para> + The injection of resources that are themselves a <literal>javax.jms.Destination</literal> or require one needs + a hint: What destination do you want to work with? This is provided by the + <literal>@JmsDestination</literal> annotatation. + + <programlisting role="Java"> +@Inject @JmsDestination(jndiName="jms/MyTopic") Topic t; +@Inject @JmsDestination(jndiName="jms/MyQueue") Queue q;</programlisting> + </para> + + <para> + You should create your own qualifier to provide type safe injection of predefined destinations: + <programlisting role="Java"> +@Qualifier +@JmsDestination(jndiName = "jms/MyTopic") +public @interface MyTopic {}</programlisting> + </para> + + <para> + You can then use it in place of the <literal>@JmsDestination</literal> qualifier anywhere it's required: + + <programlisting role="Java"> +@Inject @MyTopic TopicPublisher myPub; +... +@Inject @MyTopic Topic myTopic;</programlisting> + </para> + </section> + + <section id="injection.configuration"> + <title>Resource Configuration</title> + + <para> + You can use the <literal>@JmsSession</literal> qualifier when injecting <literal>javax.jms.Session</literal> to specify transacted and acknowledgement type: + <programlisting role="Java"> +@Inject @JmsSession(transacted=true, acknowledgementType=Session.CLIENT_ACKNOWLEDGE) Session s; +</programlisting> + </para> + + <para> + TODO Add other configuration options as they are implemented. + </para> + </section> + </section> +</chapter> Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml =================================================================== --- modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml (rev 0) +++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/routing.xml 2010-05-11 00:00:15 UTC (rev 12704) @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []> +<chapter id="routing"> + <title>Bridging the Gap</title> + + <para> + This chapter is designed to detail how to configure the CDI to JMS event bridge. Routing has two sides, sending + of events to JMS destinations and translating received messages from JMS destinations back into CDI events. The + sections of this chapter will describe how to achieve both. + </para> + + <section id="routing.egress"> + <title>Routing CDI Events to JMS</title> + + <para> + The act of simply sending a message to a JMS destination involves a few players: Connection, Session, + Destination, and the message itself. Surely you can inject all required resources and perform the forwarding + yourself but that takes away from the whole reason you're using a tool in the first place! Let's let a little + configuration do the work for us. + </para> + + <section id="routing.egress.config"> + <title>Configuration</title> + <para> + Introducing the <literal>JmsForwarding</literal> interface: + <programlisting role="Java">@Named +@ApplicationScoped +public interface JmsForwarding +{ + public Set<? extends Destination> getDestinations(); + public Type getEventType(); + public Set<Annotation> getQualifiers(); +}</programlisting> + </para> + + <para> + The <literal>JmsForwarding</literal> interface allows for simple mapping of event types, complete with + qualifiers, to a set of destinations. Every bean found implementing <literal>JmsForwarding</literal> will be + used to create a bridge from CDI to the JMS world, forwarding all events that match the event type and + qualifiers returned. + </para> + + <caution> + <para> + <literal>JmsForwarding.getQualifiers()</literal> should only return annotations that are in fact + qualifiers. If not, Seam JMS will detect the problem and treat it as a deployment problem. + </para> + </caution> + + <tip> + <para> + Since your <literal>JmsForwarding</literal> objects are CDI Beans you can use dependency injection to + obtain the destinations you wish to forward to. + </para> + </tip> + </section> + + <section id="routing.egress.usage"> + + <title>Usage</title> + <para> + With your configuration bean defined you can simply fire events that match a configuration's event type and + qualifiers and these events will be forwarded over JMS as object messages. + + <programlisting role="Java">@Inject @Bridged Event<MyObject> event; +... +event.fire(myObject);</programlisting> + </para> + </section> + + <section id="routing.egress.sample"> + <title>Egress Routing Sample</title> + + <para> + Here's a sample configuration that will match any <literal>MyObject</literal> event fired with the + qualifier <literal>@Bridged</literal>: + + <programlisting role="Java">@Named +@ApplicationScoped +public class MyForwarding implements JmsForwarding +{ + @Inject @MyTopic private Topic t; + + public Set<? extends Destination> getDestinations() + { + return Collections.singleton(t); + } + + public Type getEventType() + { + return MyObject.class; + } + + public Set<Annotation> getQualifiers() + { + return Collections.<Annotation> singleton(new AnnotationLiteral<Bridged>(){}); + } +}</programlisting> + </para> + + <para> + And here's an event that will be sent to JMS due to the configuration above: + <programlisting role="Java">@Inject @Bridged Event<MyObject> event; +... +event.fire(myObject);</programlisting> + </para> + + <para> + TODO Reference to example showing this off + </para> + </section> + </section> + + <section id="routing.ingress"> + <title>CDI Events from JMS Messages</title> + + <para> + + </para> + + <para> + TODO Add documentation when implemented + </para> + </section> +</chapter> + \ No newline at end of file

13 years, 11 months

1
0
0 / 0

Seam SVN: r12703 - in modules/xml/trunk/impl: src/main/java/org/jboss/seam/xml/bootstrap and 4 other directories.

by seam-commits＠lists.jboss.org

Author: swd847 Date: 2010-05-10 07:57:27 -0400 (Mon, 10 May 2010) New Revision: 12703 Modified: modules/xml/trunk/impl/pom.xml modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java Log: updated to build against weld-extensions head Modified: modules/xml/trunk/impl/pom.xml =================================================================== --- modules/xml/trunk/impl/pom.xml 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/pom.xml 2010-05-10 11:57:27 UTC (rev 12703) @@ -49,6 +49,13 @@ <version>1.0.1-Final</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + <version>1.5.10</version> + </dependency> <dependency> <groupId>org.testng</groupId> Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -35,6 +35,7 @@ import org.jboss.seam.xml.annotations.internal.ApplyQualifiers; import org.jboss.seam.xml.core.BeanResult; +import org.jboss.seam.xml.core.BeanResultType; import org.jboss.seam.xml.core.GenericBeanResult; import org.jboss.seam.xml.core.XmlConfiguredBean; import org.jboss.seam.xml.core.XmlId; @@ -45,8 +46,8 @@ import org.jboss.seam.xml.parser.ParserMain; import org.jboss.seam.xml.parser.SaxNode; import org.jboss.seam.xml.util.FileDataReader; +import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder; import org.jboss.weld.extensions.util.AnnotationInstanceProvider; -import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -151,9 +152,9 @@ for (BeanResult<?> bb : r.getBeans()) { GenericBeanResult found = null; - for(Class g : genericBeans.keySet()) + for (Class<?> g : genericBeans.keySet()) { - if(g.isAssignableFrom(bb.getType())) + if (g.isAssignableFrom(bb.getType())) { found = genericBeans.get(g); break; @@ -196,7 +197,7 @@ return; } boolean found = false; - NewAnnotatedTypeBuilder builder = new NewAnnotatedTypeBuilder(event.getAnnotatedType()); + AnnotatedTypeBuilder builder = AnnotatedTypeBuilder.newInstance(event.getAnnotatedType()); for (XmlResult r : results) { for (BeanResult<?> i : r.getInterfaces()) @@ -312,12 +313,16 @@ { AnnotatedType<?> type = c.getBuilder().create(); - NewAnnotatedTypeBuilder<?> gb = new NewAnnotatedTypeBuilder(type); - //if the original type was qualified @Default we add that as well - if(!isQualifierPresent(type, beanManager)) + AnnotatedTypeBuilder<?> gb = AnnotatedTypeBuilder.newInstance(type); + if (c.getBeanType() == BeanResultType.SPECIALISE) { - gb.addToClass( new DefaultLiteral()); + gb.readAnnotationsFromUnderlyingType(); } + // if the original type was qualified @Default we add that as well + if (!isQualifierPresent(type, beanManager)) + { + gb.addToClass(new DefaultLiteral()); + } // we always apply qualifiers to the actual type for (Annotation q : qualifiers) { @@ -326,11 +331,13 @@ for (AnnotatedField<?> f : type.getFields()) { if (f.isAnnotationPresent(ApplyQualifiers.class)) - { - //we need to manually add @default as it stops being applied when - //we add our qualifiers, however if we are deling with the main type we do not - //bother, as it should not be qualified @Default - if(!isQualifierPresent(f, beanManager) && f.getJavaMember().getType() != rootType.getJavaClass()) + { + // we need to manually add @default as it stops being applied + // when + // we add our qualifiers, however if we are deling with the main + // type we do not + // bother, as it should not be qualified @Default + if (!isQualifierPresent(f, beanManager) && f.getJavaMember().getType() != rootType.getJavaClass()) { gb.addToField(f.getJavaMember(), new DefaultLiteral()); } @@ -342,10 +349,10 @@ } for (AnnotatedMethod<?> m : type.getMethods()) { - + if (m.isAnnotationPresent(ApplyQualifiers.class)) { - if(!isQualifierPresent(m, beanManager)) + if (!isQualifierPresent(m, beanManager)) { gb.addToMethod(m.getJavaMember(), new DefaultLiteral()); } @@ -357,12 +364,12 @@ for (AnnotatedParameter<?> p : m.getParameters()) { - + if (p.isAnnotationPresent(ApplyQualifiers.class)) { - if(!isQualifierPresent(p, beanManager) && p.getBaseType() != rootType.getJavaClass()) + if (!isQualifierPresent(p, beanManager) && p.getBaseType() != rootType.getJavaClass()) { - gb.addToMethodParameter(m.getJavaMember(),p.getPosition(), new DefaultLiteral()); + gb.addToMethodParameter(m.getJavaMember(), p.getPosition(), new DefaultLiteral()); } for (Annotation q : qualifiers) { @@ -376,7 +383,7 @@ { if (con.isAnnotationPresent(ApplyQualifiers.class)) { - if(!isQualifierPresent(con, beanManager)) + if (!isQualifierPresent(con, beanManager)) { gb.addToConstructor((Constructor) con.getJavaMember(), new DefaultLiteral()); } @@ -390,9 +397,9 @@ { if (p.isAnnotationPresent(ApplyQualifiers.class) && p.getBaseType() != rootType.getJavaClass()) { - if(!isQualifierPresent(p, beanManager)) + if (!isQualifierPresent(p, beanManager)) { - gb.addToConstructorParameter((Constructor) con.getJavaMember(),p.getPosition(), new DefaultLiteral()); + gb.addToConstructorParameter((Constructor) con.getJavaMember(), p.getPosition(), new DefaultLiteral()); } for (Annotation q : qualifiers) { @@ -406,22 +413,24 @@ } return ret; } - + public boolean isQualifierPresent(Annotated f, BeanManager beanManager) { - for(Annotation a : f.getAnnotations()) + for (Annotation a : f.getAnnotations()) { - if(a.annotationType().equals(Named.class)) + if (a.annotationType().equals(Named.class)) { continue; } - if(beanManager.isQualifier(a.annotationType())) + if (beanManager.isQualifier(a.annotationType())) { return true; } } return false; } - - public static class DefaultLiteral extends AnnotationLiteral<Default> implements Default {}; + + public static class DefaultLiteral extends AnnotationLiteral<Default> implements Default + { + }; } Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/BeanResult.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -4,21 +4,25 @@ */ package org.jboss.seam.xml.core; -import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder; +import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder; public class BeanResult<X> { - NewAnnotatedTypeBuilder<X> builder; + AnnotatedTypeBuilder<X> builder; Class<X> type; BeanResultType beanType = BeanResultType.ADD; public BeanResult(Class<X> type, boolean readAnnotations) { this.type = type; - builder = new NewAnnotatedTypeBuilder<X>(type, readAnnotations); + builder = AnnotatedTypeBuilder.newInstance(type); + if (readAnnotations) + { + builder.readAnnotationsFromUnderlyingType(); + } } - public NewAnnotatedTypeBuilder<X> getBuilder() + public AnnotatedTypeBuilder<X> getBuilder() { return builder; } Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -5,7 +5,7 @@ public class GenericBeanResult { - final Class genericBean; + final Class<?> genericBean; final Set<BeanResult<?>> secondaryBeans; @@ -15,7 +15,7 @@ this.secondaryBeans = new HashSet<BeanResult<?>>(secondaryBeans); } - public Class getGenericBean() + public Class<?> getGenericBean() { return genericBean; } Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -12,7 +12,7 @@ import java.util.Map.Entry; import org.jboss.seam.xml.util.XmlConfigurationException; -import org.jboss.weld.extensions.util.ReflectionUtils; +import org.jboss.weld.extensions.util.Reflections; public class ClassXmlItem extends AbstractXmlItem { @@ -40,7 +40,7 @@ for (Entry<String, String> e : attributes.entrySet()) { - Field field = ReflectionUtils.getField(getJavaClass(), e.getKey()); + Field field = Reflections.getField(getJavaClass(), e.getKey()); if (field != null) { values.add(new FieldXmlItem(this, field, e.getValue(), document, lineno)); @@ -48,9 +48,9 @@ else { String methodName = "set" + Character.toUpperCase(e.getKey().charAt(0)) + e.getKey().substring(1); - if (ReflectionUtils.methodExists(getJavaClass(), methodName)) + if (Reflections.methodExists(getJavaClass(), methodName)) { - Set<Method> methods = ReflectionUtils.getMethods(getJavaClass()); + Set<Method> methods = Reflections.getMethods(getJavaClass()); for (Method m : methods) { if (m.getName().equals(methodName) && m.getParameterTypes().length == 1) Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -32,9 +32,9 @@ import org.jboss.seam.xml.parser.namespace.RootNamespaceElementResolver; import org.jboss.seam.xml.util.XmlConfigurationException; import org.jboss.seam.xml.util.XmlObjectConverter; +import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder; import org.jboss.weld.extensions.util.AnnotationInstanceProvider; -import org.jboss.weld.extensions.util.ReflectionUtils; -import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder; +import org.jboss.weld.extensions.util.Reflections; /** * Builds an XML result from sax nodes @@ -292,7 +292,7 @@ // if it is an extend we want to read the annotations from the underlying // class BeanResult<?> result = new BeanResult(rb.getJavaClass(), extend); - NewAnnotatedTypeBuilder<?> type = result.getBuilder(); + AnnotatedTypeBuilder<?> type = result.getBuilder(); // list of constructor arguments List<ParameterXmlItem> constList = new ArrayList<ParameterXmlItem>(); @@ -436,7 +436,7 @@ { params[i] = constList.get(i).getJavaClass(); } - Constructor<?> ret = ReflectionUtils.getConstructor(bean.getJavaClass(), params); + Constructor<?> ret = Reflections.getConstructor(bean.getJavaClass(), params); if (ret == null) { throw new XmlConfigurationException("Could not resolve constructor for " + bean.getJavaClass() + " with arguments " + params, bean.getDocument(), bean.getLineno()); Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/PackageNamespaceElementResolver.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -21,7 +21,7 @@ import org.jboss.seam.xml.model.XmlItemType; import org.jboss.seam.xml.parser.SaxNode; import org.jboss.seam.xml.util.XmlConfigurationException; -import org.jboss.weld.extensions.util.ReflectionUtils; +import org.jboss.weld.extensions.util.Reflections; public class PackageNamespaceElementResolver implements NamespaceElementResolver { @@ -104,8 +104,8 @@ { Class<?> p = parent.getJavaClass(); Field f = null; - boolean methodFound = ReflectionUtils.methodExists(p, name); - f = ReflectionUtils.getField(p, name); + boolean methodFound = Reflections.methodExists(p, name); + f = Reflections.getField(p, name); if (methodFound && f != null) { @@ -121,9 +121,9 @@ } String methodName = "set" + Character.toUpperCase(name.charAt(0)) + name.substring(1); - if (ReflectionUtils.methodExists(p, methodName)) + if (Reflections.methodExists(p, methodName)) { - Set<Method> methods = ReflectionUtils.getMethods(p); + Set<Method> methods = Reflections.getMethods(p); for (Method m : methods) { if (m.getName().equals(methodName) && m.getParameterTypes().length == 1) Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java 2010-05-10 10:50:26 UTC (rev 12702) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java 2010-05-10 11:57:27 UTC (rev 12703) @@ -29,7 +29,6 @@ { }); assert dep.getValue() == 11 : " actual " + dep.getValue(); - ; } @Test

13 years, 11 months

1
0
0 / 0

Seam SVN: r12702 - in modules/xml/trunk/impl/src: main/java/org/jboss/seam/xml/util and 1 other directories.

by seam-commits＠lists.jboss.org

Author: swd847 Date: 2010-05-10 06:50:26 -0400 (Mon, 10 May 2010) New Revision: 12702 Added: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/TypeReader.java Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/CollectionFieldValue.java Log: SEAMXML-4 Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java 2010-05-10 09:15:20 UTC (rev 12701) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/CollectionFieldSet.java 2010-05-10 10:50:26 UTC (rev 12702) @@ -17,6 +17,7 @@ import java.util.TreeSet; import org.jboss.seam.xml.model.XmlItem; +import org.jboss.seam.xml.util.TypeReader; import org.jboss.seam.xml.util.XmlObjectConverter; /** @@ -68,54 +69,45 @@ if (parameterizedType.getRawType() == Collection.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = LinkedHashSet.class; } else if (parameterizedType.getRawType() == List.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = ArrayList.class; } else if (parameterizedType.getRawType() == Set.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = LinkedHashSet.class; } else if (parameterizedType.getRawType() == SortedSet.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = TreeSet.class; } else if (parameterizedType.getRawType() == HashSet.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = HashSet.class; } else if (parameterizedType.getRawType() == ArrayList.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = ArrayList.class; } else if (parameterizedType.getRawType() == LinkedList.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = LinkedList.class; } else if (parameterizedType.getRawType() == LinkedHashSet.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = LinkedHashSet.class; } else if (parameterizedType.getRawType() == TreeSet.class) { - elementType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; collectionType = TreeSet.class; } else { throw new RuntimeException("Could not determine element type for " + field.getDeclaringClass().getName() + "." + field.getName()); } - + elementType = TypeReader.readClassFromType(parameterizedType.getActualTypeArguments()[0]); } else { Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java 2010-05-10 09:15:20 UTC (rev 12701) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.java 2010-05-10 10:50:26 UTC (rev 12702) @@ -15,6 +15,7 @@ import java.util.TreeMap; import org.jboss.seam.xml.model.EntryXmlItem; +import org.jboss.seam.xml.util.TypeReader; import org.jboss.seam.xml.util.XmlObjectConverter; /** @@ -66,20 +67,14 @@ if (parameterizedType.getRawType() == Map.class) { - keyType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; - valueType = (Class<?>) parameterizedType.getActualTypeArguments()[1]; collectionType = LinkedHashMap.class; } else if (parameterizedType.getRawType() == LinkedHashMap.class) { - keyType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; - valueType = (Class<?>) parameterizedType.getActualTypeArguments()[1]; collectionType = LinkedHashMap.class; } else if (parameterizedType.getRawType() == HashMap.class) { - keyType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; - valueType = (Class<?>) parameterizedType.getActualTypeArguments()[1]; collectionType = HashMap.class; } else if (parameterizedType.getRawType() == SortedMap.class) @@ -90,8 +85,6 @@ } else if (parameterizedType.getRawType() == TreeMap.class) { - keyType = (Class<?>) parameterizedType.getActualTypeArguments()[0]; - valueType = (Class<?>) parameterizedType.getActualTypeArguments()[1]; collectionType = TreeMap.class; } else @@ -99,6 +92,8 @@ throw new RuntimeException("Could not determine element type for map " + field.getDeclaringClass().getName() + "." + field.getName()); } + keyType = TypeReader.readClassFromType(parameterizedType.getActualTypeArguments()[0]); + valueType = TypeReader.readClassFromType(parameterizedType.getActualTypeArguments()[1]); } else { Added: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/TypeReader.java =================================================================== --- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/TypeReader.java (rev 0) +++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/util/TypeReader.java 2010-05-10 10:50:26 UTC (rev 12702) @@ -0,0 +1,24 @@ +package org.jboss.seam.xml.util; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +public class TypeReader +{ + public static Class<?> readClassFromType(Type type) + { + if (type instanceof Class) + { + return (Class) type; + } + else if (type instanceof ParameterizedType) + { + ParameterizedType p = (ParameterizedType) type; + return TypeReader.readClassFromType(p.getRawType()); + } + else + { + throw new RuntimeException("Cannot convert " + type + " into a java.lang.Class"); + } + } +} Modified: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/CollectionFieldValue.java =================================================================== --- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/CollectionFieldValue.java 2010-05-10 09:15:20 UTC (rev 12701) +++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/fieldset/CollectionFieldValue.java 2010-05-10 10:50:26 UTC (rev 12702) @@ -12,5 +12,5 @@ { public Set<Integer> iset; public SortedSet<String> sset; - public List<Class> clist; + public List<Class<?>> clist; }

13 years, 11 months

1
0
0 / 0

Seam SVN: r12701 - branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-05-10 05:15:20 -0400 (Mon, 10 May 2010) New Revision: 12701 Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/template.xhtml Log: JBPAPP-4260 - back port the fix of not using resource:// in seam-gen Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/template.xhtml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/template.xhtml 2010-05-10 09:15:00 UTC (rev 12700) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/view/layout/template.xhtml 2010-05-10 09:15:20 UTC (rev 12701) @@ -12,7 +12,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>@projectName@</title> <link rel="shortcut icon" href="#{request.contextPath}/favicon.ico"/> - <a:loadStyle src="resource:///stylesheet/theme.xcss"/> + <a:loadStyle src="/stylesheet/theme.xcss"/> <a:loadStyle src="/stylesheet/theme.css"/> <ui:insert name="head"/> </head>

13 years, 11 months

1
0
0 / 0

Seam SVN: r12700 - branches/enterprise/JBPAPP_5_0/seam-gen/view/layout.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-05-10 05:15:00 -0400 (Mon, 10 May 2010) New Revision: 12700 Modified: branches/enterprise/JBPAPP_5_0/seam-gen/view/layout/template.xhtml Log: JBPAPP-4259 - back port the fix of not using resource:// in seam-gen Modified: branches/enterprise/JBPAPP_5_0/seam-gen/view/layout/template.xhtml =================================================================== --- branches/enterprise/JBPAPP_5_0/seam-gen/view/layout/template.xhtml 2010-05-07 22:32:04 UTC (rev 12699) +++ branches/enterprise/JBPAPP_5_0/seam-gen/view/layout/template.xhtml 2010-05-10 09:15:00 UTC (rev 12700) @@ -12,7 +12,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>@projectName@</title> <link rel="shortcut icon" href="#{request.contextPath}/favicon.ico"/> - <a:loadStyle src="resource:///stylesheet/theme.xcss"/> + <a:loadStyle src="/stylesheet/theme.xcss"/> <a:loadStyle src="/stylesheet/theme.css"/> <ui:insert name="head"/> </head>

13 years, 11 months

1
0
0 / 0

Seam SVN: r12699 - modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-05-07 18:32:04 -0400 (Fri, 07 May 2010) New Revision: 12699 Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/FormValidationFieldProducer.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/UIValidateForm.java Log: Updates for XValidator bug on actual submit. Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/FormValidationFieldProducer.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/FormValidationFieldProducer.java 2010-05-07 06:26:05 UTC (rev 12698) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/FormValidationFieldProducer.java 2010-05-07 22:32:04 UTC (rev 12699) @@ -59,13 +59,13 @@ UIForm form = null; UIValidateForm validator = null; - private Map<String, UIInput> components = null; + private Map<String, UIInput> components; public void interceptComponentTree(@Observes @Before final UIValidateForm event) { validator = event; form = validator.locateForm(); - components = locateAliasedComponents(event); + locateAliasedComponents(event); } public void cleanupComponentTree(@Observes @After final UIValidateForm event) @@ -123,9 +123,9 @@ return parameterName; } - public HashMap<String, UIInput> locateAliasedComponents(final UIValidateForm validator) + public void locateAliasedComponents(final UIValidateForm validator) { - HashMap<String, UIInput> result = new HashMap<String, UIInput>(); + components = new HashMap<String, UIInput>(); String fields = validator.getFields(); if ((fields != null) && !"".equals(fields.trim())) { @@ -146,7 +146,6 @@ components.put(aliasFieldName, component); } } - return result; } private UIInput findComponent(final String alias, final String clientId) Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/UIValidateForm.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/UIValidateForm.java 2010-05-07 06:26:05 UTC (rev 12698) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/UIValidateForm.java 2010-05-07 22:32:04 UTC (rev 12699) @@ -24,6 +24,7 @@ import java.io.IOException; +import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.util.AnnotationLiteral; import javax.faces.component.FacesComponent; import javax.faces.component.UIComponent; @@ -72,7 +73,8 @@ public void validate(final FacesContext context) { context.getApplication().publishEvent(context, PreValidateEvent.class, UIValidateForm.class, this); - BeanManagerAccessor.getManager().fireEvent(this, BEFORE); + BeanManager manager = BeanManagerAccessor.getManager(); + manager.fireEvent(this, BEFORE); Validator validator = context.getApplication().createValidator(validatorId); if (validator == null) @@ -91,7 +93,7 @@ context.addMessage(null, e.getFacesMessage()); } - BeanManagerAccessor.getManager().fireEvent(this, AFTER); + manager.fireEvent(this, AFTER); context.getApplication().publishEvent(context, PostValidateEvent.class, UIValidateForm.class, this); }

13 years, 11 months

1
0
0 / 0

Seam SVN: r12698 - in modules/faces/trunk: api and 1 other directories.

by seam-commits＠lists.jboss.org

Author: mgencur(a)redhat.com Date: 2010-05-07 02:26:05 -0400 (Fri, 07 May 2010) New Revision: 12698 Modified: modules/faces/trunk/api/pom.xml modules/faces/trunk/impl/pom.xml modules/faces/trunk/pom.xml Log: JBQA-3325, minor changes - plugin management Modified: modules/faces/trunk/api/pom.xml =================================================================== --- modules/faces/trunk/api/pom.xml 2010-05-07 06:11:57 UTC (rev 12697) +++ modules/faces/trunk/api/pom.xml 2010-05-07 06:26:05 UTC (rev 12698) @@ -29,5 +29,27 @@ </snapshots> </repository> </repositories> + + <profiles> + <profile> + <id>code-coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: modules/faces/trunk/impl/pom.xml =================================================================== --- modules/faces/trunk/impl/pom.xml 2010-05-07 06:11:57 UTC (rev 12697) +++ modules/faces/trunk/impl/pom.xml 2010-05-07 06:26:05 UTC (rev 12698) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -34,28 +35,32 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - </dependency> + </dependency> <dependency> <artifactId>seam-faces-api</artifactId> <groupId>org.jboss.seam.faces</groupId> <version>${project.version}</version> - <scope>compile</scope> + <scope>compile</scope> </dependency> </dependencies> - - <profiles> + + <profiles> <profile> <id>code-coverage</id> <build> - <plugins> - <plugin> + <plugins> + <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> + <artifactId>emma-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> </plugin> + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + </plugin> </plugins> </build> </profile> Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-05-07 06:11:57 UTC (rev 12697) +++ modules/faces/trunk/pom.xml 2010-05-07 06:26:05 UTC (rev 12698) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -23,10 +24,9 @@ <modules> <module>api</module> <module>impl</module> -  +  </modules> <properties> @@ -37,8 +37,8 @@ <weld.api.version>1.0-SP1</weld.api.version> <junit.version>4.8.1</junit.version> <slf4j.version>1.5.9.RC1</slf4j.version> - <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> - <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> + <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> + <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> </properties> <dependencyManagement> @@ -147,69 +147,71 @@ </dependency> </dependencies> </profile> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>${emma.maven.plugin.version}</version> - <inherited>true</inherited> - <executions> - <execution> - <id>instrumentation</id> - <phase>process-classes</phase> - <goals> - <goal>instrument</goal> - </goals> - <configuration> - <verbose>true</verbose> - </configuration> - </execution> - <execution> - <id>cleaning</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <forkMode>once</forkMode> - <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> - </configuration> - </plugin> - - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - <version>${emma4it.maven.plugin.version}</version> - <executions> - <execution> - <id>report</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <sourceSets> - <sourceSet> - <directory>${project.build.sourceDirectory}</directory> - </sourceSet> - </sourceSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <profile> + <id>code-coverage</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <version>${emma.maven.plugin.version}</version> + <inherited>true</inherited> + <executions> + <execution> + <id>instrumentation</id> + <phase>process-classes</phase> + <goals> + <goal>instrument</goal> + </goals> + <configuration> + <verbose>true</verbose> + </configuration> + </execution> + <execution> + <id>cleaning</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <forkMode>once</forkMode> + <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> + </configuration> + </plugin> + + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + <version>${emma4it.maven.plugin.version}</version> + <executions> + <execution> + <id>report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <sourceSets> + <sourceSet> + <directory>${project.build.sourceDirectory}</directory> + </sourceSet> + </sourceSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> </profile> </profiles>

13 years, 11 months

1
0
0 / 0

Seam SVN: r12697 - in modules/international/trunk: impl and 1 other directory.

by seam-commits＠lists.jboss.org

Author: mgencur(a)redhat.com Date: 2010-05-07 02:11:57 -0400 (Fri, 07 May 2010) New Revision: 12697 Modified: modules/international/trunk/impl/pom.xml modules/international/trunk/pom.xml Log: JBQA-3325, minor change Modified: modules/international/trunk/impl/pom.xml =================================================================== --- modules/international/trunk/impl/pom.xml 2010-05-07 05:21:18 UTC (rev 12696) +++ modules/international/trunk/impl/pom.xml 2010-05-07 06:11:57 UTC (rev 12697) @@ -1,59 +1,63 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.seam.international</groupId> - <artifactId>seam-international-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.jboss.seam.international</groupId> + <artifactId>seam-international-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> - <artifactId>seam-international</artifactId> - <version>3.0.0-SNAPSHOT</version> + <artifactId>seam-international</artifactId> + <version>3.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Seam International Module Core Implementation</name> + <packaging>jar</packaging> + <name>Seam International Module Core Implementation</name> -  - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots +  + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots </url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> - <dependencies> - <dependency> - <artifactId>seam-international-api</artifactId> - <groupId>org.jboss.seam.international</groupId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <profiles> + <dependencies> + <dependency> + <artifactId>seam-international-api</artifactId> + <groupId>org.jboss.seam.international</groupId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <profiles> <profile> <id>code-coverage</id> <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> </plugin> - </plugins> + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + </plugin> + </plugins> </build> </profile> </profiles> Modified: modules/international/trunk/pom.xml =================================================================== --- modules/international/trunk/pom.xml 2010-05-07 05:21:18 UTC (rev 12696) +++ modules/international/trunk/pom.xml 2010-05-07 06:11:57 UTC (rev 12697) @@ -1,214 +1,216 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>9</version> - </parent> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>9</version> + </parent> - <artifactId>seam-international-parent</artifactId> - <groupId>org.jboss.seam.international</groupId> - <version>3.0.0-SNAPSHOT</version> + <artifactId>seam-international-parent</artifactId> + <groupId>org.jboss.seam.international</groupId> + <version>3.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Seam International Module Parent POM</name> + <packaging>pom</packaging> + <name>Seam International Module Parent POM</name> - <description>The Parent for Seam International Module</description> - <url>http://www.seamframework.org</url> + <description>The Parent for Seam International Module</description> + <url>http://www.seamframework.org</url> - <modules> - <module>api</module> - <module>impl</module> -  -  - </modules> + <modules> + <module>api</module> + <module>impl</module> +  +  + </modules> - <properties> - <arquillian.version>1.0.0.Alpha1</arquillian.version> - <seam.xml.version>3.0.0-SNAPSHOT</seam.xml.version> - <weld.extensions.version>1.0.0.Alpha1</weld.extensions.version> - <weld.api.version>1.0-SP1</weld.api.version> - <joda-time.version>1.6</joda-time.version> - <pretty-time.version>1.0.6</pretty-time.version> - <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> - <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> - </properties> + <properties> + <arquillian.version>1.0.0.Alpha1</arquillian.version> + <seam.xml.version>3.0.0-SNAPSHOT</seam.xml.version> + <weld.extensions.version>1.0.0.Alpha1</weld.extensions.version> + <weld.api.version>1.0-SP1</weld.api.version> + <joda-time.version>1.6</joda-time.version> + <pretty-time.version>1.0.6</pretty-time.version> + <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> + <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> + </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> - <dependencies> + <dependencies> -  - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions</artifactId> - <version>${weld.extensions.version}</version> - </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>${joda-time.version}</version> - </dependency> - <dependency> - <groupId>com.ocpsoft</groupId> - <artifactId>ocpsoft-pretty-time</artifactId> - <version>${pretty-time.version}</version> - </dependency> +  + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <version>${weld.extensions.version}</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>${joda-time.version}</version> + </dependency> + <dependency> + <groupId>com.ocpsoft</groupId> + <artifactId>ocpsoft-pretty-time</artifactId> + <version>${pretty-time.version}</version> + </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-junit</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-weld-embedded</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-bean-config</artifactId> - <version>${seam.xml.version}</version> - </dependency> - </dependencies> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-bean-config</artifactId> + <version>${seam.xml.version}</version> + </dependency> + </dependencies> - <developers> - <developer> - <name>Lincoln Baxter, III</name> - <email>lincolnbaxter(a)gmail.com</email> - <url>http://ocpsoft.com</url> - <organization>JBoss, by Red Hat</organization> - <organizationUrl>http://jboss.org</organizationUrl> - <timezone>EST</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - <developer> - <name>Ken Finnigan</name> - <timezone>GMT</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - </developers> + <developers> + <developer> + <name>Lincoln Baxter, III</name> + <email>lincolnbaxter(a)gmail.com</email> + <url>http://ocpsoft.com</url> + <organization>JBoss, by Red Hat</organization> + <organizationUrl>http://jboss.org</organizationUrl> + <timezone>EST</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + <developer> + <name>Ken Finnigan</name> + <timezone>GMT</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + </developers> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/international/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/international/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/international/trunk</url> - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/international/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/international/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/international/trunk</url> + </scm> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>${emma.maven.plugin.version}</version> - <inherited>true</inherited> - <executions> - <execution> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>code-coverage</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <version>${emma.maven.plugin.version}</version> + <inherited>true</inherited> + <executions> + <execution> <id>instrumentation</id> - <phase>process-classes</phase> + <phase>process-classes</phase> <goals> - <goal>instrument</goal> + <goal>instrument</goal> </goals> <configuration> <verbose>true</verbose> </configuration> - </execution> - <execution> - <id>cleaning</id> - <phase>clean</phase> + </execution> + <execution> + <id>cleaning</id> + <phase>clean</phase> <goals> - <goal>clean</goal> + <goal>clean</goal> </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <forkMode>once</forkMode> - <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> - </configuration> - </plugin> - - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - <version>${emma4it.maven.plugin.version}</version> - <executions> - <execution> - <id>report</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <sourceSets> - <sourceSet> - <directory>${project.build.sourceDirectory}</directory> - </sourceSet> - </sourceSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <forkMode>once</forkMode> + <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> + </configuration> + </plugin> + + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + <version>${emma4it.maven.plugin.version}</version> + <executions> + <execution> + <id>report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <sourceSets> + <sourceSet> + <directory>${project.build.sourceDirectory}</directory> + </sourceSet> + </sourceSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> </profile> - </profiles> + </profiles> </project>

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits May 2010