You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ec...@apache.org on 2008/04/08 08:41:00 UTC

svn commit: r645776 [4/9] - in /geronimo/samples/branches/1.1: ./ migration-ejb-bmp/ migration-ejb-bmp/config/ migration-ejb-bmp/config/geronimo/ migration-ejb-bmp/config/jboss/ migration-ejb-bmp/src/ migration-ejb-bmp/src/META-INF/ migration-ejb-bmp/s...

Added: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,154 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/*
+ * Created on Nov 12, 2006
+ *
+ * 
+ */
+package org.apache.geronimo.samples.computer.web;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.ejb.CreateException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.samples.computer.ejb.ItemServiceLocal;
+import org.apache.geronimo.samples.computer.ejb.ItemServiceLocalHome;
+
+public class ItemServiceDispatchServlet extends HttpServlet {
+
+    private static final long serialVersionUID = -3351294634090089534L;
+
+    /**
+     * Constructor of the object.
+     */
+    public ItemServiceDispatchServlet() {
+        super();
+    }
+
+    /**
+     * Destruction of the servlet. <br>
+     */
+    public void destroy() {
+        super.destroy(); // Just puts "destroy" string in log
+        // Put your code here
+    }
+
+    /**
+     * The doGet method of the servlet. <br>
+     *
+     * This method is called when a form has its tag value method equals to get.
+     * 
+     * @param request the request send by the client to the server
+     * @param response the response send by the server to the client
+     * @throws ServletException if an error occurred
+     * @throws IOException if an error occurred
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String page = request.getServletPath();
+        
+        if(page.equals("/listItems")){
+            listItems(request, response);
+        }else if(page.equals("/buyItem")){
+            buyItem(request, response);
+        }
+        
+    }
+
+    /**
+     * The doPost method of the servlet. <br>
+     *
+     * This method is called when a form has its tag value method equals to post.
+     * 
+     * @param request the request send by the client to the server
+     * @param response the response send by the server to the client
+     * @throws ServletException if an error occurred
+     * @throws IOException if an error occurred
+     */
+    public void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    /**
+     * Initialization of the servlet. <br>
+     *
+     * @throws ServletException if an error occure
+     */
+    public void init() throws ServletException {
+        // Put your code here
+    }
+    
+    private void listItems(HttpServletRequest request, HttpServletResponse response) 
+            throws ServletException, IOException {
+        String path = "/jsp/error.jsp";
+        String error = null;
+        
+        try {
+            Context context = new InitialContext();
+            ItemServiceLocalHome home = (ItemServiceLocalHome)context.lookup(ItemServiceLocalHome.COMP_NAME);
+            ItemServiceLocal itemService = home.create();
+            List itemList = itemService.listItems();
+            
+            request.getSession().setAttribute("itemList",itemList);
+            path = "/jsp/list_items.jsp";
+            
+        } catch (NamingException e) {
+            error = "ItemService EJB not found";
+        } catch (CreateException e) {
+            error = "ItemService Instance can not be created";
+        } catch (Exception e){
+            e.printStackTrace();
+            error = "Undefined State Exception";
+        }
+        
+        if(error != null){
+            request.setAttribute("error", error);
+        }
+            
+        getServletContext().getRequestDispatcher(path).forward(request, response);
+    }
+    
+    private void buyItem(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String path = "/jsp/error.jsp";
+        String error = null;
+        String itemId = request.getParameter("itemId");
+        
+        if(itemId != null && !itemId.equals("")){
+            request.setAttribute("itemId",itemId);
+            path = "/jsp/buy_item.jsp";
+        }else {
+            error = "Undefined State Exception";
+        }
+        
+        if(error != null){
+            request.setAttribute("error",error);
+        }
+
+        getServletContext().getRequestDispatcher(path).forward(request, response);        
+    }
+  
+}

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ItemServiceDispatchServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,199 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/*
+ * Created on Nov 13, 2006
+ *
+ * 
+ */
+package org.apache.geronimo.samples.computer.web;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.ejb.CreateException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.samples.computer.dto.ItemDTO;
+import org.apache.geronimo.samples.computer.ejb.ShoppingCartLocal;
+import org.apache.geronimo.samples.computer.ejb.ShoppingCartLocalHome;
+
+public class ShoppingCartDispatchServlet extends HttpServlet {
+
+    private static final long serialVersionUID = 3595079963765646121L;
+
+    /**
+     * Constructor of the object.
+     */
+    public ShoppingCartDispatchServlet() {
+        super();
+    }
+
+    /**
+     * Destruction of the servlet. <br>
+     */
+    public void destroy() {
+        super.destroy(); // Just puts "destroy" string in log
+        // Put your code here
+    }
+
+    /**
+     * The doGet method of the servlet. <br>
+     *
+     * This method is called when a form has its tag value method equals to get.
+     * 
+     * @param request the request send by the client to the server
+     * @param response the response send by the server to the client
+     * @throws ServletException if an error occurred
+     * @throws IOException if an error occurred
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        String page = request.getServletPath();
+        
+        if(page.equals("/addToCart")){
+            addToCart(request, response);
+        }else if(page.equals("/removeTransaction")){
+            removeTransaction(request, response);
+        }
+    }
+
+    /**
+     * The doPost method of the servlet. <br>
+     *
+     * This method is called when a form has its tag value method equals to post.
+     * 
+     * @param request the request send by the client to the server
+     * @param response the response send by the server to the client
+     * @throws ServletException if an error occurred
+     * @throws IOException if an error occurred
+     */
+    public void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        doGet(request , response);
+    }
+
+    /**
+     * Initialization of the servlet. <br>
+     *
+     * @throws ServletException if an error occure
+     */
+    public void init() throws ServletException {
+        // Put your code here
+    }
+    
+    private void addToCart(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        
+        String path = "/jsp/error.jsp";
+        String error = null;
+        
+        boolean isValidQuantity = false; 
+        try {
+            int quantity = Integer.parseInt((String)request.getParameter("quantity"));
+            isValidQuantity = true;
+            
+            String itemId = (String)request.getParameter("itemId");
+            Object obj = request.getSession().getAttribute("shoppingCart");
+            
+            ShoppingCartLocal cart = null;
+            if(obj == null){
+                Context context = new InitialContext();
+                ShoppingCartLocalHome home = (ShoppingCartLocalHome)context.lookup(ShoppingCartLocalHome.COMP_NAME);
+                cart = home.create();
+                request.getSession().setAttribute("shoppingCart",cart);
+            }else {
+                cart = (ShoppingCartLocal)obj;
+            }
+            
+            List itemList = (List)request.getSession().getAttribute("itemList");
+            
+            for(Iterator iterator = itemList.iterator(); iterator.hasNext();){
+                ItemDTO item = (ItemDTO)iterator.next();
+                
+                if(item.getItemId() == Integer.parseInt(itemId)){
+                    boolean status = cart.addToCart(item, quantity);
+                    
+                    if(status){//successfully added to the cart
+                        double total = cart.getTotal();
+                        List transactionList = cart.listCartTransactions();
+                        request.setAttribute("transactionList", transactionList);
+                        request.setAttribute("total", new Double(total));
+                        
+                        path = "/jsp/shopping_cart.jsp";
+                    }else {
+                        error = "Can't Add same Item to the Shopping Cart Twise";
+                    }
+                    break;
+                }
+            }
+            
+        } catch (NamingException e) {
+            error = "ShoppingCart EJB not found";
+        } catch (CreateException e) {
+            error = "ShoppingCart Instance can not be created";
+        } catch (Exception e){
+            if(isValidQuantity){
+                error = "Undefined State Exception";
+            }else {
+                error = "Invalid Number format to Quantity Field";
+            }
+            
+        }
+        
+        if(error != null){
+            request.setAttribute("error", error);
+        }
+            
+        getServletContext().getRequestDispatcher(path).forward(request, response);
+    }
+    
+    private void removeTransaction(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        
+        String path = "/jsp/error.jsp";
+        String error = null;
+        
+        try {
+            String itemId = (String)request.getParameter("itemId");            
+            Object obj = request.getSession().getAttribute("shoppingCart");
+            
+            if(obj != null){
+                ShoppingCartLocal cart = (ShoppingCartLocal)obj;
+                cart.removeTransaction(Integer.parseInt(itemId));
+                path = "/listItems";
+            }else {
+                error = "Undefined State Exception";
+            }
+        } catch (NumberFormatException e) {        
+           error = "Undefined State Exception";
+        }
+        
+        if(error != null){
+           request.setAttribute("error",error); 
+        }
+        
+        getServletContext().getRequestDispatcher(path).forward(request, response);
+    }
+
+}

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/src/org/apache/geronimo/samples/computer/web/ShoppingCartDispatchServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+      <dep:artifactId>ComputerWeb</dep:artifactId>
+      <dep:version>1.0</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies/> 
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+ 
+  <naming:ejb-local-ref>
+      <naming:ref-name>ejb/ItemServiceLocal</naming:ref-name>
+      <naming:ejb-link>ItemService</naming:ejb-link>
+  </naming:ejb-local-ref>
+
+  <naming:ejb-local-ref>
+      <naming:ref-name>ejb/ShoppingCartLocal</naming:ref-name>
+      <naming:ejb-link>ShoppingCart</naming:ejb-link>
+  </naming:ejb-local-ref>
+</web-app>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+  <!-- EJB Local References -->
+  <ejb-local-ref>
+    <ejb-ref-name>ejb/ItemServiceLocal</ejb-ref-name>
+    <local-jndi-name>ItemService</local-jndi-name>
+  </ejb-local-ref>  
+  <ejb-local-ref>
+    <ejb-ref-name>ejb/ShoppingCartLocal</ejb-ref-name>
+    <local-jndi-name>ShoppingCart</local-jndi-name>
+  </ejb-local-ref>  
+</jboss-web>
+

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<web-app version="2.4" 
+    xmlns="http://java.sun.com/xml/ns/j2ee" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+    http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+  <servlet>
+    <description>ItemServiceDispatchServlet</description>
+    <display-name>ItemServiceDispatchServlet</display-name>
+    <servlet-name>ItemServiceDispatchServlet</servlet-name>
+    <servlet-class>org.apache.geronimo.samples.computer.web.ItemServiceDispatchServlet</servlet-class>
+  </servlet>
+  <servlet>
+    <description>ShoppingCartDispatchServlet</description>
+    <display-name>ShoppingCartDispatchServlet</display-name>
+    <servlet-name>ShoppingCartDispatchServlet</servlet-name>
+    <servlet-class>org.apache.geronimo.samples.computer.web.ShoppingCartDispatchServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>ItemServiceDispatchServlet</servlet-name>
+    <url-pattern>/listItems</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>ItemServiceDispatchServlet</servlet-name>
+    <url-pattern>/buyItem</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>ShoppingCartDispatchServlet</servlet-name>
+    <url-pattern>/addToCart</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>ShoppingCartDispatchServlet</servlet-name>
+    <url-pattern>/removeTransaction</url-pattern>
+  </servlet-mapping>
+  
+  <ejb-local-ref>
+    <ejb-ref-name>ejb/ItemServiceLocal</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <local-home>org.apache.geronimo.samples.computer.ejb.ItemServiceLocalHome</local-home>
+    <local>org.apache.geronimo.samples.computer.ejb.ItemServiceLocal</local>
+    <ejb-link>ItemService</ejb-link>
+  </ejb-local-ref>      
+  
+  <ejb-local-ref>
+    <ejb-ref-name>ejb/ShoppingCartLocal</ejb-ref-name>
+    <ejb-ref-type>Session</ejb-ref-type>
+    <local-home>org.apache.geronimo.samples.computer.ejb.ShoppingCartLocalHome</local-home>
+    <local>org.apache.geronimo.samples.computer.ejb.ShoppingCartLocal</local>
+    <ejb-link>ShoppingCart</ejb-link>
+  </ejb-local-ref>   
+  
+  <welcome-file-list>
+    <welcome-file>/jsp/index.jsp</welcome-file>
+  </welcome-file-list>  
+
+</web-app>

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css Mon Apr  7 23:40:31 2008
@@ -0,0 +1,510 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+body 
+{
+    /*background-color: #FFFFFF;*/
+}
+
+.BrightTitle
+{
+    color: #FFFFFF;
+    background-color: #5FA3D6;
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.BrightTitle a:hover
+{
+    color: #5FA3D6;
+}
+
+.BrightBox
+{
+    border: thin solid #5FA3D6;
+}
+
+td
+{
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+a:link, a:visited
+{
+    color: #204486;
+}
+
+a:hover 
+{
+    /*color: #5FA3D6;*/
+    color: #CF820A;
+}
+
+.Logo
+{
+    background-image:url("images/head_left_754x86.gif");
+    background-repeat: no-repeat;
+    width: 570px;
+    height: 86px;
+    font-size: 35px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-align: right;
+    vertical-align: bottom; 
+    line-height: 30px;
+    font-weight: bold;
+}
+
+.LoginLogo
+{
+    background-image:url("images/head_left_login_586x86.gif");
+    background-repeat: no-repeat;
+    width: 570px;
+    height: 86px;
+    font-size: 35px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-align: right;
+    vertical-align: bottom; 
+    line-height: 30px;
+    font-weight: bold;
+}
+
+.Top
+{
+    background-image:url("images/head_bgstretch_1x86.gif");
+    background-repeat: repeat-x;
+    height: 86px;
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-align: right;
+    vertical-align: bottom;
+    font-weight: bold;
+}
+
+.Top a:link, .Top a:visited, .Top a:hover
+{
+        color: #FFFFFF;
+        font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+        text-decoration: underline;
+        text-align: left;
+        vertical-align: bottom;
+        line-height: 30px;
+        font-weight: bold;
+}
+
+.TopSpacer
+{
+    height: 20px;
+}
+
+.Hidden
+{
+    visibility: hidden;
+    height: 0px;
+    line-height: 0px;
+    display: none;
+}
+
+.Menu .Selection
+{
+        background-color: #F2F2F2;
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.Menu .Selection .CollapsedLeft
+{
+    width: 12px;
+    height: 12px;
+    color: #000000;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .Indent
+{
+    width: 2px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .CollapsedRight
+{
+    width: 8px;
+    height: 12px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .TopLeft
+{
+    width: 8px;
+    height: 16px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .TopMiddle
+{
+    color: #000000;
+    text-decoration: none;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .TopMiddle a:link, 
+.Menu .Selection .TopMiddle a:visited, 
+{
+    color: #000000;
+    line-height: 20px;
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .TopMiddle a:hover
+{
+    color: #5FA3D6;
+}
+
+.Menu .Selection .TopRight
+{
+    width: 8px;
+    height: 16px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Selection .Spacer
+{
+    height: 5px;
+}
+
+.Menu .Hidden
+{
+    visibility: hidden;
+    height: 0px;
+    display: none;
+}
+
+.Menu .Subselection .Left
+{
+    width: 12px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Subselection .Indent
+{
+    width: 2px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Subselection .Middle
+{
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+        background-color: #F2F2F2;
+    color:#000000;
+}
+
+.Menu .Subselection .Middle a:link, 
+.Menu .Subselection .Middle a:visited, 
+{
+    line-height: 20px;
+    color: #000000;
+}
+
+.Menu .Subselection .Middle a:hover
+{
+    color: #5FA3D6;
+}
+
+.Menu .Subselection .Right
+{
+    width: 8px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Subselection .BottomLeft
+{
+    width: 8px;
+    height: 8px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Subselection .BottomMiddle
+{
+    height: 8px;
+        background-color: #F2F2F2;
+}
+
+.Menu .Subselection .BottomRight
+{
+    width: 8px;
+    height: 8px;
+        background-color: #F2F2F2;
+}
+
+.Menu .SelectedSubselection .Middle a{
+    color: #000;
+    text-decoration: none;
+}
+
+.Menu .SelectedSubselection .Middle a:hover{
+    color: #000;
+    text-decoration: underline;
+}
+
+.Gutter
+{
+    width: 5px;
+}
+
+.Content .TopLeft
+{
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
+        background-color: #000000;
+}
+
+.Content .Title
+{
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #000000;
+    color: #FFFFFF;
+    height: 18px;
+    line-height: 18px;
+}
+
+.Content .Title a:link, .Content .Title a:hover, .Content .Title a:visited
+{
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #000000;
+    color: #FFFFFF;
+    height: 18px;
+    line-height: 18px;
+}
+
+.Content .Title .Indent
+{
+    width: 20px;
+}
+
+.Content .TopRight
+{
+    width: 18px;
+    height: 18px;
+        background-color:#000000;
+}
+
+.Content .CollapsedLeft
+{
+    width: 18px;
+    height: 18px;
+        background-color:#000000;
+}
+
+.Content .CollapsedRight
+{
+    width: 18px;
+    height: 18px;
+        background-color:#000000;
+}
+
+.Content .Left
+{
+    width: 18px;
+    background-color: #FFFFFF;
+}
+
+.Content .Body, .Content .Body td
+{
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #FFFFFF;
+    color: #1E1E52;
+}
+
+.Content .Body strong
+{
+    font-weight: bold;  
+    font-size: 12px;
+}
+
+.Content .Body th
+{
+    font-weight: bold;  
+    font-size: 12px;
+}
+
+.Content .Body .LightBackground
+{
+        background-color: #FFFFFF;
+    color:#000000;
+}
+
+.Content .Body .LightBackground .InputField
+{
+  width: 150px;
+}
+
+.Content .Body .MediumBackground
+{
+    background-color: #F2F2F2;
+    color:#000000;
+}
+
+.Content .Body .DarkBackground, 
+.Content .Body .DarkBackground a:link, 
+.Content .Body .DarkBackground a:visited,
+.Content .Body .DarkBackground a:hover
+{
+    background-color: #2581C7;
+    color:#FFFFFF;
+    font-size: 15px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.Content .Body .reallyDarkBackground,
+.Content .ReallyDarkBackground,
+.ReallyDarkBackground
+{
+    color: #FFFFFF;
+    background-color: #000000;
+    font-size: 15px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.Content .Body .IndentedTitle
+{
+    background-color: #919FBC;
+    color:#FFFFFF;
+}
+
+.Content .Body .LightIndentedBG
+{
+    background-color: #FFFFFF;
+    color:#000000;
+}
+
+.Content .Body .MediumIndentedBG
+{
+    background-color: #DDDDDD;
+    color:#000000;
+}
+
+
+.Content .Body a:link,
+.Content .Body a:visited,
+{
+    font-size: 10px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-decoration: underline;
+    color: #546BC7;
+    font-weight: bold;
+}
+
+.Content .Body a:hover
+{
+    color: #5FA3D6;
+}
+
+.Content .Buttons {
+    border-top-width: thin;
+    border-right-width: thin;
+    border-bottom-width: thin;
+    border-left-width: thin;
+    border-top-style: solid;
+    border-right-style: solid;
+    border-bottom-style: solid;
+    border-left-style: solid;
+    border-top-color: #7B7BAE;
+    border-right-color: #7B7BAE;
+    border-bottom-color: #141336;
+    border-left-color: #141336;
+    background-color: #23224C;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    font-size: 12px;
+  text-decoration: underline;
+    color: #5FA3D6;
+}
+
+.Content .Right
+{
+    width: 18px;
+    background-color: #FFFFFF;
+}
+
+.Content .BottomLeft
+{
+    width: 18px;
+    height: 12px;
+    line-height: 12px;
+    background-color:#333366;
+}
+
+.Content .Footer
+{
+    line-height: 12px;
+    height: 12px;
+    font-size: 9px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color:#333366;
+    color:#000000;
+}
+
+.Content .Footer a:link,
+.Content .Footer a:visited,
+.Content .Footer a:hover
+{
+    color: #5FA3D6;
+}
+
+.Content .BottomRight
+{
+    width: 18px;
+    line-height: 12px;
+    height: 12px;
+    background-color:#333366;
+}
+
+.Content .Spacer
+{
+    height: 10px;
+}
+
+.BottomSpacer
+{
+}
+
+.Footer
+{
+    font-size: 9px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    height: 20px;
+    background-color: #5FA3D6;
+}
+
+.Footer a:link, 
+.Footer a:visited, 
+.Footer a:hover
+{
+    color: #5FA3D6;
+    text-decoration: underline; 
+}
+
+.Box
+{
+    border: thin solid #000000;
+}

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/css/main.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp Mon Apr  7 23:40:31 2008
@@ -0,0 +1,116 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<%@ page import="java.util.List"%>
+<%@ page import="java.util.Iterator"%>
+<%@ page import="org.apache.geronimo.samples.computer.dto.ItemDTO"%>
+<html>
+<head>
+<title>Add Item to Cart</title>
+<link rel="stylesheet" href="css/main.css" type="text/css">
+</head>
+<body>
+<center>
+<br>
+<div align="center" class="Content">
+<form action="addToCart" method="post"> 
+<table>
+    <tr>
+        <td class="Title"><strong>Add Item to Cart</strong></td>
+    </tr>
+    <tr></tr>
+    <tr>
+        <td class="Body">
+            <p>
+                Please select quantity of items you are going to buy. If the quantity of buying 
+                is greater than or equal to the <strong>Discount Quantity</strong>, then you will 
+                get the given <strong>Discount Percentage</strong> of discount from each item of buying.            
+            <br>                    
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="Body">
+            <%
+                int discountQty = 0;
+                double discount = 0.0;
+                String itemDesc = null;
+                
+                String itemId = request.getParameter("itemId");         
+                
+                List itemList = (List)session.getAttribute("itemList");
+                for(Iterator iterator = itemList.iterator();iterator.hasNext();){
+                    ItemDTO item = (ItemDTO)iterator.next();
+                    
+                    if(Integer.parseInt(itemId) == item.getItemId()){
+                        discountQty = item.getMinimumDiscountPurchase();
+                        discount = item.getDiscountPercentage();
+                        itemDesc = item.getDescription();
+                        break;
+                    }
+                }
+            %>
+            <div align="center">
+                <input type="hidden" value="<%=itemId%>" name="itemId">
+                <table>
+                        <tr>
+                            <td align="right" class="MediumBackground"><strong>Item Description:</strong></td>
+                            <td><%=itemDesc%></td>
+                        </tr>
+                        <tr>
+                            <td align="right" class="MediumBackground"><strong>Discount Quantity:</strong></td>
+                            <td><%=discountQty%></td>
+                        </tr>
+                        <tr>
+                            <td align="right" class="MediumBackground"><strong>Discount Percentage:</strong></td>
+                            <td><%=discount*100%>%</td>
+                        </tr>
+                        <tr>
+                            <td align="right" class="MediumBackground"><strong>Quantity:</strong></td>
+                            <td><input type="text" name="quantity" class="InputField"></td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <div align="center">
+                                    <table>
+                                        <tr>
+                                            <td>    
+                                                <div align="center">                                        
+                                                    <input type="submit" value="Add to Cart">
+                                                </div>
+                                            </td>   
+                                        <tr>
+                                        <tr>
+                                            <td>    
+                                                <div align="center">                                        
+                                                    <a href="listItems">Select Another Item</a>
+                                                </div>
+                                            </td>   
+                                        <tr>
+                                    </table>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr></tr>
+                </table>
+            </div>
+        </td>
+    </tr>
+</table>
+</form>
+</div>
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/buy_item.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp Mon Apr  7 23:40:31 2008
@@ -0,0 +1,60 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html>
+<head>
+<title>Error Occured</title>
+<link rel="stylesheet" href="css/main.css" type="text/css">
+</head>
+<body>
+    <div align="center" class="Content">
+        <table>
+            <tr>
+                <td class="Title"><strong>An Error Occured</strong></td>
+            </tr>
+            <tr></tr>
+            <tr>
+                <td class="Body">
+                    <p>
+                        Following error occured while executing your request.
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td class="Body">
+                    <div align="center" class="Content">
+                        <table>
+                            <tr>
+                                <td align="right" class="MediumBackground"><strong><%=request.getAttribute("error")%></strong></td>
+                            </tr>
+                        </table>
+                    </div>
+                </td>               
+            </tr>
+            <tr>
+                <td class="MediumBackground"></td>
+            </tr>
+        </table>
+        <a href="listItems">
+            <table>
+                <tr>
+                    <td class="MediumBackground"><strong>Home Page</strong></td>
+                </tr>
+            </table>
+        </a>
+    </div>
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/error.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp Mon Apr  7 23:40:31 2008
@@ -0,0 +1,17 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<jsp:forward page="/listItems"/>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp Mon Apr  7 23:40:31 2008
@@ -0,0 +1,78 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<%@ page import="java.util.List"%>
+<%@ page import="java.util.Iterator"%>
+<%@ page import="org.apache.geronimo.samples.computer.dto.ItemDTO"%>
+<html>
+<head>
+<title>Computer Acessories Seller</title>
+<link rel="stylesheet" href="css/main.css" type="text/css">
+</head>
+<body>
+<center>
+<br>
+<div align="center" class="Content">
+<table>
+    <tr>
+        <td class="Title"><strong>Computer Acessories Seller</strong></td>
+    </tr>
+    <tr></tr>
+    <tr>
+        <td class="Body">
+            <p>
+                This eCommerce application let you buy computer acessories in both wholesale and retail prices.
+                To get the wholesale price customer has to buy atleast <strong>Discount Quantity</strong> number
+                of items. Then you will get <strong>Discount Percentage</strong> of discount from each item. Also
+                note you are not allowed to add same accessory twise in to your shopping cart.
+                <br>                    
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="Body">
+            <div align="center" class="Content">
+                <table>
+                    <tr>
+                        <td class="DarkBackground">Item Description</td>
+                        <td class="DarkBackground" align="center">Unit Price</td>
+                        <td class="DarkBackground" align="center">Discount Quantity</td>
+                        <td class="DarkBackground" align="center">Discount Percentage</td>
+                        <td class="DarkBackground" align="center">Action</td>
+                    </tr>
+                    <%
+                        List itemList = (List)session.getAttribute("itemList");
+                        for(Iterator iterator = itemList.iterator();iterator.hasNext();){
+                            ItemDTO item = (ItemDTO)iterator.next();
+                    %>
+                        <tr>
+                            <td><%=item.getDescription()%></td>
+                            <td align="center"><%=item.getUnitPrice()%></td>
+                            <td align="center"><%=item.getMinimumDiscountPurchase()%></td>
+                            <td align="center"><%=item.getDiscountPercentage()*100%>%</td>
+                            <td align="center"><a href="buyItem?itemId=<%=item.getItemId()%>">Buy</a></td>
+                        </tr>
+                    <%  
+                    }
+                    %>
+                </table>
+            </div>
+        </td>
+    </tr>
+</table>
+</div>
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/list_items.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp (added)
+++ geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp Mon Apr  7 23:40:31 2008
@@ -0,0 +1,122 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<%@ page import="java.util.List"%>
+<%@ page import="java.util.Iterator"%>
+<%@ page import="org.apache.geronimo.samples.computer.dto.TransactionDTO"%>
+<%@ page import="org.apache.geronimo.samples.computer.dto.ItemDTO" %>
+<html>
+<head>
+<title>Shopping Cart</title>
+<link rel="stylesheet" href="css/main.css" type="text/css">
+</head>
+<body>
+<center>
+<br>
+<div align="center" class="Content">
+<table>
+    <tr>
+        <td class="Title"><strong>Shopping Cart Information</strong></td>
+    </tr>
+    <tr></tr>
+    <tr>
+        <td class="Body">
+            <p>
+                Given items are already added to your shopping cart. To remove any item use <strong>Remove</strong> 
+                link in each item and <strong>Add Another Item</strong> will let you add new items to your shopping 
+                cart.
+            <br>                    
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="Body">
+            <%
+                String itemDescription = null;
+                int itemId = 0;
+                int quantity = 0;
+                double discountRecieved = 0.0;
+                double price = 0.0;
+                List transactionList = (List)request.getAttribute("transactionList");
+            %>  
+            <div align="center">
+                <table>
+                    <tr>
+                        <td class="DarkBackground">Item Description</td>
+                        <td class="DarkBackground" align="center">Quantity</td>
+                        <td class="DarkBackground" align="center">Original Price</td>
+                        <td class="DarkBackground" align="center">Discount</td>
+                        <td class="DarkBackground" align="center">Final Price</td>                      
+                        <td class="DarkBackground" align="center">Action</td>
+                    </tr>
+                    <%
+                        for(Iterator iterator = transactionList.iterator(); iterator.hasNext();){
+
+                            TransactionDTO transaction = (TransactionDTO)iterator.next();
+                            List itemList = (List)session.getAttribute("itemList");
+                            
+                            for(Iterator itemIterator = itemList.iterator(); itemIterator.hasNext();){
+                                ItemDTO item = (ItemDTO)itemIterator.next();
+                                
+                                if(item.getItemId() == transaction.getItemId()){
+                                    itemId = item.getItemId();
+                                    itemDescription = item.getDescription();
+                                    break;
+                                }// end if
+                            }// end item list
+                            
+                            quantity = transaction.getQuantity();
+                            price = transaction.getPrice();
+                            discountRecieved = transaction.getDiscountRecieved();
+                    %>
+                    <tr>
+                        <td><%=itemDescription%></td>
+                        <td align="center"><%=quantity%></td>
+                        <td align="center"><%=(price + discountRecieved)%></td>
+                        <td align="center"><%=discountRecieved%></td>                       
+                        <td align="center"><%=price%></td>                      
+                        <td align="center"><a href="removeTransaction?itemId=<%=itemId%>">Remove</a></td>
+                    </tr>
+                    <%      
+                            
+                        }// end transaction list
+                    %>
+                    <tr/>
+                    <tr/>
+                    <tr>
+                        <td><strong>Total:</strong><td>
+                        <td/>
+                        <td/>
+                        <td/>
+                        <td><strong><%=request.getAttribute("total")%></strong></td>
+                    </tr>
+                    <tr/>
+                    <tr/>
+                    <tr>
+                        <td>
+                            <div align="center">
+                                <a href="listItems">Add Another Item</a>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </td>
+    </tr>
+</table>
+</div>
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-ejb-session/web/jsp/shopping_cart.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt (added)
+++ geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt Mon Apr  7 23:40:31 2008
@@ -0,0 +1,350 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] The Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+=========================================================================
+J2G, Commons Logging, commons-el, jasper-runtime, jasper-compiler, 
+jasper-compiler-jdt, geronimo-jsp_spec, and geronimo-servlet-spec use the 
+above Apache License v2.0.
+=========================================================================
+   
+=========================================================================
+==  Dom4j License                                                      ==
+=========================================================================
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+   statements and notices.  Redistributions must also contain a
+   copy of this document.
+ 
+2. Redistributions in binary form must reproduce the
+   above copyright notice, this list of conditions and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+ 
+3. The name "DOM4J" must not be used to endorse or promote
+   products derived from this Software without prior written
+   permission of MetaStuff, Ltd.  For written permission,
+   please contact dom4j-info@metastuff.com.
+ 
+4. Products derived from this Software may not be called "DOM4J"
+   nor may "DOM4J" appear in their names without prior written
+   permission of MetaStuff, Ltd. DOM4J is a registered
+   trademark of MetaStuff, Ltd.
+ 
+5. Due credit should be given to the DOM4J Project - 
+   http://www.dom4j.org
+ 
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================
+==  Jaxen License                                                      ==
+=========================================================================
+
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the Jaxen Project nor the names of its
+    contributors may be used to endorse or promote products derived 
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+=========================================================================
+==  PullParser License                                                 ==
+=========================================================================
+
+Copyright 2002 The Trustees of Indiana University.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1) All redistributions of source code must retain the above
+   copyright notice, the list of authors in the original source
+   code, this list of conditions and the disclaimer listed in this
+   license;
+
+2) All redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the disclaimer
+   listed in this license in the documentation and/or other
+   materials provided with the distribution;
+
+3) Any documentation included with all redistributions must include
+   the following acknowledgement:
+
+     "This product includes software developed by the Indiana 
+     University Extreme! Lab.  For further information please visit 
+     http://www.extreme.indiana.edu/"
+
+   Alternatively, this acknowledgment may appear in the software
+   itself, and wherever such third-party acknowledgments normally
+   appear.
+
+4) The name "Indiana Univeristy" and "Indiana Univeristy
+   Extreme! Lab" shall not be used to endorse or promote
+   products derived from this software without prior written
+   permission from Indiana University.  For written permission,
+   please contact http://www.extreme.indiana.edu/.
+
+5) Products derived from this software may not use "Indiana
+   Univeristy" name nor may "Indiana Univeristy" appear in their name,
+  without prior written permission of the Indiana University.
+ 
+Indiana University provides no reassurances that the source code
+provided does not infringe the patent or any other intellectual
+property rights of any other entity.  Indiana University disclaims any
+liability to any recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise.
+
+LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH
+NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA
+UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
+SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR
+OTHER PROPRIETARY RIGHTS.  INDIANA UNIVERSITY MAKES NO WARRANTIES THAT
+SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP
+DOORS", "WORMS", OR OTHER HARMFUL CODE.  LICENSEE ASSUMES THE ENTIRE
+RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS,
+AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING
+SOFTWARE.
+
+
+
+
+

Propchange: geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-jdbc/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt (added)
+++ geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt Mon Apr  7 23:40:31 2008
@@ -0,0 +1,46 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
+=========================================================================
+
+Apache Geronimo
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the J2G Conversion Tool were orginally developed by International
+Business Machines Corporation and are licensed to the Apache Software
+Foundation under the "Software Grant and Corporate Contribution License
+Agreement", informally known as the "IBM Console CLA".
+
+=========================================================================
+==  Commons-logging  Notice                                            ==
+=========================================================================
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+=========================================================================
+==  Dom4j Notice                                                       ==
+=========================================================================
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+=========================================================================
+==  Jaxen Notice                                                       ==
+=========================================================================
+
+Copyright 2003-2006 The Werken Company. All Rights Reserved.
+
+=========================================================================
+==  PullParser Notice                                                  ==
+=========================================================================
+
+Copyright 2002 The Trustees of Indiana University.
+All rights reserved.
+
+This product includes software developed by the Indiana
+University Extreme! Lab.  For further information please visit
+http://www.extreme.indiana.edu/
+

Propchange: geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-jdbc/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-jdbc/build.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-jdbc/build.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-jdbc/build.xml (added)
+++ geronimo/samples/branches/1.1/migration-jdbc/build.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- ====================================================================== 
+     JBoss to Geronimo Migration Samples
+     ====================================================================== -->
+<project name="Brokerage" default="all">
+    <property name="src.dir" value="src"/>
+    <property name="dest.dir" value="releases"/>
+    <property name="web.dir" value="web"/>
+    <property name="config.dir" value="config"/>
+    
+    <property file="${config.dir}/build.properties"/>
+    
+    <target name="all" depends="war-geronimo,war-jboss">
+        <!-- Delete whole file structure -->
+      <delete dir="${dest.dir}/war"/>   
+    </target>
+    
+    
+    <target name="compile-geronimo" depends="init">
+        <copy todir="${dest.dir}/war/geronimo">
+            <fileset dir="${web.dir}"/>
+        </copy>
+        
+        <!-- Delete unnecessary file for Geronimo deployment from WAR file -->
+        <delete file="${dest.dir}/war/geronimo/WEB-INF/jboss-web.xml"/>
+        
+        <mkdir dir="${dest.dir}/war/geronimo/WEB-INF/classes"/>
+        
+        <javac srcdir="${src.dir}"
+            destdir="${dest.dir}/war/geronimo/WEB-INF/classes">
+            <classpath
+                path="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/geronimo-j2ee_1.4_spec-1.1.jar"/>
+        </javac>
+    </target>
+    
+    <target name="compile-jboss" depends="init">
+        <copy todir="${dest.dir}/war/jboss">
+            <fileset dir="${web.dir}" />
+        </copy>
+        <!-- Delete unnecessary file for Geronimo deployment from WAR file -->
+        <delete file="${dest.dir}/war/jboss/WEB-INF/geronimo-web.xml"/>
+        
+        <mkdir dir="${dest.dir}/war/jboss/WEB-INF/classes"/>
+
+        <javac srcdir="${src.dir}"
+            destdir="${dest.dir}/war/jboss/WEB-INF/classes">
+            <classpath
+                path="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/geronimo-j2ee_1.4_spec-1.1.jar"/>
+        </javac>
+    </target>
+
+    <target name="war-geronimo" depends="compile-geronimo">
+      <jar destfile="${dest.dir}/geronimo/brokerage.war">
+        <zipfileset dir="${dest.dir}/war/geronimo"/>
+      </jar>
+    </target>
+    
+    <target name="war-jboss" depends="compile-jboss">
+      <jar destfile="${dest.dir}/jboss/brokerage.war">
+        <zipfileset dir="${dest.dir}/war/jboss"/>
+      </jar>    
+    </target>
+    
+    <target name="populateDB">
+        <echo message="Populating Database"/>    
+        <sql
+            driver="${db.driver}"
+            url="${db.url}"
+            userid="${db.userid}"
+            password="${db.password}"
+            src="${config.dir}/sql/db.sql"
+            print="yes"
+            output="${config.dir}/sql/outputfile.txt"
+            >
+        <classpath>
+            <pathelement location="${driver.classpath}"/>
+        </classpath>
+      </sql>
+    </target>
+    
+    <target name="init" depends="populateDB">
+        <mkdir dir="${dest.dir}/war"/>
+        <mkdir dir="${dest.dir}/war/geronimo"/>
+        <mkdir dir="${dest.dir}/war/jboss"/>
+        <mkdir dir="${dest.dir}/geronimo"/>
+        <mkdir dir="${dest.dir}/jboss"/>
+    </target>   
+
+</project>
+

Propchange: geronimo/samples/branches/1.1/migration-jdbc/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-jdbc/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-jdbc/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-jdbc/config/build.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-jdbc/config/build.properties?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-jdbc/config/build.properties (added)
+++ geronimo/samples/branches/1.1/migration-jdbc/config/build.properties Mon Apr  7 23:40:31 2008
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## Set the Geronimo 1.1 home here
+geronimo.home=<geronimo_home>
+
+#Fully qualified name of the JDBC driver class
+db.driver=com.mysql.jdbc.Driver
+
+#database url
+db.url=jdbc:mysql://localhost:3306/tradedb
+
+#database userId
+db.userid=root
+
+#database password
+db.password=password
+
+##location of the jdbc driver jar.
+driver.classpath=<jboss_home>/server/<your_server_name>/lib/mysql-connector-java-3.0.17-ga-bin.jar
+
+    
+

Propchange: geronimo/samples/branches/1.1/migration-jdbc/config/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-jdbc/config/build.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-jdbc/config/build.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-jdbc/config/plan/mysql-ds.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-jdbc/config/plan/mysql-ds.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-jdbc/config/plan/mysql-ds.xml (added)
+++ geronimo/samples/branches/1.1/migration-jdbc/config/plan/mysql-ds.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<datasources>
+
+  <local-tx-datasource>
+        <jndi-name>jdbc/TradeDB</jndi-name>
+        <connection-url>jdbc:mysql://localhost:3306/tradedb</connection-url>
+        <driver-class>com.mysql.jdbc.Driver</driver-class>
+        <user-name>root</user-name>
+        <password></password>
+        <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>        
+  </local-tx-datasource>
+ </datasources>
+