[seam-commits] [seam/catch] 6a23fc: Merge branch 'master' of github.com:seam/catch

Branch: refs/heads/master Home: https://github.com/seam/catch Commit: 6a23fc0b36b6d33dc6e32378286b3a71acc85e6f https://github.com/seam/catch/commit/6a23fc0b36b6d33dc6e32378286b3a71acc8... Author: LightGuard <lightguard.jp(a)gmail.com&gt; Date: 2010-12-02 (Thu, 02 Dec 2010) Changed paths: M api/pom.xml M examples/jaxrs/pom.xml M examples/jaxrs/readme.md M examples/jaxrs/src/main/java/org/jboss/seam/exception/control/example/jaxrs/handler/RestExceptionHandlers.java M examples/jaxrs/src/main/java/org/jboss/seam/exception/control/example/jaxrs/handler/declarative/DeclarativeRestExceptionHandlers.java M examples/jaxrs/src/main/java/org/jboss/seam/exception/control/example/jaxrs/handler/declarative/ExceptionResponseServiceHandler.java R examples/jaxrs/src/main/jboss/WEB-INF/beans.xml R examples/jaxrs/src/main/jboss/WEB-INF/classes/META-INF/persistence.xml R examples/jaxrs/src/main/jboss/WEB-INF/web.xml A examples/jaxrs/src/main/resources-glassfish/META-INF/persistence.xml A examples/jaxrs/src/main/resources-jbossas/META-INF/persistence.xml R examples/jaxrs/src/main/resources-jbossas/default-ds.xml R examples/jaxrs/src/main/resources/META-INF/persistence.xml M examples/jaxrs/src/main/resources/META-INF/seam-beans.xml M examples/jaxrs/src/main/webapp/WEB-INF/beans.xml M examples/jaxrs/src/main/webapp/WEB-INF/web.xml R examples/jaxrs/web/WEB-INF/web.xml Log Message: ----------- Merge branch 'master' of github.com:seam/catch Also trying to get all forms of declaring handlers to work Conflicts: examples/jaxrs/src/main/resources/META-INF/seam-beans.xml Commit: 8059bdd89a5981baf38db412f452b06d6908aa4f https://github.com/seam/catch/commit/8059bdd89a5981baf38db412f452b06d6908... Author: LightGuard <lightguard.jp(a)gmail.com&gt; Date: 2010-12-02 (Thu, 02 Dec 2010) Changed paths: M api/src/main/java/org/jboss/seam/exception/control/ExceptionResponse.java M examples/jaxrs/src/main/java/org/jboss/seam/exception/control/example/jaxrs/handler/RestExceptionResponse.java M examples/jaxrs/src/main/java/org/jboss/seam/exception/control/example/jaxrs/handler/declarative/DeclarativeRestExceptionHandlers.java M examples/jaxrs/src/main/resources/META-INF/seam-beans.xml Log Message: ----------- All handlers are working correctly now in the example This should complete coding work for Alpha2!