[seam-commits] [seam/jcr] 990a68: Merge remote-tracking branch 'upstream/master'

Branch: refs/heads/master Home: https://github.com/seam/jcr Commit: 990a6840485a22a2ba475ee3f2ca9e5d8e80d19d https://github.com/seam/jcr/commit/990a6840485a22a2ba475ee3f2ca9e5d8e80d19d Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Changed paths: M api/.gitignore M combined/.gitignore M combined/pom.xml M dist/.gitignore M dist/pom.xml M dist/src/main/assembly/assembly.xml M dist/src/main/assembly/license.txt M dist/src/main/assembly/notice.txt M dist/src/main/assembly/readme.txt M docs/.gitignore M docs/pom.xml M docs/src/main/assembly/assembly.xml M docs/src/main/docbook/en-US/book_info.xml M docs/src/main/docbook/en-US/jcr-introduction.xml M docs/src/main/docbook/en-US/master.xml M impl/.gitignore A impl/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java M impl/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java A impl/src/test/resources/modeshape.xml M pom.xml M readme.md Log Message: ----------- Merge remote-tracking branch 'upstream/master' Conflicts: impl/src/main/java/org/jboss/seam/jcr/producers/RepositorySessionProducer.java Commit: 9a88331ff1a640dfc525152d71dbc88408210440 https://github.com/seam/jcr/commit/9a88331ff1a640dfc525152d71dbc88408210440 Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Log Message: ----------- Merged Commit: b3690848b42988ff100d38acc295b8b73b6b3f10 https://github.com/seam/jcr/commit/b3690848b42988ff100d38acc295b8b73b6b3f10 Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Changed paths: M impl/pom.xml R impl/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java R impl/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java R impl/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java R impl/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java M pom.xml A tests/jackrabbit/.classpath A tests/jackrabbit/.project A tests/jackrabbit/.settings/org.eclipse.jdt.core.prefs A tests/jackrabbit/.settings/org.maven.ide.eclipse.prefs A tests/jackrabbit/pom.xml A tests/jackrabbit/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java A tests/jackrabbit/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java A tests/jackrabbit/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java A tests/modeshape/.classpath A tests/modeshape/.project A tests/modeshape/.settings/org.eclipse.jdt.core.prefs A tests/modeshape/.settings/org.maven.ide.eclipse.prefs A tests/modeshape/pom.xml A tests/modeshape/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java A tests/modeshape/src/test/resources/modeshape.xml A tests/pom.xml Log Message: ----------- SEAMJCR-11 Commit: 48b5c48abd51894b763da3c289060d390e65eb19 https://github.com/seam/jcr/commit/48b5c48abd51894b763da3c289060d390e65eb19 Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Log Message: ----------- SEAMJCR-11 Commit: 799d9fdbccb5a0f83df94a574bd7438bc3fbe7a9 https://github.com/seam/jcr/commit/799d9fdbccb5a0f83df94a574bd7438bc3fbe7a9 Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Changed paths: A tests/.gitignore A tests/jackrabbit/.gitignore A tests/modeshape/.gitignore Log Message: ----------- SEAMJCR-11 Commit: c803e1f34d05e3abe16dbdd34b6185151f5c0467 https://github.com/seam/jcr/commit/c803e1f34d05e3abe16dbdd34b6185151f5c0467 Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Log Message: ----------- Merge branch 'master' of https://github.com/gastaldi/jcr Commit: 24a2f513117e1ccc4ce0b0b229fb0ce9362616eb https://github.com/seam/jcr/commit/24a2f513117e1ccc4ce0b0b229fb0ce9362616eb Author: George Gastaldi <gastaldi(a)apache.org&gt; Date: 2011-03-03 (Thu, 03 Mar 2011) Log Message: ----------- Removed .resources Commit: 068ab9a5b77e8811cd4a89fac1ed220df1d3320e https://github.com/seam/jcr/commit/068ab9a5b77e8811cd4a89fac1ed220df1d3320e Author: John Ament <john.d.ament(a)gmail.com&gt; Date: 2011-03-04 (Fri, 04 Mar 2011) Changed paths: A docs/src/main/docbook/en-US/event-mapping.xml A docs/src/main/docbook/en-US/jackrabbit.xml M docs/src/main/docbook/en-US/jcr-introduction.xml M docs/src/main/docbook/en-US/master.xml A docs/src/main/docbook/en-US/modeshape.xml A impl/derby.log M impl/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java M impl/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java M impl/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java M pom.xml Log Message: ----------- SEAMJCR-6 Added more documentation. Cleaned up test cases. Commit: e7e18ce781fda6c7183316cd093a98e7afe63576 https://github.com/seam/jcr/commit/e7e18ce781fda6c7183316cd093a98e7afe63576 Author: John Ament <john.d.ament(a)gmail.com&gt; Date: 2011-03-04 (Fri, 04 Mar 2011) Changed paths: M api/.gitignore M combined/.gitignore M combined/pom.xml M dist/.gitignore M dist/pom.xml M dist/src/main/assembly/assembly.xml M dist/src/main/assembly/license.txt M dist/src/main/assembly/notice.txt M dist/src/main/assembly/readme.txt M docs/.gitignore M docs/pom.xml M docs/src/main/assembly/assembly.xml M docs/src/main/docbook/en-US/book_info.xml M docs/src/main/docbook/en-US/jcr-introduction.xml M docs/src/main/docbook/en-US/master.xml M impl/.gitignore M impl/pom.xml R impl/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java R impl/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java R impl/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java R impl/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java M impl/src/test/resources/modeshape.xml M pom.xml M readme.md A tests/.gitignore A tests/jackrabbit/.classpath A tests/jackrabbit/.gitignore A tests/jackrabbit/.project A tests/jackrabbit/.settings/org.eclipse.jdt.core.prefs A tests/jackrabbit/.settings/org.maven.ide.eclipse.prefs A tests/jackrabbit/pom.xml A tests/jackrabbit/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java A tests/jackrabbit/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java A tests/jackrabbit/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java A tests/modeshape/.classpath A tests/modeshape/.gitignore A tests/modeshape/.project A tests/modeshape/.settings/org.eclipse.jdt.core.prefs A tests/modeshape/.settings/org.maven.ide.eclipse.prefs A tests/modeshape/pom.xml A tests/modeshape/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java A tests/modeshape/src/test/resources/modeshape.xml A tests/pom.xml Log Message: ----------- Merge branch 'master' of https://github.com/gastaldi/jcr Conflicts: docs/src/main/docbook/en-US/jcr-introduction.xml docs/src/main/docbook/en-US/master.xml pom.xml tests/jackrabbit/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java tests/modeshape/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java Commit: 4942e7b62ddbd7980f024b88b8039f8afd1882ec https://github.com/seam/jcr/commit/4942e7b62ddbd7980f024b88b8039f8afd1882ec Author: John Ament <john.d.ament(a)gmail.com&gt; Date: 2011-03-04 (Fri, 04 Mar 2011) Changed paths: M docs/src/main/docbook/en-US/jcr-introduction.xml M docs/src/main/docbook/en-US/master.xml M pom.xml M tests/jackrabbit/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java M tests/modeshape/src/test/java/org/jboss/seam/jcr/producers/RepositoryInjectTest.java Log Message: ----------- Merge in changes. Commit: 682a4c7ea59d35f209fe6acbd09b5f2d35232984 https://github.com/seam/jcr/commit/682a4c7ea59d35f209fe6acbd09b5f2d35232984 Author: John Ament <john.d.ament(a)gmail.com&gt; Date: 2011-03-04 (Fri, 04 Mar 2011) Changed paths: R api/src/main/java/org/jboss/seam/jcr/annotations/events/NodeAdded.java R api/src/main/java/org/jboss/seam/jcr/annotations/events/NodeMoved.java R api/src/main/java/org/jboss/seam/jcr/annotations/events/NodeRemoved.java R api/src/main/java/org/jboss/seam/jcr/annotations/events/Persist.java R api/src/main/java/org/jboss/seam/jcr/annotations/events/PropertyAdded.java R api/src/main/java/org/jboss/seam/jcr/annotations/events/PropertyChanged.java R api/src/main/java/org/jboss/seam/jcr/annotations/events/PropertyRemoved.java R impl/derby.log M impl/src/main/java/org/jboss/seam/jcr/events/JcrCDIEventListener.java R impl/src/main/java/org/jboss/seam/jcr/events/NodeAddedLiteral.java R impl/src/main/java/org/jboss/seam/jcr/events/NodeMovedLiteral.java R impl/src/main/java/org/jboss/seam/jcr/events/NodeRemovedLiteral.java R impl/src/main/java/org/jboss/seam/jcr/events/PersistLiteral.java R impl/src/main/java/org/jboss/seam/jcr/events/PropertyAddedLiteral.java R impl/src/main/java/org/jboss/seam/jcr/events/PropertyChangedLiteral.java R impl/src/main/java/org/jboss/seam/jcr/events/PropertyRemovedLiteral.java M impl/src/main/java/org/jboss/seam/jcr/producers/RepositorySessionProducer.java A tests/jackrabbit/derby.log M tests/jackrabbit/pom.xml M tests/jackrabbit/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java M tests/jackrabbit/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java M tests/modeshape/pom.xml A tests/modeshape/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java A tests/modeshape/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java M tests/modeshape/src/test/resources/modeshape.xml M tests/pom.xml Log Message: ----------- SEAMJCR-8 CDI Events ignore qualifiers, removed qualifiers. Fixed issues running tests in ModeShape since ModeShape uses background threads. Commit: 2d9ee41193f8cff4c62a40de275ee5ca8db3f8dd https://github.com/seam/jcr/commit/2d9ee41193f8cff4c62a40de275ee5ca8db3f8dd Author: John Ament <john.d.ament(a)gmail.com&gt; Date: 2011-03-04 (Fri, 04 Mar 2011) Changed paths: M .gitignore R tests/jackrabbit/derby.log M tests/modeshape/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java Log Message: ----------- Added extra comments when running ModeShape tests. Compare: https://github.com/seam/jcr/compare/5d6f8e2...2d9ee41