Author: adamw Date: 2008-09-03 05:48:55 -0400 (Wed, 03 Sep 2008) New Revision: 147 Added: demos/seam/lib/envers-1.1.0.beta1.jar demos/seam/lib/hibernate3.jar demos/seam/lib/lucene-core-2.3.0.jar Removed: demos/seam/lib/envers-1.0.0.ga.jar demos/seam/lib/hibernate.jar demos/seam/lib/lucene-core.jar Modified: demos/seam/build.xml demos/seam/lib/hibernate-annotations.jar demos/seam/lib/hibernate-entitymanager.jar demos/seam/lib/hibernate-search.jar demos/seam/src/action/org/jboss/envers/demo/seam/persons/PersonsAddresses.java demos/seam/src/action/org/jboss/envers/demo/seam/persons/Register.java Log: Updated demo Modified: demos/seam/build.xml =================================================================== --- demos/seam/build.xml 2008-09-03 08:41:02 UTC (rev 146) +++ demos/seam/build.xml 2008-09-03 09:48:55 UTC (rev 147) @@ -153,8 +153,8 @@ <include name="lib/richfaces-api*.jar" /> <include name="lib/jsf-facelets*.jar"/> <include name="lib/envers*.jar"/> - <!--<include name="lib/hibernate*.jar"/> - <include name="lib/lucene*.jar"/>--> + <include name="lib/hibernate*.jar"/> + <include name="lib/lucene*.jar"/> </fileset> </copy> <copy todir="${ear.dir}/META-INF"> Deleted: demos/seam/lib/envers-1.0.0.ga.jar =================================================================== (Binary files differ) Added: demos/seam/lib/envers-1.1.0.beta1.jar =================================================================== (Binary files differ) Property changes on: demos/seam/lib/envers-1.1.0.beta1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: demos/seam/lib/hibernate-annotations.jar =================================================================== (Binary files differ) Modified: demos/seam/lib/hibernate-entitymanager.jar =================================================================== (Binary files differ) Modified: demos/seam/lib/hibernate-search.jar =================================================================== (Binary files differ) Deleted: demos/seam/lib/hibernate.jar =================================================================== (Binary files differ) Added: demos/seam/lib/hibernate3.jar =================================================================== (Binary files differ) Property changes on: demos/seam/lib/hibernate3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: demos/seam/lib/lucene-core-2.3.0.jar =================================================================== (Binary files differ) Property changes on: demos/seam/lib/lucene-core-2.3.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: demos/seam/lib/lucene-core.jar =================================================================== (Binary files differ) Modified: demos/seam/src/action/org/jboss/envers/demo/seam/persons/PersonsAddresses.java =================================================================== --- demos/seam/src/action/org/jboss/envers/demo/seam/persons/PersonsAddresses.java 2008-09-03 08:41:02 UTC (rev 146) +++ demos/seam/src/action/org/jboss/envers/demo/seam/persons/PersonsAddresses.java 2008-09-03 09:48:55 UTC (rev 147) @@ -4,7 +4,6 @@ import org.jboss.seam.annotations.Name; import org.jboss.envers.VersionsReader; import org.jboss.envers.query.VersionsRestrictions; -import org.hibernate.criterion.Order; import javax.persistence.NoResultException; import java.util.List; @@ -37,9 +36,9 @@ public List<Registration> getRegistrations() { if (registrations == null) { registrations = versionsReader.createQuery() - .forRevisionsOfEntity(Registration.class, true) + .forRevisionsOfEntity(Registration.class, true, false) .add(VersionsRestrictions.relatedIdEq("person", person.getId())) - .addOrder(Order.asc("registrationDate")) + .addOrder("registrationDate", true) .getResultList(); } @@ -49,7 +48,7 @@ public void check() { try { regOnCheckDate = (Registration) versionsReader.createQuery() - .forRevisionsOfEntity(Registration.class, true) + .forRevisionsOfEntity(Registration.class, true, false) .add(VersionsRestrictions.maximizeProperty("actualDate") .add(VersionsRestrictions.relatedIdEq("person", person.getId())) .add(VersionsRestrictions.le("registrationDate", addressCheckDate)) @@ -61,7 +60,7 @@ try { regNow = (Registration) versionsReader.createQuery() - .forRevisionsOfEntity(Registration.class, true) + .forRevisionsOfEntity(Registration.class, true, false) .add(VersionsRestrictions.maximizeProperty("actualDate") .add(VersionsRestrictions.relatedIdEq("person", person.getId())) .add(VersionsRestrictions.le("actualDate", addressCheckDate))) Modified: demos/seam/src/action/org/jboss/envers/demo/seam/persons/Register.java =================================================================== --- demos/seam/src/action/org/jboss/envers/demo/seam/persons/Register.java 2008-09-03 08:41:02 UTC (rev 146) +++ demos/seam/src/action/org/jboss/envers/demo/seam/persons/Register.java 2008-09-03 09:48:55 UTC (rev 147) @@ -59,9 +59,9 @@ public boolean register() { // Checking if there is no registration with the same registration date already - int registrationsWithSameRegDate = (Integer) versionsReader.createQuery() - .forRevisionsOfEntity(Registration.class, false) - .setProjection(RevisionProperty.count()) + long registrationsWithSameRegDate = (Long) versionsReader.createQuery() + .forRevisionsOfEntity(Registration.class, false, false) + .addProjection(RevisionProperty.count()) .add(VersionsRestrictions.relatedIdEq("person", person.getId())) .add(VersionsRestrictions.eq("registrationDate", registrationDate)) .getSingleResult(); @@ -73,9 +73,9 @@ } // Checking if there is no registration with the same actual date already - int registrationsWithSameActDate = (Integer) versionsReader.createQuery() - .forRevisionsOfEntity(Registration.class, false) - .setProjection(RevisionProperty.count()) + long registrationsWithSameActDate = (Long) versionsReader.createQuery() + .forRevisionsOfEntity(Registration.class, false, false) + .addProjection(RevisionProperty.count()) .add(VersionsRestrictions.relatedIdEq("person", person.getId())) .add(VersionsRestrictions.eq("actualDate", actualDate)) .getSingleResult();