[jboss-cvs] JBossAS SVN: r99065 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jan 6 09:49:52 EST 2010 

Author: marius.bogoevici
Date: 2010-01-06 09:49:51 -0500 (Wed, 06 Jan 2010)
New Revision: 99065

Added:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/dummy.jsp
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/Account.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/initializer/DatabaseInitializer.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/pom.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingService.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingServiceImpl.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/pom.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/spring-servlet-context.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/web.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/index.jsp
Log:
more integration

Modified: projects/snowdrop/examples/trunk/sportsclub/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/pom.xml	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/pom.xml	2010-01-06 14:49:51 UTC (rev 99065)
@@ -6,6 +6,7 @@
     <artifactId>sportsclub-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>Sports Club Parent</name>
+
     <modules>
         <module>sportsclub-domain</module>
         <module>sportsclub-subscriptions-ejb</module>
@@ -16,8 +17,9 @@
         <module>sportsclub-reservations-spring</module>
         <module>sportsclub-test-infrastructure</module>
         <module>sportsclub-invoicing-ejb</module>
-       <module>sportsclub-invoicing-webmvc</module>
+        <module>sportsclub-invoicing-webmvc</module>
     </modules>
+    
     <packaging>pom</packaging>
 
     <dependencyManagement>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java	2010-01-06 14:49:51 UTC (rev 99065)
@@ -1,6 +1,7 @@
 package org.jboss.snowdrop.samples.sportsclub.domain.entity;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 
 import javax.persistence.CascadeType;
@@ -30,6 +31,14 @@
 
    private Date creationDate;
 
+
+   public void Account()
+   {
+      this.balance = new Balance();
+      this.balance.setAccount(this);
+      this.balance.setCurrentBalance(BigDecimal.ZERO);
+   }
+
    @ManyToOne
    private Membership membership;
 
@@ -107,7 +116,7 @@
 
    public BigDecimal getFeePerBillingPeriod()
    {
-      return membership.getAnnualFee().divide(BigDecimal.valueOf(billingType.periodsPerYear()));
+      return membership.getAnnualFee().divide(BigDecimal.valueOf(billingType.periodsPerYear()), 2, RoundingMode.CEILING);
    }
 
    public Balance getBalance()
@@ -115,13 +124,6 @@
       return balance;
    }
 
-   public void resetBalance()
-   {
-      this.balance = new Balance();
-      this.balance.setAccount(this);
-      this.balance.setCurrentBalance(BigDecimal.ZERO);
-   }
-
    @Override
    public boolean equals(Object o)
    {

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/initializer/DatabaseInitializer.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/initializer/DatabaseInitializer.java	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/initializer/DatabaseInitializer.java	2010-01-06 14:49:51 UTC (rev 99065)
@@ -144,7 +144,6 @@
       account.setCreationDate(new Date());
       account.setBillingType(billingType);
       account.setMembership(silverMembership);
-      account.resetBalance();
       account.setClosed(false);
       return account;
    }

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/pom.xml	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/pom.xml	2010-01-06 14:49:51 UTC (rev 99065)
@@ -8,6 +8,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
    <artifactId>sportsclub-invoicing-ejb</artifactId>
+   <packaging>ejb</packaging>
    <version>1.0-SNAPSHOT</version>
    <name>Sports Club Invoicing Spring Business Layer</name>
    <url>http://maven.apache.org</url>
@@ -19,6 +20,8 @@
       <dependency>
          <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
          <artifactId>sportsclub-domain</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.hibernate</groupId>
@@ -34,4 +37,14 @@
          <version>1.0.0.GA</version>
       </dependency>
    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-ejb-plugin</artifactId>
+                <configuration>
+                    <ejbVersion>3.0</ejbVersion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingService.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingService.java	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingService.java	2010-01-06 14:49:51 UTC (rev 99065)
@@ -5,11 +5,12 @@
 import javax.ejb.Local;
 
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Invoice;
 
 @Local
 public interface BillingService
 {
-   void generateInvoice(Account account);
+   Invoice generateInvoice(Account account);
 
    void processPayment(Account account, BigDecimal amount);
 }

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingServiceImpl.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingServiceImpl.java	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-ejb/src/main/java/org/jboss/spring/samples/sportsclub/invoicing/services/BillingServiceImpl.java	2010-01-06 14:49:51 UTC (rev 99065)
@@ -29,7 +29,7 @@
    @Spring(bean = "paymentRepository", jndiName = "SpringDao")
    private PaymentRepository paymentRepository;
 
-   public void generateInvoice(Account account)
+   public Invoice generateInvoice(Account account)
    {
       Invoice invoice = new Invoice();
       invoice.setAccount(account);
@@ -39,6 +39,7 @@
       Balance balance = balanceRepository.findForAccount(account);
       balance.debit(invoice.getAmount());
       balanceRepository.save(balance);
+      return invoice;
    }
 
    public void processPayment(Account account, BigDecimal amount)

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/pom.xml	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/pom.xml	2010-01-06 14:49:51 UTC (rev 99065)
@@ -1,42 +1,65 @@
 <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/maven-v4_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-invoicing-webmvc</artifactId>
-   <packaging>war</packaging>
-   <version>1.0-SNAPSHOT</version>
-   <name>sportsclub-invoicing-webmvc Maven Webapp</name>
-   <url>http://maven.apache.org</url>
-   <dependencies>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-           <artifactId>spring-webmvc</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.snowdrop</groupId>
-         <artifactId>snowdrop-vfs</artifactId>
-         <version>1.0.0.GA</version>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.javaee</groupId>
-         <artifactId>jboss-ejb-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
-         <artifactId>sportsclub-invoicing-ejb</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-   </dependencies>
-   <build>
-      <finalName>sportsclub-invoicing-webmvc</finalName>
-   </build>
+    <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-invoicing-webmvc</artifactId>
+    <packaging>war</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>sportsclub-invoicing-webmvc Maven Webapp</name>
+    <url>http://maven.apache.org</url>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>ejb3-persistence</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.snowdrop</groupId>
+            <artifactId>snowdrop-vfs</artifactId>
+            <version>1.0.0.GA</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-ejb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+            <artifactId>sportsclub-invoicing-ejb</artifactId>
+            <version>${project.version}</version>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+            <artifactId>sportsclub-subscriptions-ejb</artifactId>
+            <version>${project.version}</version>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+            <artifactId>sportsclub-domain</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>sportsclub-invoicing-webmvc</finalName>
+    </build>
 </project>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java	2010-01-06 14:49:51 UTC (rev 99065)
@@ -2,28 +2,32 @@
 
 import javax.ejb.EJB;
 
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Invoice;
+import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
 import org.jboss.spring.samples.sportsclub.invoicing.services.BillingService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
 
-/**
- * Created by IntelliJ IDEA.
- * User: marius
- * Date: 5-Jan-2010
- * Time: 3:27:59 PM
- * To change this template use File | Settings | File Templates.
- */
 @Controller
- at RequestMapping("/basic")
 public class BasicController
 {
-  @EJB
+  @EJB(mappedName = "sportsclub-ear-1.0-SNAPSHOT/BillingServiceImpl/local")
   BillingService billingService;
 
-  @RequestMapping
-  String doSomething()
+
+  @EJB(mappedName = "sportsclub-ear-1.0-SNAPSHOT/SubscriptionServiceImpl/local")
+  SubscriptionService subscriptionService;
+
+
+  @RequestMapping("/basic.do")
+  ModelAndView doSomething()
   {
-     return "dummy";
+     Account account = subscriptionService.findAccountsBySubscriberName("Vimes", 0, 1).get(0);
+     Invoice invoice = billingService.generateInvoice(account);
+     return new ModelAndView("dummy", "invoice", invoice);
   }
 }

Added: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/dummy.jsp
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/dummy.jsp	                        (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/jsp/dummy.jsp	2010-01-06 14:49:51 UTC (rev 99065)
@@ -0,0 +1,7 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+  <head><title>Simple jsp page</title></head>
+  <body>Invoice amount: <c:out value="${invoice.amount}"/></body>
+</html>
\ No newline at end of file

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/spring-servlet-context.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/spring-servlet-context.xml	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/spring-servlet-context.xml	2010-01-06 14:49:51 UTC (rev 99065)
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:context="http://www.springframework.org/schema/context"
        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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       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.springmvc"/>
+
+    <bean id="jspViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/jsp/"/>
+        <property name="suffix" value=".jsp"/>
+    </bean>
+    
 </beans>
\ No newline at end of file

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/web.xml	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/WEB-INF/web.xml	2010-01-06 14:49:51 UTC (rev 99065)
@@ -25,11 +25,15 @@
          <param-name>contextClass</param-name>
          <param-value>org.jboss.spring.vfs.context.VFSXmlWebApplicationContext</param-value>
       </init-param>
+     <init-param>
+         <param-name>contextConfigLocation</param-name>
+         <param-value>/WEB-INF/spring-servlet-context.xml</param-value>
+     </init-param>
    </servlet>
 
    <servlet-mapping>
       <servlet-name>spring-mvc-servlet</servlet-name>
-      <url-pattern>mvc/**</url-pattern>
+      <url-pattern>*.do</url-pattern>
    </servlet-mapping>
 </web-app>
 

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/index.jsp
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/index.jsp	2010-01-06 12:07:03 UTC (rev 99064)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/webapp/index.jsp	2010-01-06 14:49:51 UTC (rev 99065)
@@ -1,5 +1,5 @@
 <html>
 <body>
-<h2>Hello World!</h2>
+<h2>Deployed</h2>
 </body>
 </html>

More information about the jboss-cvs-commits mailing list