April 2012 - seam-commits - Jboss List Archives

[seam/social] 40ad0d: Correcting error in Fcebook grpah API calls

by GitHub

Branch: refs/heads/develop Home: https://github.com/seam/social Commit: 40ad0dafed4066764a82586ced11337db4da92e0 https://github.com/seam/social/commit/40ad0dafed4066764a82586ced11337db4d... Author: Antoine Sabot-Durand <antoine(a)sabot-durand.net> Date: 2012-04-07 (Sat, 07 Apr 2012) Changed paths: M services/facebook/src/main/java/org/jboss/seam/social/FacebookBaseService.java Log Message: ----------- Correcting error in Fcebook grpah API calls

12 years

1
0
0 / 0

Seam SVN: r14537 - in branches/enterprise/WFK_2_0_PRE/distribution: src/main/assembly and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-07 07:43:37 -0400 (Sat, 07 Apr 2012) New Revision: 14537 Added: branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/demo.xml Modified: branches/enterprise/WFK_2_0_PRE/distribution/pom.xml branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml Log: divided examples and binary distribution into 2 zip files Modified: branches/enterprise/WFK_2_0_PRE/distribution/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/distribution/pom.xml 2012-04-06 18:24:34 UTC (rev 14536) +++ branches/enterprise/WFK_2_0_PRE/distribution/pom.xml 2012-04-07 11:43:37 UTC (rev 14537) @@ -27,6 +27,7 @@ <finalName>jboss-seam-${project.version}</finalName> <descriptors> <descriptor>src/main/assembly/dist.xml</descriptor> + <descriptor>src/main/assembly/demo.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> Added: branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/demo.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/demo.xml (rev 0) +++ branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/demo.xml 2012-04-07 11:43:37 UTC (rev 14537) @@ -0,0 +1,20 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd"> + + <id>demo</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + +  + <fileSets> +  + <fileSet> + <directory>target/dependency/examples-ee6</directory> + <outputDirectory>./examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Modified: branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml 2012-04-06 18:24:34 UTC (rev 14536) +++ branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml 2012-04-07 11:43:37 UTC (rev 14537) @@ -3,11 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd"> - <id>dist</id> + <id>bin</id> <formats> - <format>zip</format> - <format>tar.gz</format> </formats> <includeBaseDirectory>true</includeBaseDirectory> @@ -19,22 +17,10 @@ <directory>target/dependency</directory> <outputDirectory>src</outputDirectory> <excludes> - <exclude>examples/</exclude> + <exclude>examples-ee6/</exclude> </excludes> </fileSet> - -  - <fileSet> - <directory>target/dependency</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>examples/</include> - </includes> - <excludes> - <exclude>examples/wiki/</exclude> - </excludes> - </fileSet> - +  <fileSet> <directory>src/main/assembly</directory> @@ -46,6 +32,7 @@ <include>changelog.txt</include> <include>seam21migration.txt</include> <include>seam2migration.txt</include> + <include>seam23migration.txt</include> <include>clustering-howto.txt</include> <include>seam</include> <include>seam.bat</include>

12 years

1
0
0 / 0

Seam SVN: r14536 - branches/enterprise/WFK_2_0_PRE/build.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-06 14:24:34 -0400 (Fri, 06 Apr 2012) New Revision: 14536 Modified: branches/enterprise/WFK_2_0_PRE/build/ci.settings.xml Log: added WFK2 Mead repository Modified: branches/enterprise/WFK_2_0_PRE/build/ci.settings.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/build/ci.settings.xml 2012-04-06 17:51:20 UTC (rev 14535) +++ branches/enterprise/WFK_2_0_PRE/build/ci.settings.xml 2012-04-06 18:24:34 UTC (rev 14536) @@ -300,15 +300,13 @@ </pluginRepository> </pluginRepositories> </profile> - - <profile> - <id>jboss-deprecated-repository</id> + <id>jboss-wfk2-repository</id> <repositories> <repository> - <id>jboss-deprecated-repository</id> - <name>JBoss Deprecated Maven Repository</name> - <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url> + <id>jboss-wfk2-repository</id> + <name>JBoss WFK2 internal Maven Repository</name> + <url>http://download.devel.redhat.com/brewroot/repos/jb-wfk-2-rhel-6-build/lat...</url> <layout>default</layout> <releases> <enabled>true</enabled> @@ -320,6 +318,22 @@ </snapshots> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-wfk2-repository</id> + <name>JBoss WFK2 internal Maven Repository</name> + <url>http://download.devel.redhat.com/brewroot/repos/jb-wfk-2-rhel-6-build/lat...</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> </profile> @@ -338,7 +352,7 @@ <activeProfiles> <activeProfile>jboss-public-repository</activeProfile> - <activeProfile>jboss-deprecated-repository</activeProfile> + <activeProfile>jboss-wfk2-repository</activeProfile> </activeProfiles>

12 years

1
0
0 / 0

Seam SVN: r14535 - in branches/enterprise/WFK_2_0_PRE/distribution: src/main/assembly and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-06 13:51:20 -0400 (Fri, 06 Apr 2012) New Revision: 14535 Modified: branches/enterprise/WFK_2_0_PRE/distribution/pom.xml branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml Log: fixed distribution assembly after removed modules Modified: branches/enterprise/WFK_2_0_PRE/distribution/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/distribution/pom.xml 2012-04-06 15:33:47 UTC (rev 14534) +++ branches/enterprise/WFK_2_0_PRE/distribution/pom.xml 2012-04-06 17:51:20 UTC (rev 14535) @@ -115,20 +115,6 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-rss</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-wicket</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-reference-guide</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> <classifier>sources</classifier> <version>${project.version}</version> @@ -183,25 +169,12 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-rss</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> <version>${project.version}</version> <classifier>sources</classifier> </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-wicket</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> @@ -232,32 +205,7 @@ <artifactId>jboss-seam-gen</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-embedded-bootstrap</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>jboss-embedded-all</artifactId> - <version>${version.jbossembedded}</version> - </dependency> - - <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>hibernate-all</artifactId> - <version>${version.jbossembedded}</version> - </dependency> - - <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>thirdparty-all</artifactId> - <version>${version.jbossembedded}</version> - </dependency> - - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>functional-tests</artifactId> <version>${project.version}</version> Modified: branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml 2012-04-06 15:33:47 UTC (rev 14534) +++ branches/enterprise/WFK_2_0_PRE/distribution/src/main/assembly/dist.xml 2012-04-06 17:51:20 UTC (rev 14535) @@ -88,7 +88,7 @@ <dependencySets>  - <dependencySet> +  <dependencySet> <outputDirectory>lib/src</outputDirectory> @@ -137,13 +137,10 @@ <include>org.jboss.seam:jboss-seam-excel:jar</include> <include>org.jboss.seam:jboss-seam-pdf:jar</include> <include>org.jboss.seam:jboss-seam-mail:jar</include> - <include>org.jboss.seam:jboss-seam-rss:jar</include> <include>org.jboss.seam:jboss-seam-resteasy:jar</include> - <include>org.jboss.seam:jboss-seam-wicket:jar</include> <include>org.jboss.seam:jboss-seam-remoting:jar</include> <include>org.jboss.seam:jboss-seam-flex:jar</include> <include>org.jboss.seam:jboss-seam-ioc:jar</include> - <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include> </includes> <excludes> <exclude>*:*:ejb:sources</exclude> @@ -227,7 +224,7 @@ </includes> </dependencySet> - <dependencySet> + + --> +   <dependencySet>

12 years

1
0
0 / 0

[seam/mail] 363c09: SEAMMAIL-35 - Support non UTF-8 charset

by GitHub

Branch: refs/heads/develop Home: https://github.com/seam/mail Commit: 363c09e12d2397b44f94b92e775f85d8d4236799 https://github.com/seam/mail/commit/363c09e12d2397b44f94b92e775f85d8d4236799 Author: Cody Lerum <cody.lerum(a)gmail.com> Date: 2012-04-06 (Fri, 06 Apr 2012) Changed paths: M api/src/main/java/org/jboss/seam/mail/api/MailMessage.java M api/src/main/java/org/jboss/seam/mail/core/EmailMessage.java M impl/src/main/java/org/jboss/seam/mail/core/BaseMailMessage.java M impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java M impl/src/main/java/org/jboss/seam/mail/util/MailUtility.java M testsuite/src/test/java/org/jboss/seam/mail/FreeMarkerMailMessageTest.java M testsuite/src/test/java/org/jboss/seam/mail/MailMessageTest.java M testsuite/src/test/java/org/jboss/seam/mail/VelocityMailMessageTest.java Log Message: ----------- SEAMMAIL-35 - Support non UTF-8 charset Commit: 6c3083d0e7cda3ee7e357bbb4df042fd5ae6d3ef https://github.com/seam/mail/commit/6c3083d0e7cda3ee7e357bbb4df042fd5ae6d3ef Author: Cody Lerum <cody.lerum(a)gmail.com> Date: 2012-04-06 (Fri, 06 Apr 2012) Changed paths: M api/src/main/java/org/jboss/seam/mail/api/MailMessage.java M api/src/main/java/org/jboss/seam/mail/core/EmailMessage.java M impl/src/main/java/org/jboss/seam/mail/core/BaseMailMessage.java M impl/src/main/java/org/jboss/seam/mail/core/MailMessageImpl.java M impl/src/main/java/org/jboss/seam/mail/util/MailUtility.java M testsuite/src/test/java/org/jboss/seam/mail/FreeMarkerMailMessageTest.java M testsuite/src/test/java/org/jboss/seam/mail/MailMessageTest.java M testsuite/src/test/java/org/jboss/seam/mail/VelocityMailMessageTest.java Log Message: ----------- Merge pull request #21 from codylerum/develop SEAMMAIL-35 - Support non UTF-8 charset Compare: https://github.com/seam/mail/compare/8fba8b5...6c3083d

12 years

1
0
0 / 0

[seam/mail] 1ea706: SEAMMAIL-34 - Send velocity logging to null chute

by GitHub

Branch: refs/heads/develop Home: https://github.com/seam/mail Commit: 1ea706433a061587b8cd8b6b47556c26265b100c https://github.com/seam/mail/commit/1ea706433a061587b8cd8b6b47556c26265b100c Author: Cody Lerum <cody.lerum(a)gmail.com> Date: 2012-04-06 (Fri, 06 Apr 2012) Changed paths: M impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityTemplate.java Log Message: ----------- SEAMMAIL-34 - Send velocity logging to null chute Commit: 8fba8b5e74c95c8ddc06cced6b240124ab140d6a https://github.com/seam/mail/commit/8fba8b5e74c95c8ddc06cced6b240124ab140d6a Author: Cody Lerum <cody.lerum(a)gmail.com> Date: 2012-04-06 (Fri, 06 Apr 2012) Changed paths: M impl/src/main/java/org/jboss/seam/mail/templating/velocity/VelocityTemplate.java Log Message: ----------- Merge pull request #20 from codylerum/develop SEAMMAIL-34 - Send velocity logging to null chute Compare: https://github.com/seam/mail/compare/e00affb...8fba8b5

12 years

1
0
0 / 0

Seam SVN: r14534 - in branches/community/Seam_2_3/examples-ee6/dvdstore: dvdstore-ear and 4 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-06 11:33:47 -0400 (Fri, 06 Apr 2012) New Revision: 14534 Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml Log: cleanup of the dvdstore example Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-04-06 14:46:26 UTC (rev 14533) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-04-06 15:33:47 UTC (rev 14534) @@ -11,13 +11,8 @@ <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> <artifactId>dvdstore-ear</artifactId> <packaging>ear</packaging> - <name>Dvdstore EAR Module</name> + <name>Dvdstore EAR Module (EE6)</name> - <properties> - <jboss.home>${env.JBOSS_HOME}</jboss.home> - <jboss.domain>default</jboss.domain> - </properties> - <dependencies> <dependency> <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> @@ -36,14 +31,6 @@ <scope>compile</scope> <exclusions> <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> - <exclusion> <artifactId>testng</artifactId> <groupId>org.testng</groupId> </exclusion> @@ -61,7 +48,8 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <configuration> + <configuration> + <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir>  <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> @@ -88,18 +76,6 @@ </modules> </configuration> </plugin> - <plugin> - <groupId>org.jboss.as.plugins</groupId> - <artifactId>jboss-as-maven-plugin</artifactId> - <executions> - <execution> - <phase></phase> - <goals> - <goal>deploy</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-06 14:46:26 UTC (rev 14533) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-06 15:33:47 UTC (rev 14534) @@ -1,8 +1,5 @@ <jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> <deployment> - <exclusions> - <module name="org.hibernate" slot="main"/> - </exclusions> <dependencies> <module name="org.apache.log4j" export="true"/> <module name="org.dom4j" export="true"/> @@ -15,12 +12,4 @@ <module name="com.sun.jsf-impl" export="true"/> </dependencies> </deployment> - <sub-deployment name="dvdstore-web.war"> - - </sub-deployment> - - <sub-deployment name="dvdstore-ejb.jar"> - - </sub-deployment> - -</jboss-deployment-structure> \ No newline at end of file +</jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-06 14:46:26 UTC (rev 14533) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-06 15:33:47 UTC (rev 14534) @@ -11,7 +11,7 @@ <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> <artifactId>dvdstore-ejb</artifactId> <packaging>ejb</packaging> - <name>Dvdstore EJB Module EE6</name> + <name>Dvdstore EJB Module (EE6)</name> <dependencies> <dependency> @@ -19,15 +19,7 @@ <artifactId>jboss-seam</artifactId> <type>ejb</type> <exclusions> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> <artifactId>testng</artifactId> <groupId>org.testng</groupId> </exclusion> @@ -51,8 +43,8 @@ </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> <scope>provided</scope> </dependency> @@ -88,12 +80,14 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <exclusions> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-04-06 14:46:26 UTC (rev 14533) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-04-06 15:33:47 UTC (rev 14534) @@ -10,7 +10,7 @@ <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> <artifactId>dvdstore-tests</artifactId> - <name>Dvdstore Integration Tests Module</name> + <name>Dvdstore Integration Tests Module (EE6)</name> <dependencies> <dependency> @@ -31,8 +31,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium.server</groupId> @@ -49,11 +50,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <scope>provided</scope> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> </dependency> - <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> @@ -67,25 +67,16 @@ </dependency> <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> </dependency> + <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> </dependency> + </dependencies> <build> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-04-06 14:46:26 UTC (rev 14533) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-04-06 15:33:47 UTC (rev 14534) @@ -11,7 +11,7 @@ <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> <artifactId>dvdstore-web</artifactId> <packaging>war</packaging> - <name>Dvdstore Web Module</name> + <name>Dvdstore Web Module (EE6)</name> <properties>  @@ -29,16 +29,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> - <exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </exclusion> - </exclusions> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml 2012-04-06 14:46:26 UTC (rev 14533) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml 2012-04-06 15:33:47 UTC (rev 14534) @@ -10,7 +10,7 @@ <groupId>org.jboss.seam.examples-ee6</groupId> <artifactId>dvdstore</artifactId> <packaging>pom</packaging> - <name>Dvdstore Example</name> + <name>Dvdstore Example (EE6)</name> <modules> <module>dvdstore-ejb</module>

12 years

1
0
0 / 0

Seam SVN: r14533 - branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-06 10:46:26 -0400 (Fri, 06 Apr 2012) New Revision: 14533 Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml Log: enable hibernate caches in the blog example Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml 2012-04-06 13:42:30 UTC (rev 14532) +++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml 2012-04-06 14:46:26 UTC (rev 14533) @@ -10,8 +10,8 @@ <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> -  -  + <property name="hibernate.cache.use_second_level_cache" value="true"/> + <property name="hibernate.cache.use_query_cache" value="true"/> <property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>

12 years

1
0
0 / 0

Seam SVN: r14532 - branches/enterprise/WFK_2_0_PRE.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-06 09:42:30 -0400 (Fri, 06 Apr 2012) New Revision: 14532 Modified: branches/enterprise/WFK_2_0_PRE/ Log: updated svnignore Property changes on: branches/enterprise/WFK_2_0_PRE ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws *.iml jboss-seam.jar jboss-seam-ui.jar jboss-seam-debug.jar jboss-seam-gen.jar jboss-seam-pdf.jar jboss-seam-mail.jar jboss-seam-remoting.jar jboss-seam-ioc.jar jboss-seam-trinidad.jar test-output test-report testng-failures.xml report output classes .classpath .project .settings build.properties coverage.ec dvdindexes coverage-output blogindexes .ant-targets-build.xml dependency-report.txt lacewikiIndex jmimemagic.log dist bin target + */.classpath

12 years

1
0
0 / 0

Seam SVN: r14531 - in branches/enterprise/WFK_2_0_PRE: distribution and 56 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-06 09:16:04 -0400 (Fri, 06 Apr 2012) New Revision: 14531 Added: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java-dep branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java-dep branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java-dep branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java-dep branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java-dep Removed: branches/enterprise/WFK_2_0_PRE/examples/ branches/enterprise/WFK_2_0_PRE/jboss-embedded-bootstrap/ branches/enterprise/WFK_2_0_PRE/jboss-seam-rss/ branches/enterprise/WFK_2_0_PRE/jboss-seam-wicket/ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/jmx/ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java Modified: branches/enterprise/WFK_2_0_PRE/distribution/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/blog/blog-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-web/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/contactlist/contactlist-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/drools/drools-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ear/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-web/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ear/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-web/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ear/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-web/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ear/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-web/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-tests/pom.xml branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-web/pom.xml branches/enterprise/WFK_2_0_PRE/functional-tests/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-gen/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-jul/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/servlet/SeamListener.java branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml branches/enterprise/WFK_2_0_PRE/seam-reference-guide/pom.xml Log: starting product customization Modified: branches/enterprise/WFK_2_0_PRE/distribution/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/distribution/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/distribution/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/blog/blog-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/blog/blog-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/blog/blog-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6.blog</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ear/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-ejb/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -52,12 +52,6 @@ <artifactId>functional-tests</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <type>pom</type> - <scope>provided</scope> - </dependency> <dependency> <groupId>junit</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-web/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-web/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/booking-web/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/booking/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/contactlist/contactlist-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -17,7 +17,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/drools/drools-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/drools/drools-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/drools/drools-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -17,7 +17,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ear/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ear/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ear/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-ejb/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6.excel</groupId> @@ -99,10 +98,6 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-pdf</artifactId> </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-rss</artifactId> - </dependency> </dependencies> <build> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-web/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-web/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/excel-web/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/excel/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,7 +3,7 @@ <parent> <artifactId>examples-ee6</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ear/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ear/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ear/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-ejb/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -63,15 +63,8 @@ <artifactId>subethasmtp-wiser</artifactId> <version>1.2</version> </dependency> - + <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <type>pom</type> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>functional-tests</artifactId> <scope>test</scope> @@ -80,7 +73,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-web/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-web/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/mail-web/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/mail/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ear/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ear/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ear/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-ejb/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6.messages</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-web/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-web/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/messages-web/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/messages/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,7 +3,7 @@ <parent> <artifactId>examples-ee6</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> </parent> <packaging>pom</packaging> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ear/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ear/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ear/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-ejb/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6.todo</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-web/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-web/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/todo/todo-web/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,7 +3,7 @@ <parent> <artifactId>examples-ee6</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ear/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-ejb/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -16,7 +16,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jboss.seam.examples-ee6.ui</groupId> Modified: branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-web/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-web/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/examples-ee6/ui/ui-web/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/functional-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/functional-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/functional-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> @@ -14,7 +14,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.seleniumhq.selenium.server</groupId> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> @@ -182,8 +182,8 @@ </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> <optional>true</optional> <scope>provided</scope> </dependency> @@ -241,36 +241,21 @@  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-cache</artifactId> - <optional>true</optional> - </dependency> + + + + + - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <optional>true</optional> - </dependency> + + + + + -  <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <optional>true</optional> - </dependency> - -  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <optional>true</optional> - </dependency> - -  - <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> <optional>true</optional> @@ -308,16 +293,6 @@ </dependency> <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </dependency> - - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - </dependency> - - <dependency> <groupId>net.sourceforge.jexcelapi</groupId> <artifactId>jxl</artifactId> <optional>true</optional> @@ -326,7 +301,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> </dependency> <dependency> @@ -357,11 +331,11 @@ <artifactId>jboss-el</artifactId> </dependency> - <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>jboss-embedded-api</artifactId> - <optional>true</optional> - </dependency> + + + + + <dependency> <groupId>org.opensymphony.quartz</groupId> @@ -383,18 +357,6 @@ </dependency> <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>jboss</groupId> <artifactId>jboss-common-core</artifactId> <optional>true</optional> Deleted: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -1,38 +0,0 @@ -package org.jboss.seam.cache; - -import org.jboss.cache.Fqn; - -public abstract class AbstractJBossCacheProvider<T> extends CacheProvider<T> -{ - - public AbstractJBossCacheProvider() - { - super.setConfiguration("treecache.xml"); - } - - private Fqn defaultFqn; - - protected Fqn getFqn(String region) - { - if (region != null) - { - return Fqn.fromString(region); - } - else - { - if (defaultFqn == null) - { - defaultFqn = Fqn.fromString(getDefaultRegion()); - } - return defaultFqn; - } - } - - @Override - public void setDefaultRegion(String defaultRegion) - { - super.setDefaultRegion(defaultRegion); - this.defaultFqn = Fqn.fromString(defaultRegion); - } - -} \ No newline at end of file Copied: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java-dep (from rev 14502, branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java) =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java-dep (rev 0) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java-dep 2012-04-06 13:16:04 UTC (rev 14531) @@ -0,0 +1,38 @@ +package org.jboss.seam.cache; + +import org.jboss.cache.Fqn; + +public abstract class AbstractJBossCacheProvider<T> extends CacheProvider<T> +{ + + public AbstractJBossCacheProvider() + { + super.setConfiguration("treecache.xml"); + } + + private Fqn defaultFqn; + + protected Fqn getFqn(String region) + { + if (region != null) + { + return Fqn.fromString(region); + } + else + { + if (defaultFqn == null) + { + defaultFqn = Fqn.fromString(getDefaultRegion()); + } + return defaultFqn; + } + } + + @Override + public void setDefaultRegion(String defaultRegion) + { + super.setDefaultRegion(defaultRegion); + this.defaultFqn = Fqn.fromString(defaultRegion); + } + +} \ No newline at end of file Deleted: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -1,113 +0,0 @@ -package org.jboss.seam.cache; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.lang.reflect.Method; - -import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.DefaultCacheFactory; -import org.jboss.cache.Fqn; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.util.Reflections; - -/** - * Implementation of CacheProvider backed by JBoss Cache 2.x. for simple - * objects. - * - * @author Sebastian Hennebrueder - * @author Pete Muir - */ - -@Name("org.jboss.seam.cache.cacheProvider") -@Scope(APPLICATION) -@BypassInterceptors -@Install(value = false, precedence = BUILT_IN, classDependencies = {"org.jboss.cache.Cache", "org.jgroups.MembershipListener"}) -@AutoCreate -public class JbossCache2Provider - extends AbstractJBossCacheProvider<Cache> -{ - - private org.jboss.cache.Cache cache; - - private static final LogProvider log = Logging.getLogProvider(JbossCache2Provider.class); - - private static Method GET; - private static Method PUT; - private static Method REMOVE; - private static Method REMOVE_NODE; - - static { - try { - GET = Cache.class.getDeclaredMethod("get", Fqn.class, Object.class); - PUT = Cache.class.getDeclaredMethod("put", Fqn.class, Object.class, Object.class); - REMOVE = Cache.class.getDeclaredMethod("remove", Fqn.class, Object.class); - REMOVE_NODE = Cache.class.getDeclaredMethod("removeNode", Fqn.class); - } catch (Exception e) { - throw new IllegalStateException("Unable to use JBoss Cache 2", e); - } - } - - @Create - public void create() { - log.debug("Starting JBoss Cache"); - - try { - CacheFactory factory = new DefaultCacheFactory(); - cache = factory.createCache(getConfigurationAsStream()); - - cache.create(); - cache.start(); - } catch (Exception e) { - //log.error(e, e); - throw new IllegalStateException("Error starting JBoss Cache", e); - } - } - - @Destroy - public void destroy() { - log.debug("Stopping JBoss Cache"); - try { - cache.stop(); - cache.destroy(); - cache = null; - } catch (Exception e) { - throw new IllegalStateException("Error stopping JBoss Cache", e); - } - } - - @Override - public Object get(String region, String key) { - return Reflections.invokeAndWrap(GET, cache, getFqn(region), key); - } - - @Override - public void put(String region, String key, Object object) { - Reflections.invokeAndWrap(PUT, cache, getFqn(region), key, object); - } - - @Override - public void remove(String region, String key) { - Reflections.invokeAndWrap(REMOVE, cache, getFqn(region), key); - } - - @Override - public void clear() { - Reflections.invokeAndWrap(REMOVE_NODE, cache, getFqn(null)); - } - - @Override - public Cache getDelegate() { - return cache; - } - -} \ No newline at end of file Copied: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java-dep (from rev 14502, branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java) =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java-dep (rev 0) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java-dep 2012-04-06 13:16:04 UTC (rev 14531) @@ -0,0 +1,113 @@ +package org.jboss.seam.cache; + +import static org.jboss.seam.ScopeType.APPLICATION; +import static org.jboss.seam.annotations.Install.BUILT_IN; + +import java.lang.reflect.Method; + +import org.jboss.cache.Cache; +import org.jboss.cache.CacheFactory; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.Fqn; +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; +import org.jboss.seam.util.Reflections; + +/** + * Implementation of CacheProvider backed by JBoss Cache 2.x. for simple + * objects. + * + * @author Sebastian Hennebrueder + * @author Pete Muir + */ + +@Name("org.jboss.seam.cache.cacheProvider") +@Scope(APPLICATION) +@BypassInterceptors +@Install(value = false, precedence = BUILT_IN, classDependencies = {"org.jboss.cache.Cache", "org.jgroups.MembershipListener"}) +@AutoCreate +public class JbossCache2Provider + extends AbstractJBossCacheProvider<Cache> +{ + + private org.jboss.cache.Cache cache; + + private static final LogProvider log = Logging.getLogProvider(JbossCache2Provider.class); + + private static Method GET; + private static Method PUT; + private static Method REMOVE; + private static Method REMOVE_NODE; + + static { + try { + GET = Cache.class.getDeclaredMethod("get", Fqn.class, Object.class); + PUT = Cache.class.getDeclaredMethod("put", Fqn.class, Object.class, Object.class); + REMOVE = Cache.class.getDeclaredMethod("remove", Fqn.class, Object.class); + REMOVE_NODE = Cache.class.getDeclaredMethod("removeNode", Fqn.class); + } catch (Exception e) { + throw new IllegalStateException("Unable to use JBoss Cache 2", e); + } + } + + @Create + public void create() { + log.debug("Starting JBoss Cache"); + + try { + CacheFactory factory = new DefaultCacheFactory(); + cache = factory.createCache(getConfigurationAsStream()); + + cache.create(); + cache.start(); + } catch (Exception e) { + //log.error(e, e); + throw new IllegalStateException("Error starting JBoss Cache", e); + } + } + + @Destroy + public void destroy() { + log.debug("Stopping JBoss Cache"); + try { + cache.stop(); + cache.destroy(); + cache = null; + } catch (Exception e) { + throw new IllegalStateException("Error stopping JBoss Cache", e); + } + } + + @Override + public Object get(String region, String key) { + return Reflections.invokeAndWrap(GET, cache, getFqn(region), key); + } + + @Override + public void put(String region, String key, Object object) { + Reflections.invokeAndWrap(PUT, cache, getFqn(region), key, object); + } + + @Override + public void remove(String region, String key) { + Reflections.invokeAndWrap(REMOVE, cache, getFqn(region), key); + } + + @Override + public void clear() { + Reflections.invokeAndWrap(REMOVE_NODE, cache, getFqn(null)); + } + + @Override + public Cache getDelegate() { + return cache; + } + +} \ No newline at end of file Deleted: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -1,142 +0,0 @@ -package org.jboss.seam.cache; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import org.jboss.cache.CacheException; -import org.jboss.cache.Node; -import org.jboss.cache.PropertyConfigurator; -import org.jboss.cache.TreeCache; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; - -/** - * Implementation of CacheProvider backed by JBoss Cache 1.x - * - * @author Sebastian Hennebrueder - * @author Pete Muir - */ - -@Name("org.jboss.seam.cache.cacheProvider") -@Scope(APPLICATION) -@BypassInterceptors -@Install(precedence = BUILT_IN, classDependencies={"org.jboss.cache.TreeCache", "org.jgroups.MembershipListener"}) -@AutoCreate -public class JbossCacheProvider extends AbstractJBossCacheProvider<TreeCache> -{ - - private TreeCache cache; - - private static final LogProvider log = Logging.getLogProvider(JbossCacheProvider.class); - - @Create - public void create() - { - log.debug("Starting JBoss Treecache 1.x"); - - try - { - cache = new TreeCache(); - new PropertyConfigurator().configure(cache, getConfigurationAsStream()); - cache.createService(); - cache.startService(); - - } - catch (Exception e) - { - throw new IllegalStateException("Error starting JBoss Treecache 1.x", e); - } - } - - @Destroy - public void destroy() - { - log.debug("Stopping JBoss Treecache 1.x"); - - try - { - cache.stopService(); - cache.destroyService(); - } - catch (RuntimeException e) - { - throw new IllegalStateException("Error stopping JBoss Treecache 1.x", e); - } - cache = null; - } - - @Override - public Object get(String region, String key) - { - try - { - Node node = cache.get(getFqn(region)); - if (node != null) - { - return node.get(key); - } - else - { - return null; - } - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("Cache throw exception when trying to get %s from region %s.", key, region), e); - } - } - - @Override - public void put(String region, String key, Object object) - { - try - { - cache.put(getFqn(region), key, object); - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("JBoss Cache throw exception when adding object for key %s to region %s", key, region), e); - } - } - - @Override - public void remove(String region, String key) - { - try - { - cache.remove(getFqn(region), key); - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("JBoss Cache throw exception when removing object for key %s in region %s", key, region), e); - } - - } - - @Override - public TreeCache getDelegate() - { - return cache; - } - - @Override - public void clear() - { - try - { - cache.remove(getFqn(null)); - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("JBoss Cache throw exception when clearing default cache."), e); - } - } - -} \ No newline at end of file Copied: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java-dep (from rev 14502, branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java) =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java-dep (rev 0) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java-dep 2012-04-06 13:16:04 UTC (rev 14531) @@ -0,0 +1,142 @@ +package org.jboss.seam.cache; + +import static org.jboss.seam.ScopeType.APPLICATION; +import static org.jboss.seam.annotations.Install.BUILT_IN; + +import org.jboss.cache.CacheException; +import org.jboss.cache.Node; +import org.jboss.cache.PropertyConfigurator; +import org.jboss.cache.TreeCache; +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; + +/** + * Implementation of CacheProvider backed by JBoss Cache 1.x + * + * @author Sebastian Hennebrueder + * @author Pete Muir + */ + +@Name("org.jboss.seam.cache.cacheProvider") +@Scope(APPLICATION) +@BypassInterceptors +@Install(precedence = BUILT_IN, classDependencies={"org.jboss.cache.TreeCache", "org.jgroups.MembershipListener"}) +@AutoCreate +public class JbossCacheProvider extends AbstractJBossCacheProvider<TreeCache> +{ + + private TreeCache cache; + + private static final LogProvider log = Logging.getLogProvider(JbossCacheProvider.class); + + @Create + public void create() + { + log.debug("Starting JBoss Treecache 1.x"); + + try + { + cache = new TreeCache(); + new PropertyConfigurator().configure(cache, getConfigurationAsStream()); + cache.createService(); + cache.startService(); + + } + catch (Exception e) + { + throw new IllegalStateException("Error starting JBoss Treecache 1.x", e); + } + } + + @Destroy + public void destroy() + { + log.debug("Stopping JBoss Treecache 1.x"); + + try + { + cache.stopService(); + cache.destroyService(); + } + catch (RuntimeException e) + { + throw new IllegalStateException("Error stopping JBoss Treecache 1.x", e); + } + cache = null; + } + + @Override + public Object get(String region, String key) + { + try + { + Node node = cache.get(getFqn(region)); + if (node != null) + { + return node.get(key); + } + else + { + return null; + } + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("Cache throw exception when trying to get %s from region %s.", key, region), e); + } + } + + @Override + public void put(String region, String key, Object object) + { + try + { + cache.put(getFqn(region), key, object); + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("JBoss Cache throw exception when adding object for key %s to region %s", key, region), e); + } + } + + @Override + public void remove(String region, String key) + { + try + { + cache.remove(getFqn(region), key); + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("JBoss Cache throw exception when removing object for key %s in region %s", key, region), e); + } + + } + + @Override + public TreeCache getDelegate() + { + return cache; + } + + @Override + public void clear() + { + try + { + cache.remove(getFqn(null)); + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("JBoss Cache throw exception when clearing default cache."), e); + } + } + +} \ No newline at end of file Deleted: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -1,135 +0,0 @@ -package org.jboss.seam.cache; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import org.jboss.cache.CacheException; -import org.jboss.cache.Node; -import org.jboss.cache.aop.PojoCache; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; - -/** - * Implementation of CacheProvider backed by JBoss POJO Cache 1.x - * - * @author Sebastian Hennebrueder - * @author Pete Muir - */ - -@Name("org.jboss.seam.cache.cacheProvider") -@Scope(APPLICATION) -@BypassInterceptors -@Install(value = false, precedence = BUILT_IN, classDependencies={"org.jboss.cache.aop.PojoCache", "org.jgroups.MembershipListener", "org.jboss.aop.Dispatcher"}) -@AutoCreate -public class JbossPojoCacheProvider extends AbstractJBossCacheProvider<PojoCache> -{ - - private PojoCache cache; - - private static final LogProvider log = Logging.getLogProvider(JbossPojoCacheProvider.class); - - @Create - public void create() - { - log.debug("Starting JBoss POJO Cache 1.x"); - - try - { - cache = new PojoCache(); - new org.jboss.cache.PropertyConfigurator().configure(cache, getConfigurationAsStream()); - cache.createService(); - cache.startService(); - - } - catch (Exception e) - { - throw new IllegalStateException("Error starting JBoss POJO Cache 1.x", e); - } - } - - @Destroy - public void destroy() - { - log.debug("Stopping JBoss Treecache 1.x"); - - try - { - cache.stopService(); - cache.destroyService(); - } - catch (RuntimeException e) - { - throw new IllegalStateException("Error stopping JBoss Treecache 1.x", e); - } - cache = null; - } - - @Override - public Object get(String region, String key) { - try { - Node node = cache.get(getFqn(region)); - if (node != null) { - return node.get(key); - } else { - return null; - } - } catch (CacheException e) { - throw new IllegalStateException(String.format("Cache throw exception when trying to get %s from region %s.", key, region), e); - } - } - - - @Override - public void put(String region, String key, Object object) - { - try - { - cache.put(getFqn(region), key, object); - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("JBoss Cache throw exception when adding object for key %s to region %s", key, region), e); - } - } - - @Override - public void remove(String region, String key) - { - try - { - cache.remove(getFqn(region), key); - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("JBoss Cache throw exception when removing object for key %s in region %s", key, region), e); - } - - } - - @Override - public PojoCache getDelegate() - { - return cache; - } - - @Override - public void clear() - { - try - { - cache.remove(getFqn(null)); - } - catch (CacheException e) - { - throw new IllegalStateException(String.format("JBoss Cache throw exception when clearing default cache."), e); - } - } - -} \ No newline at end of file Copied: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java-dep (from rev 14502, branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java) =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java-dep (rev 0) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java-dep 2012-04-06 13:16:04 UTC (rev 14531) @@ -0,0 +1,135 @@ +package org.jboss.seam.cache; + +import static org.jboss.seam.ScopeType.APPLICATION; +import static org.jboss.seam.annotations.Install.BUILT_IN; + +import org.jboss.cache.CacheException; +import org.jboss.cache.Node; +import org.jboss.cache.aop.PojoCache; +import org.jboss.seam.annotations.AutoCreate; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.log.LogProvider; +import org.jboss.seam.log.Logging; + +/** + * Implementation of CacheProvider backed by JBoss POJO Cache 1.x + * + * @author Sebastian Hennebrueder + * @author Pete Muir + */ + +@Name("org.jboss.seam.cache.cacheProvider") +@Scope(APPLICATION) +@BypassInterceptors +@Install(value = false, precedence = BUILT_IN, classDependencies={"org.jboss.cache.aop.PojoCache", "org.jgroups.MembershipListener", "org.jboss.aop.Dispatcher"}) +@AutoCreate +public class JbossPojoCacheProvider extends AbstractJBossCacheProvider<PojoCache> +{ + + private PojoCache cache; + + private static final LogProvider log = Logging.getLogProvider(JbossPojoCacheProvider.class); + + @Create + public void create() + { + log.debug("Starting JBoss POJO Cache 1.x"); + + try + { + cache = new PojoCache(); + new org.jboss.cache.PropertyConfigurator().configure(cache, getConfigurationAsStream()); + cache.createService(); + cache.startService(); + + } + catch (Exception e) + { + throw new IllegalStateException("Error starting JBoss POJO Cache 1.x", e); + } + } + + @Destroy + public void destroy() + { + log.debug("Stopping JBoss Treecache 1.x"); + + try + { + cache.stopService(); + cache.destroyService(); + } + catch (RuntimeException e) + { + throw new IllegalStateException("Error stopping JBoss Treecache 1.x", e); + } + cache = null; + } + + @Override + public Object get(String region, String key) { + try { + Node node = cache.get(getFqn(region)); + if (node != null) { + return node.get(key); + } else { + return null; + } + } catch (CacheException e) { + throw new IllegalStateException(String.format("Cache throw exception when trying to get %s from region %s.", key, region), e); + } + } + + + @Override + public void put(String region, String key, Object object) + { + try + { + cache.put(getFqn(region), key, object); + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("JBoss Cache throw exception when adding object for key %s to region %s", key, region), e); + } + } + + @Override + public void remove(String region, String key) + { + try + { + cache.remove(getFqn(region), key); + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("JBoss Cache throw exception when removing object for key %s in region %s", key, region), e); + } + + } + + @Override + public PojoCache getDelegate() + { + return cache; + } + + @Override + public void clear() + { + try + { + cache.remove(getFqn(null)); + } + catch (CacheException e) + { + throw new IllegalStateException(String.format("JBoss Cache throw exception when clearing default cache."), e); + } + } + +} \ No newline at end of file Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -6,8 +6,8 @@ import org.drools.StatefulSession; import org.drools.spi.GlobalResolver; import org.drools.event.AgendaEventListener; -import org.drools.event.RuleFlowEventListener; import org.drools.event.WorkingMemoryEventListener; +import org.drools.event.process.ProcessEventListener; import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Destroy; @@ -100,9 +100,9 @@ { statefulSession.addEventListener((AgendaEventListener) eventListenerObject); } - else if(eventListenerObject instanceof RuleFlowEventListener) + else if(eventListenerObject instanceof ProcessEventListener) { - statefulSession.addEventListener((RuleFlowEventListener) eventListenerObject); + statefulSession.addEventListener((WorkingMemoryEventListener) eventListenerObject); } else { Deleted: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -1,31 +0,0 @@ -package org.jboss.seam.mock; - -import org.jboss.embedded.Bootstrap; - -public class EmbeddedBootstrap -{ - - public void startAndDeployResources() throws Exception - { - Bootstrap bootstrap = Bootstrap.getInstance(); - bootstrap.bootstrap(); - - if (resourceExists("seam.properties")) - { - bootstrap.deployResourceBases("seam.properties"); - } - if (resourceExists("META-INF/components.xml")) - { - bootstrap.deployResourceBases("META-INF/components.xml"); - } - if (resourceExists("META-INF/seam.properties")) - { - bootstrap.deployResourceBases("META-INF/seam.properties"); - } - } - - private boolean resourceExists(String name) - { - return Thread.currentThread().getContextClassLoader().getResource(name)!=null; - } -} Copied: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java-dep (from rev 14502, branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java) =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java-dep (rev 0) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java-dep 2012-04-06 13:16:04 UTC (rev 14531) @@ -0,0 +1,31 @@ +package org.jboss.seam.mock; + +import org.jboss.embedded.Bootstrap; + +public class EmbeddedBootstrap +{ + + public void startAndDeployResources() throws Exception + { + Bootstrap bootstrap = Bootstrap.getInstance(); + bootstrap.bootstrap(); + + if (resourceExists("seam.properties")) + { + bootstrap.deployResourceBases("seam.properties"); + } + if (resourceExists("META-INF/components.xml")) + { + bootstrap.deployResourceBases("META-INF/components.xml"); + } + if (resourceExists("META-INF/seam.properties")) + { + bootstrap.deployResourceBases("META-INF/seam.properties"); + } + } + + private boolean resourceExists(String name) + { + return Thread.currentThread().getContextClassLoader().getResource(name)!=null; + } +} Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -15,10 +15,12 @@ import org.hibernate.Filter; import org.hibernate.FlushMode; import org.hibernate.HibernateException; +import org.hibernate.IdentifierLoadAccess; import org.hibernate.Interceptor; import org.hibernate.LobHelper; import org.hibernate.LockMode; import org.hibernate.LockOptions; +import org.hibernate.NaturalIdLoadAccess; import org.hibernate.Query; import org.hibernate.ReplicationMode; import org.hibernate.SQLQuery; @@ -27,6 +29,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.SharedSessionBuilder; +import org.hibernate.SimpleNaturalIdLoadAccess; import org.hibernate.Transaction; import org.hibernate.TypeHelper; import org.hibernate.cache.spi.CacheKey; @@ -812,4 +815,34 @@ return ((EventSource) delegate).getLobHelper(); } + public IdentifierLoadAccess byId(String entityName) + { + return delegate.byId(entityName); + } + + public IdentifierLoadAccess byId(Class entityClass) + { + return delegate.byId(entityClass); + } + + public NaturalIdLoadAccess byNaturalId(String entityName) + { + return delegate.byNaturalId(entityName); + } + + public NaturalIdLoadAccess byNaturalId(Class entityClass) + { + return delegate.byNaturalId(entityClass); + } + + public SimpleNaturalIdLoadAccess bySimpleNaturalId(String entityName) + { + return delegate.bySimpleNaturalId(entityName); + } + + public SimpleNaturalIdLoadAccess bySimpleNaturalId(Class entityClass) + { + return delegate.bySimpleNaturalId(entityClass); + } + } Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/servlet/SeamListener.java =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/servlet/SeamListener.java 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam/src/main/java/org/jboss/seam/servlet/SeamListener.java 2012-04-06 13:16:04 UTC (rev 14531) @@ -14,7 +14,6 @@ import org.jboss.seam.Seam; import org.jboss.seam.contexts.ServletLifecycle; import org.jboss.seam.init.Initialization; -import org.jboss.seam.jmx.JBossClusterMonitor; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; @@ -48,16 +47,16 @@ public void sessionDestroyed(HttpSessionEvent event) { - JBossClusterMonitor monitor = JBossClusterMonitor.getInstance(event.getSession().getServletContext()); + /* JBossClusterMonitor monitor = JBossClusterMonitor.getInstance(event.getSession().getServletContext()); if (monitor != null && monitor.failover()) { // If application is unfarmed or all nodes shutdown simultaneously, cluster cache may still fail to retrieve SFSBs to destroy log.debug("Detected fail-over, not destroying session context"); } else - { + {*/ ServletLifecycle.endSession( event.getSession() ); - } + //} } } Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-debug/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-excel/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -59,8 +59,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>${version.testng}</version> - <classifier>jdk15</classifier> <optional>true</optional> <exclusions> <exclusion> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-flex/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-gen/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-gen/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-gen/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-ioc/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -74,11 +74,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - </dependencies> <profiles> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-jul/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-jul/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-jul/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-mail/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> @@ -57,7 +57,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> <scope>test</scope> </dependency> <dependency> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-parent/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> <name>Seam Parent</name> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <packaging>pom</packaging> <licenses> @@ -40,20 +40,19 @@  <version.arquillian_core>1.0.0.CR7</version.arquillian_core> - <version.richfaces>4.1.0.Final</version.richfaces> - <version.wicket>1.4.14</version.wicket> - <version.drools>5.1.1</version.drools> - <version.testng>5.10</version.testng> - <version.resteasy>2.0-beta-2</version.resteasy> - <version.spring>2.5.6.SEC02</version.spring> + <version.richfaces>4.1.0.Final</version.richfaces> + <version.drools>5.2.1.BRMS</version.drools> + <version.testng>5.14.10-redhat-1</version.testng> + <version.resteasy>2.3.2.Final-redhat-1</version.resteasy> + <version.spring>2.5.6.SEC03</version.spring> <version.jbossembedded>beta3.SP15</version.jbossembedded> - <version.jbossas7>7.1.0.Final</version.jbossas7> + <version.jbossas7>7.1.1.Final-redhat-1</version.jbossas7> <version.emma>2.0.5312</version.emma> <version.jsf2>2.1.5</version.jsf2> <version.junit>4.8.2</version.junit> - <version.hibernatevalidator>4.2.0.Final</version.hibernatevalidator> - <version.hibernatesearch>4.0.0.Final</version.hibernatesearch> - <version.hcore>4.0.1.Final</version.hcore> + <version.hibernatevalidator>4.2.0.Final-redhat-1</version.hibernatevalidator> + <version.hibernatesearch>4.1.0.CR1-redhat-1</version.hibernatesearch> + <version.hcore>4.1.1.Final-redhat-1</version.hcore>   @@ -83,11 +82,11 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-reference-guide</artifactId> - <version>${project.version}</version> - </dependency> + + + + +  <dependency> @@ -169,18 +168,6 @@ </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-rss</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-wicket</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -217,22 +204,10 @@ <version>1.7.0</version> </dependency> - - - - - - - - - - - - <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>3.2.10.SP3_seam2</version> + <version>3.2.11.SP1</version> <exclusions> <exclusion> <groupId>org.hibernate</groupId> @@ -263,7 +238,7 @@ </exclusions> </dependency> -  +  <dependency> <groupId>jgroups</groupId> @@ -459,12 +434,6 @@ <dependency> <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.3.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> <artifactId>jbossxb</artifactId> <version>1.0.0.CR8</version> <exclusions> @@ -511,17 +480,12 @@ </exclusions> </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.3.GA</version> - </dependency> -  <dependency> <groupId>net.sourceforge.jexcelapi</groupId> <artifactId>jxl</artifactId> - <version>2.6.8-seam</version> + + <version>2.6.10</version> <exclusions> <exclusion> <groupId>log4j</groupId> @@ -603,9 +567,9 @@ </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> + <version>1.0.0.Final-redhat-1</version> </dependency> <dependency> @@ -620,21 +584,21 @@ <version>1.1</version> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <exclusions> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - </exclusions> - </dependency> + + + + + + + + + + + + + + + <dependency> <groupId>org.codehaus.groovy</groupId> @@ -801,18 +765,6 @@ </dependency> <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.3.1</version> - </dependency> - - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3_min</artifactId> - <version>1.1.3.4.O</version> - </dependency> - - <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> <version>1.0_02.CR6</version> @@ -860,26 +812,25 @@ <version>2.2</version> </dependency> + + + + + - <dependency> - <groupId>jboss.jboss-aop</groupId> - <artifactId>jboss-aop</artifactId> - <version>1.5.0.GA</version> - </dependency> + + + + + + + + + + + <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>2.0.0.Beta11</version> - <exclusions> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>jboss</groupId> <artifactId>jboss-common-logging-spi</artifactId> <version>2.0.4.GA</version> @@ -936,7 +887,7 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> - <version>2.1.2</version> + <version>2.1.7</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -957,7 +908,7 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext-rtf</artifactId> - <version>2.1.2</version> + <version>2.1.7</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -1089,68 +1040,6 @@ </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket</artifactId> - <version>${version.wicket}</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-ioc</artifactId> - <version>${version.wicket}</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> - <version>${version.wicket}</version> - <exclusions> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-datetime</artifactId> - <version>${version.wicket}</version> - </dependency> - - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-tools</artifactId> <version>3.2.4.GA</version> @@ -1169,12 +1058,6 @@ </dependency> <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.8-brew</version> - </dependency> - - <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>common</artifactId> <version>3.2.0-v20060603</version> @@ -1238,7 +1121,6 @@ <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${version.testng}</version> - <classifier>jdk15</classifier> </dependency> <dependency> @@ -1340,36 +1222,6 @@ </dependency> <dependency> - <groupId>org.icefaces</groupId> - <artifactId>icefaces</artifactId> - <version>1.8.2</version> - </dependency> - - <dependency> - <groupId>org.icefaces</groupId> - <artifactId>icefaces-comps</artifactId> - <version>1.8.2</version> - </dependency> - - <dependency> - <groupId>org.icefaces</groupId> - <artifactId>icefaces-facelets</artifactId> - <version>1.8.2</version> - </dependency> - - <dependency> - <groupId>org.apache.myfaces.trinidad</groupId> - <artifactId>trinidad-api</artifactId> - <version>1.2.5</version> - </dependency> - - <dependency> - <groupId>org.apache.myfaces.trinidad</groupId> - <artifactId>trinidad-impl</artifactId> - <version>1.2.5</version> - </dependency> - - <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> <version>1.1</version> @@ -1416,7 +1268,7 @@ <artifactId>jboss-javaee-6.0</artifactId> <version>1.0.0.Final</version> <type>pom</type> - <scope>provided</scope> + <scope>import</scope> </dependency> <dependency> @@ -1650,28 +1502,28 @@ <module>../jboss-seam-pdf</module> <module>../jboss-seam-remoting</module> <module>../jboss-seam-resteasy</module> - <module>../jboss-seam-rss</module> - <module>../jboss-seam-wicket</module> + + <module>../jboss-seam-ioc</module> <module>../jboss-seam-jul</module> - <module>../jboss-embedded-bootstrap</module> + <module>../functional-tests</module> <module>../examples-ee6</module> <module>../seam-integration-tests</module> </modules> <profiles> -  +  <profile> <id>distribution</id> <modules> - <module>../seam-reference-guide</module> + <module>../distribution</module> </modules> <build> @@ -1807,26 +1659,26 @@ </pluginManagement> </build> </profile> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>2.2.1</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/seam/tags</tagBase> - <stagingRepository>https://repository.jboss.org/nexus/content/groups/staging</stagingRepository> - <tagNameFormat>JBoss_Seam_(a){project.version}</tagNameFormat> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> - <modules> - <module>../seam-reference-guide</module> - </modules> - </profile> + + + + + + + + + + + + + + + + + + + + </profiles> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-pdf/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-remoting/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -56,8 +56,8 @@ </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> <optional>true</optional> <scope>provided</scope> </dependency> @@ -65,7 +65,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> <scope>test</scope> </dependency> <dependency> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-resteasy/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -65,7 +65,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> <scope>test</scope> <exclusions> <exclusion> Modified: branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/jboss-seam-ui/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,14 +3,14 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <artifactId>jboss-seam-ui</artifactId> <name>Seam UI JSF2 support</name> <properties> - <version.richfaces>3.3.3.Final</version.richfaces> + <version.richfaces>3.3.1.SP3</version.richfaces> </properties> <build> @@ -19,7 +19,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.3.Final</version> + <version>${version.richfaces}</version> <executions> <execution> <phase>generate-sources</phase> @@ -167,7 +167,6 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> <scope>test</scope> </dependency> </dependencies> Modified: branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/seam-integration-tests/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -4,7 +4,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> @@ -104,13 +104,6 @@ </dependency> <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <type>pom</type> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> @@ -125,6 +118,25 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>jboss.web</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + </dependency> </dependencies> <profiles> Modified: branches/enterprise/WFK_2_0_PRE/seam-reference-guide/pom.xml =================================================================== --- branches/enterprise/WFK_2_0_PRE/seam-reference-guide/pom.xml 2012-04-06 07:05:18 UTC (rev 14530) +++ branches/enterprise/WFK_2_0_PRE/seam-reference-guide/pom.xml 2012-04-06 13:16:04 UTC (rev 14531) @@ -3,12 +3,10 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1</version> + <version>2.3.0.Beta1-redhat-1</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <groupId>org.jboss.seam</groupId> <artifactId>seam-reference-guide</artifactId> - <version>2.3.0.Beta1</version> <name>Seam Reference Guide</name> <packaging>jar</packaging>

12 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits April 2012