[jboss-cvs] JBossAS SVN: r100231 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 1 23:27:11 EST 2010
Author: marius.bogoevici
Date: 2010-02-01 23:27:10 -0500 (Mon, 01 Feb 2010)
New Revision: 100231
Added:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaInvoiceRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaMembershipRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPaymentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/jboss-spring.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/persistence.xml
Removed:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/BalanceRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-ear/src/main/application/META-INF/persistence.xml
Modified:
projects/snowdrop/examples/trunk/sportsclub/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Reservation.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PaymentRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PersonRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/Repository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernatePersonRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPersonRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/dao-context.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/infrastructure.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
JPA support. Add separate EAR module using JPA.
Modified: projects/snowdrop/examples/trunk/sportsclub/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/pom.xml 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/pom.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -19,6 +19,7 @@
<module>sportsclub-test-infrastructure</module>
<module>sportsclub-invoicing-ejb</module>
<module>sportsclub-invoicing-webmvc</module>
+ <module>sportsclub-jpa-ear</module>
</modules>
<packaging>pom</packaging>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Reservation.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Reservation.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Reservation.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -17,7 +17,7 @@
{
@Id @GeneratedValue
- private long id;
+ private Long id;
@Column(name = "fromDT", nullable = false)
private Date from;
Deleted: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/BalanceRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/BalanceRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/BalanceRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -1,17 +0,0 @@
-package org.jboss.snowdrop.samples.sportsclub.domain.repository;
-
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Balance;
-
-/**
- * Created by IntelliJ IDEA.
- * User: marius
- * Date: 16-Dec-2009
- * Time: 2:27:38 PM
- * To change this template use File | Settings | File Templates.
- */
-public interface BalanceRepository extends Repository<Balance, Long>
-{
-
- Balance findForAccount(Account account);
-}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PaymentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PaymentRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PaymentRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -1,8 +1,12 @@
package org.jboss.snowdrop.samples.sportsclub.domain.repository;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Payment;
+import java.util.List;
+
public interface PaymentRepository extends Repository<Payment, Long>
{
+ List<Payment> findForAccount(Account account);
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PersonRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PersonRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/PersonRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -8,7 +8,7 @@
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public interface PersonRepository extends Repository<Person, Integer>
+public interface PersonRepository extends Repository<Person, Long>
{
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/Repository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/Repository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/Repository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -1,6 +1,7 @@
package org.jboss.snowdrop.samples.sportsclub.domain.repository;
import java.util.Collection;
+import java.util.List;
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
@@ -13,7 +14,7 @@
void delete(T object);
- Collection<T> findAll();
+ List<T> findAll();
long countAll();
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -5,7 +5,7 @@
import java.util.List;
-public interface ReservationRepository extends Repository<Reservation, Integer>
+public interface ReservationRepository extends Repository<Reservation, Long>
{
List<Reservation> getByCriteria(ReservationSearchCriteria criteria);
Deleted: projects/snowdrop/examples/trunk/sportsclub/sportsclub-ear/src/main/application/META-INF/persistence.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-ear/src/main/application/META-INF/persistence.xml 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-ear/src/main/application/META-INF/persistence.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="sportsclubPU" transaction-type="JTA">
- <jta-data-source>java:/SportsClubDS</jta-data-source>
- <jar-file>lib/sportsclub-domain.jar</jar-file>
- <properties>
- <property name="jboss.entity.manager.jndi.name" value="java:/sportsclub/em"/>
- </properties>
- </persistence-unit>
-</persistence>
\ No newline at end of file
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernatePersonRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernatePersonRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernatePersonRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -8,7 +8,7 @@
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public class HibernatePersonRepository extends HibernateRepository<Person, Integer> implements PersonRepository
+public class HibernatePersonRepository extends HibernateRepository<Person, Long> implements PersonRepository
{
public HibernatePersonRepository()
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.util.Collection;
+import java.util.List;
/**
* Abstract repository using Hibernate SessionFactory.
@@ -50,9 +51,9 @@
getCurrentSession().delete(object);
}
- public Collection<T> findAll()
+ public List<T> findAll()
{
- return (Collection<T>)getCurrentSession().createCriteria(clazz).list();
+ return getCurrentSession().createCriteria(clazz).list();
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateReservationRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -15,7 +15,7 @@
/**
*/
-public class HibernateReservationRepository extends HibernateRepository<Reservation, Integer> implements ReservationRepository
+public class HibernateReservationRepository extends HibernateRepository<Reservation, Long> implements ReservationRepository
{
public HibernateReservationRepository()
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,40 @@
+package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Person;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.AccountRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.AccountSearchCriteria;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Repository
+public class JpaAccountRepository extends JpaRepository<Account, Long> implements AccountRepository {
+
+ public JpaAccountRepository() {
+ super(Account.class);
+ }
+
+ public int countByCriteria(AccountSearchCriteria accountSearchCriteria) {
+ return this.findAll().size(); // TODO create real implementation
+ }
+
+ public List<Account> findByPersonName(String name) {
+ // TODO create real implementation
+ return this.findAll();
+ }
+
+ public List<Account> findByCriteria(AccountSearchCriteria accountSearchCriteria) {
+ // TODO create real implementation
+ if (accountSearchCriteria.getRange() != null)
+ return this.findAll().subList(accountSearchCriteria.getRange().getMinIndex(), accountSearchCriteria.getRange().getMaxIndex());
+ else
+ return this.findAll();
+ }
+}
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaEquipmentRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,21 @@
+package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.EquipmentRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Repository
+public class JpaEquipmentRepository extends JpaRepository<Equipment,Long> implements EquipmentRepository{
+
+ public JpaEquipmentRepository() {
+ super(Equipment.class); //TODO: create real implementation
+ }
+
+ public EquipmentType[] getEquipmentTypes() {
+ return new EquipmentType[0]; //TODO: create real implementation
+ }
+}
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaInvoiceRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaInvoiceRepository.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaInvoiceRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,25 @@
+package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Invoice;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.InvoiceRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Repository
+public class JpaInvoiceRepository extends JpaRepository<Invoice, Long> implements InvoiceRepository {
+
+ public JpaInvoiceRepository() {
+ super(Invoice.class);
+ }
+
+ public List<Invoice> findForAccount(Account account) {
+ return Collections.emptyList(); //TODO create real implementation
+ }
+}
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaMembershipRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaMembershipRepository.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaMembershipRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,30 @@
+package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.MembershipRepository;
+import org.springframework.stereotype.Repository;
+
+import java.lang.reflect.Member;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Repository
+public class JpaMembershipRepository extends JpaRepository<Membership,String> implements MembershipRepository {
+
+ public JpaMembershipRepository() {
+ super(Membership.class);
+ }
+
+ public List<Membership> findAllActiveMembershipTypes() {
+ return Collections.emptyList();
+ }
+
+ public List<String> findAllMembershipCodes() {
+ return Collections.emptyList();
+ }
+}
+
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPaymentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPaymentRepository.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPaymentRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,24 @@
+package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Payment;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.PaymentRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Repository
+public class JpaPaymentRepository extends JpaRepository<Payment, Long> implements PaymentRepository{
+
+ public JpaPaymentRepository() {
+ super(Payment.class);
+ }
+
+ public List<Payment> findForAccount(Account account) {
+ return Collections.emptyList();
+ }
+}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPersonRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPersonRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaPersonRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -9,7 +9,7 @@
* @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
*/
@Repository
-public class JpaPersonRepository extends JpaRepository<Person, Integer> implements PersonRepository
+public class JpaPersonRepository extends JpaRepository<Person, Long> implements PersonRepository
{
public JpaPersonRepository()
{
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -5,6 +5,7 @@
import javax.persistence.EntityManager;
import java.io.Serializable;
import java.util.Collection;
+import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,7 @@
public void save(T object)
{
- this.entityManager.persist(object);
+ this.entityManager.merge(object);
}
public void delete(T object)
@@ -40,7 +41,7 @@
this.entityManager.remove(object);
}
- public Collection<T> findAll()
+ public List<T> findAll()
{
return entityManager.createQuery("SELECT c FROM " + clazz.getSimpleName() + " c").getResultList();
}
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaReservationRepository.java 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,29 @@
+package org.jboss.snowdrop.samples.sportsclub.dao.jpa;
+
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.ReservationRepository;
+import org.jboss.snowdrop.samples.sportsclub.domain.repository.criteria.ReservationSearchCriteria;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Repository
+public class JpaReservationRepository extends JpaRepository<Reservation, Long> implements ReservationRepository {
+
+ public JpaReservationRepository() {
+ super(Reservation.class);
+ }
+
+ public Integer countByCriteria(ReservationSearchCriteria criteria) {
+ return 0;
+ }
+
+ public List<Reservation> getByCriteria(ReservationSearchCriteria criteria) {
+ return Collections.emptyList();
+ }
+}
+
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/dao-context.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/dao-context.xml 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/dao-context.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -8,7 +8,21 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
- <context:component-scan base-package="org.jboss.snowdrop.samples.sportsclub.dao.jpa"/>
+ <context:annotation-config/>
+ <bean id="accountRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaAccountRepository"/>
+
+ <bean id="personRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaPersonRepository"/>
+
+ <bean id="membershipRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaMembershipRepository"/>
+
+ <bean id="reservationRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaReservationRepository"/>
+
+ <bean id="equipmentRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaEquipmentRepository"/>
+
+ <bean id="paymentRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaPaymentRepository"/>
+
+ <bean id="invoiceRepository" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.JpaInvoiceRepository"/>
+
<bean id="databaseInitializer" class="org.jboss.snowdrop.samples.sportsclub.dao.jpa.initializer.DatabaseInitializer"/>
</beans>
\ No newline at end of file
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/infrastructure.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/infrastructure.xml 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/resources/infrastructure.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -13,7 +13,7 @@
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd">
- <jee:jndi-lookup jndi-name="java:/sportsclub/em"/>
+ <jee:jndi-lookup id="entityManager" jndi-name="java:/sportsclub/em"/>
<tx:jta-transaction-manager/>
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/pom.xml (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/pom.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>sportsclub-parent</artifactId>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-jpa-ear</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>ear</packaging>
+ <name>Sports Club JPA EAR builder</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-subscriptions-ejb</artifactId>
+ <type>ejb</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-invoicing-ejb</artifactId>
+ <type>ejb</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-subscriptions-web</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-domain</artifactId>
+ <type>jar</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-jpa-dao</artifactId>
+ <type>jar</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-reservations-spring</artifactId>
+ <type>jar</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-reservations-web</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-invoicing-webmvc</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.3</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <displayName>Sports Club Sample Application</displayName>
+ <defaultLibBundleDir>/lib/</defaultLibBundleDir>
+ <generateApplicationXml>true</generateApplicationXml>
+ <workDirectory>${project.build.directory}/${project.build.finalName}-exploded.ear</workDirectory>
+ <modules>
+ <ejbModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-subscriptions-ejb</artifactId>
+ </ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-invoicing-ejb</artifactId>
+ </ejbModule>
+ <webModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-subscriptions-web</artifactId>
+ <contextRoot>/sportsclub/subscriptions</contextRoot>
+ </webModule>
+ <jarModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-domain</artifactId>
+ </jarModule>
+ <jarModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-jpa-dao</artifactId>
+ </jarModule>
+ <jarModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-reservations-spring</artifactId>
+ </jarModule>
+ <webModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-reservations-web</artifactId>
+ <contextRoot>/sportsclub/reservations</contextRoot>
+ </webModule>
+ <webModule>
+ <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+ <artifactId>sportsclub-invoicing-webmvc</artifactId>
+ <contextRoot>/sportsclub/invoicing</contextRoot>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>sportsclub</finalName>
+ </build>
+</project>
\ No newline at end of file
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/jboss-spring.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/jboss-spring.xml (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/jboss-spring.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <description>BeanFactory=(SpringDao)</description>
+
+ <import resource="classpath*:dao-context.xml"/>
+ <import resource="classpath*:infrastructure.xml"/>
+</beans>
\ No newline at end of file
Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/persistence.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/persistence.xml (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-ear/src/main/application/META-INF/persistence.xml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+ <persistence-unit name="sportsclubPU" transaction-type="JTA">
+ <jta-data-source>java:/SportsClubDS</jta-data-source>
+ <jar-file>lib/sportsclub-domain.jar</jar-file>
+ <properties>
+ <property name="jboss.entity.manager.jndi.name" value="java:/sportsclub/em"/>
+ <property name="hibernate.hbm2ddl.auto" value="create" />
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2010-02-02 04:24:47 UTC (rev 100230)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2010-02-02 04:27:10 UTC (rev 100231)
@@ -117,7 +117,7 @@
<h:outputText value="#{accountSearch.currentAccount.membership.annualFee}"/>
<h:outputLabel value="Outstanding Balance"/>
- <h:outputText value="#{accountSearch.currentAccount.balance.currentBalance}"/>
+ <h:outputText value="#{accountSearch.currentAccount.balance.amount}"/>
<a4j:commandButton id="closeAcctBtn" value="Close" action="#{accountSearch.closeAccount}" reRender="searchResults,accountData" rendered="#{!accountSearch.editing}"/>
<a4j:commandButton id="editAcctBtn" value="Edit" reRender="accountData" rendered="#{!accountSearch.editing}">
More information about the jboss-cvs-commits
mailing list