[seam-commits] [seam/faces] 5da5b1: Merge branch 'release/3.1.0.Beta4' into develop

Branch: refs/heads/master Home: https://github.com/seam/faces Commit: 5da5b18f95c0d461d770bf2c1db43811c7ace26d https://github.com/seam/faces/commit/5da5b18f95c0d461d770bf2c1db43811c7ac... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-10-24 (Mon, 24 Oct 2011) Changed paths: R docs/src/main/docbook/en-US/version_info.xml Log Message: ----------- Merge branch 'release/3.1.0.Beta4' into develop Commit: 160becd7551ec5402b18769256ea5bb8aec12f99 https://github.com/seam/faces/commit/160becd7551ec5402b18769256ea5bb8aec1... Author: Brian Leathem <bleathem(a)gmail.com&gt; Date: 2011-10-24 (Mon, 24 Oct 2011) Changed paths: M docs/src/main/docbook/en-US/faces-components.xml M docs/src/main/docbook/en-US/faces-installation.xml M docs/src/main/docbook/en-US/faces-projectstage.xml M docs/src/main/docbook/en-US/faces-scopes.xml A impl/src/main/java/org/jboss/seam/faces/conversion/ObjectConverter.java M impl/src/main/resources/META-INF/seam-faces.taglib.xml Log Message: ----------- Merge pull request #60 from LightGuard/feature/SEAMFACES-28 Adding the new entity / object converter and tag Commit: 0880b261d80b3313101f626d978c85dcf05a6430 https://github.com/seam/faces/commit/0880b261d80b3313101f626d978c85dcf05a... Author: LightGuard <lightguard.jp(a)gmail.com&gt; Date: 2011-10-26 (Wed, 26 Oct 2011) Changed paths: M impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigExtension.java M testsuite/pom.xml A testsuite/src/test/java/org/jboss/seam/faces/test/BaseArchive.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/Admin.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/SeamFaces210Test.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/ViewConfigEnum.java Log Message: ----------- Fixing SEAMFACES-210 Test included! Also setup server tests, we'll need a different package, and also a different Arquillian container setup to run JSFUnit / Drone tests. Commit: 4a6192e4bbb83cc53f41ce359d8cc069272ba157 https://github.com/seam/faces/commit/4a6192e4bbb83cc53f41ce359d8cc069272b... Author: gonzalad <adr_gonzalez(a)yahoo.fr&gt; Date: 2011-10-27 (Thu, 27 Oct 2011) Changed paths: M api/src/main/java/org/jboss/seam/faces/component/UIInputContainer.java A api/src/main/java/org/jboss/seam/faces/projectstage/Development.java A api/src/main/java/org/jboss/seam/faces/projectstage/Production.java A api/src/main/java/org/jboss/seam/faces/projectstage/ProjectStageDetector.java A api/src/main/java/org/jboss/seam/faces/projectstage/SystemTest.java A api/src/main/java/org/jboss/seam/faces/projectstage/UnitTest.java A api/src/main/java/org/jboss/seam/faces/projectstage/WebXmlLocator.java M dist/src/main/assembly/assembly.xml M docs/src/main/docbook/en-US/faces-author_group.xml M docs/src/main/docbook/en-US/faces-components.xml M docs/src/main/docbook/en-US/faces-installation.xml A docs/src/main/docbook/en-US/faces-projectstage.xml M docs/src/main/docbook/en-US/faces-scopes.xml M docs/src/main/docbook/en-US/master.xml R docs/src/main/docbook/en-US/version_info.xml M examples/short-ly/pom.xml M examples/short-ly/src/main/java/org/jboss/seam/faces/examples/shortly/TinyLink.java M examples/short-ly/src/test/java/org/jboss/seam/faces/examples/shortly/ftest/ShortlyTest.java R forge-plugin/pom.xml R forge-plugin/src/main/java/com/jboss/seam/faces/forge/FacesPlugin.java R forge-plugin/src/main/resources/META-INF/beans.xml R forge-plugin/src/main/resources/META-INF/forge.xml M impl/pom.xml A impl/src/main/java/org/jboss/seam/faces/conversion/ObjectConverter.java M impl/src/main/java/org/jboss/seam/faces/environment/SeamApplicationWrapper.java M impl/src/main/java/org/jboss/seam/faces/exception/CatchExceptionHandler.java A impl/src/main/java/org/jboss/seam/faces/projectstage/DirectoryNameWebXmlLocator.java A impl/src/main/java/org/jboss/seam/faces/projectstage/JNDIProjectStageDetector.java A impl/src/main/java/org/jboss/seam/faces/projectstage/ProjectStageExtension.java A impl/src/main/java/org/jboss/seam/faces/projectstage/SystemPropertyProjectStageDetector.java A impl/src/main/java/org/jboss/seam/faces/projectstage/URLClassLoaderWebXmlLocator.java A impl/src/main/java/org/jboss/seam/faces/projectstage/WebXmlContextParameterParser.java A impl/src/main/java/org/jboss/seam/faces/projectstage/WebXmlProjectStageDetector.java M impl/src/main/java/org/jboss/seam/faces/security/LoginListener.java M impl/src/main/java/org/jboss/seam/faces/security/SecurityPhaseListener.java M impl/src/main/resources/META-INF/seam-faces.taglib.xml M impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension A impl/src/main/resources/META-INF/services/org.jboss.seam.faces.projectstage.ProjectStageDetector A impl/src/main/resources/META-INF/services/org.jboss.seam.faces.projectstage.WebXmlLocator A impl/src/test/java/org/jboss/seam/faces/test/weld/projectstage/DirectoryNameWebXmlLocatorTest.java A impl/src/test/java/org/jboss/seam/faces/test/weld/projectstage/URLClassLoaderWebXmlLocatorTest.java M pom.xml R testsuite/common/pom.xml R testsuite/common/src/main/java/org/jboss/seam/faces/rewrite/RewriteConfigurationTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/MockLogger.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/MockLoggerProducer.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/PhaseTestBase.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/component/UIValidateFormTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/context/FacesAnnotationsAdapterExtensionTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/context/ImproperlyAnnotatedBean.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/context/MockFlashContext.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/context/conversation/ConversationBoundaryInterceptorTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/context/conversation/ConversationalBean.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/environment/ExternalContextProducerTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/environment/FacesContextProducerTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/environment/LocaleProducerTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/environment/MockApplication.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/environment/MockExternalContext.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/environment/MockFacesContext.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/event/MockPhaseEventObserver.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/event/PhaseEventBridgeTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/event/SystemEventBridgeTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/event/SystemEventObserver.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/security/IdentityMock.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/security/SecurityPhaseListenerTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/status/MessagesAdapterTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/ViewConfigStoreTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/ViewConfigTest.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/Icon.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/IconLiteral.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/QualifiedIcon.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/QualifiedIconLiteral.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/QualifiedUrl.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/QualifiedUrlLiteral.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/RestrictedAtRestoreView.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/RestrictedAtRestoreViewLiteral.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/RestrictedDefault.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/RestrictedDefaultLiteral.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/TestQualifier.java R testsuite/common/src/main/java/org/jboss/seam/faces/test/view/config/annotation/ViewConfigEnum.java R testsuite/common/src/main/java/org/jboss/seam/security/extension/SecurityExtension.java R testsuite/common/src/main/resources/arquillian.xml R testsuite/common/src/main/resources/org/jboss/seam/faces/test/context/conversation/ConversationBoundaryInterceptorTest-beans.xml R testsuite/common/src/main/resources/org/jboss/seam/faces/test/environment/mock.resource R testsuite/glassfish-embedded-3.1/pom.xml R testsuite/glassfish-embedded-3.1/src/test/resources/arquillian.xml R testsuite/jbossas-managed-7/pom.xml R testsuite/jbossas-managed-7/src/test/resources/arquillian.xml M testsuite/pom.xml A testsuite/src/test/java/org/jboss/seam/faces/rewrite/RewriteConfigurationTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/MockLogger.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/MockLoggerProducer.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/PhaseTestBase.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/component/UIValidateFormTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/ViewConfigStoreTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/ViewConfigTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/Icon.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/IconLiteral.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/QualifiedIcon.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/QualifiedIconLiteral.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/QualifiedUrl.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/QualifiedUrlLiteral.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/RestrictedAtRestoreView.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/RestrictedAtRestoreViewLiteral.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/RestrictedDefault.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/RestrictedDefaultLiteral.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/TestQualifier.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/config/annotation/ViewConfigEnum.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/context/FacesAnnotationsAdapterExtensionTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/context/ImproperlyAnnotatedBean.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/context/MockFlashContext.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/context/conversation/ConversationBoundaryInterceptorTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/context/conversation/ConversationalBean.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/environment/ExternalContextProducerTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/environment/FacesContextProducerTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/environment/LocaleProducerTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/environment/MockApplication.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/environment/MockExternalContext.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/environment/MockFacesContext.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/event/MockPhaseEventObserver.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/event/PhaseEventBridgeTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/event/SystemEventBridgeTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/event/SystemEventObserver.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/projectstage/DevelopmentStageBean.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/projectstage/NoStageRestrictionBean.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/projectstage/ProductionStageBean.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/projectstage/ProjectStageExtensionTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/projectstage/WebXmlContextParameterParserTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/security/IdentityMock.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/security/SecurityPhaseListenerTest.java A testsuite/src/test/java/org/jboss/seam/faces/test/weld/status/MessagesAdapterTest.java A testsuite/src/test/java/org/jboss/seam/security/extension/SecurityExtension.java A testsuite/src/test/resources/arquillian.xml A testsuite/src/test/resources/org/jboss/seam/faces/test/weld/context/conversation/ConversationBoundaryInterceptorTest-beans.xml A testsuite/src/test/resources/org/jboss/seam/faces/test/weld/environment/mock.resource A testsuite/src/test/resources/org/jboss/seam/faces/test/weld/projectstage/web.xml R testsuite/weld-ee-embedded-1.1/pom.xml R testsuite/weld-ee-embedded-1.1/src/test/resources/arquillian.xml Log Message: ----------- Merge remote-tracking branch 'upstream/develop' into develop Commit: 59f088082957a8034a1e69911ad7a8ace1ccf5ab https://github.com/seam/faces/commit/59f088082957a8034a1e69911ad7a8ace1cc... Author: gonzalad <adr_gonzalez(a)yahoo.fr&gt; Date: 2011-10-27 (Thu, 27 Oct 2011) Changed paths: M pom.xml Log Message: ----------- Use PrettyFaces dependency from seam-bom Needs to * upgrade seam-parent to 17-SNAPSHOT * modify seam-parent pom.xml to remove PrettyFaces dependency Commit: 7cafe2326121c2228ce4f2a0b42bbbb36a731ba2 https://github.com/seam/faces/commit/7cafe2326121c2228ce4f2a0b42bbbb36a73... Author: Brian Leathem <bleathem(a)gmail.com&gt; Date: 2011-11-03 (Thu, 03 Nov 2011) Changed paths: M examples/viewconfig/pom.xml M impl/pom.xml Log Message: ----------- Made the seam-transaction dependency optional Commit: 58f8ba7939fc23ace61698403588ed127b615394 https://github.com/seam/faces/commit/58f8ba7939fc23ace61698403588ed127b61... Author: Brian Leathem <bleathem(a)gmail.com&gt; Date: 2011-11-03 (Thu, 03 Nov 2011) Changed paths: M pom.xml Log Message: ----------- Merge pull request #63 from gonzalad/SEAMFACES-220 Seamfaces 220 Commit: 6546672a106859f2278056c95d8693853c5b2e88 https://github.com/seam/faces/commit/6546672a106859f2278056c95d8693853c5b... Author: Brian Leathem <bleathem(a)gmail.com&gt; Date: 2011-11-03 (Thu, 03 Nov 2011) Changed paths: M impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigExtension.java M testsuite/pom.xml A testsuite/src/test/java/org/jboss/seam/faces/test/BaseArchive.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/Admin.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/SeamFaces210Test.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/ViewConfigEnum.java Log Message: ----------- Merge pull request #61 from LightGuard/feature/SEAMFACES-210 Fixing SEAMFACES-210 Commit: 113863c5bf57d392807093db253bd5b52385bd2f https://github.com/seam/faces/commit/113863c5bf57d392807093db253bd5b52385... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-11-19 (Sat, 19 Nov 2011) Changed paths: M pom.xml Log Message: ----------- update parent, bom versions Commit: 2de955e71a6406816cdcf8856e8d5da473f2b398 https://github.com/seam/faces/commit/2de955e71a6406816cdcf8856e8d5da473f2... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-11-19 (Sat, 19 Nov 2011) Changed paths: M api/pom.xml M dist/pom.xml M docs/pom.xml M examples/short-ly/pom.xml M examples/viewconfig/pom.xml M impl/pom.xml M pom.xml M testsuite/pom.xml Log Message: ----------- [maven-release-plugin] prepare release 3.1.0.Beta5 Commit: 33e011fda9b28a419ed3db8b5d85f6f4d78d3870 https://github.com/seam/faces/commit/33e011fda9b28a419ed3db8b5d85f6f4d78d... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-11-19 (Sat, 19 Nov 2011) Changed paths: M api/pom.xml M dist/pom.xml M docs/pom.xml M examples/short-ly/pom.xml M examples/viewconfig/pom.xml M impl/pom.xml M pom.xml M testsuite/pom.xml Log Message: ----------- [maven-release-plugin] prepare for next development iteration Commit: de87b1f5865cae494945d0a9b789dc73e6274f52 https://github.com/seam/faces/commit/de87b1f5865cae494945d0a9b789dc73e627... Author: Shane Bryzak <sbryzak(a)gmail.com&gt; Date: 2011-11-19 (Sat, 19 Nov 2011) Changed paths: M docs/src/main/docbook/en-US/faces-components.xml M docs/src/main/docbook/en-US/faces-installation.xml M docs/src/main/docbook/en-US/faces-projectstage.xml M docs/src/main/docbook/en-US/faces-scopes.xml M examples/viewconfig/pom.xml M impl/pom.xml A impl/src/main/java/org/jboss/seam/faces/conversion/ObjectConverter.java M impl/src/main/java/org/jboss/seam/faces/view/config/ViewConfigExtension.java M impl/src/main/resources/META-INF/seam-faces.taglib.xml M pom.xml M testsuite/pom.xml A testsuite/src/test/java/org/jboss/seam/faces/test/BaseArchive.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/Admin.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/SeamFaces210Test.java A testsuite/src/test/java/org/jboss/seam/faces/test/server/security/config/ViewConfigEnum.java Log Message: ----------- Merge branch 'develop' Compare: https://github.com/seam/faces/compare/59785cb...de87b1f