[seam-commits] [seam/jcr] 5d6f8e: Merge branch 'master' of https://github.com/gastal...
Branch: refs/heads/master
Home: https://github.com/seam/jcr
Commit: 5d6f8e256fbf4e110486e06121f9c7f84d2656b9
https://github.com/seam/jcr/commit/5d6f8e256fbf4e110486e06121f9c7f84d2656b9
Author: John Ament <john.d.ament(a)gmail.com>
Date: 2011-03-03 (Thu, 03 Mar 2011)
Changed paths:
A api/.gitignore
A api/src/main/java/org/jboss/seam/jcr/annotations/JcrEventListener.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/NodeAdded.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/NodeMoved.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/NodeRemoved.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/Persist.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/PropertyAdded.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/PropertyChanged.java
A api/src/main/java/org/jboss/seam/jcr/annotations/events/PropertyRemoved.java
A combined/.gitignore
A dist/.gitignore
A docs/.gitignore
A impl/.gitignore
A impl/src/main/java/org/jboss/seam/jcr/events/JcrCDIEventListener.java
A impl/src/main/java/org/jboss/seam/jcr/events/NodeAddedLiteral.java
A impl/src/main/java/org/jboss/seam/jcr/events/NodeMovedLiteral.java
A impl/src/main/java/org/jboss/seam/jcr/events/NodeRemovedLiteral.java
A impl/src/main/java/org/jboss/seam/jcr/events/PersistLiteral.java
A impl/src/main/java/org/jboss/seam/jcr/events/PropertyAddedLiteral.java
A impl/src/main/java/org/jboss/seam/jcr/events/PropertyChangedLiteral.java
A impl/src/main/java/org/jboss/seam/jcr/events/PropertyRemovedLiteral.java
M impl/src/main/java/org/jboss/seam/jcr/producers/RepositorySessionProducer.java
A impl/src/test/java/org/jboss/seam/jcr/events/EventCounterListener.java
A impl/src/test/java/org/jboss/seam/jcr/events/JcrCDIEventListenerTest.java
M impl/src/test/java/org/jboss/seam/jcr/producers/RepositorySessionProducerTest.java
Log Message:
-----------
Merge branch 'master' of https://github.com/gastaldi/jcr
Conflicts:
impl/src/main/java/org/jboss/seam/jcr/producers/RepositorySessionProducer.java