geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r677340 [1/3] - in /geronimo/samples/branches/2.1/samples: ./ all-samples/all-samples-jetty/ all-samples/all-samples-tomcat/ calculator-stateless-pojo/ calculator/ calculator/calculator-ear/ calculator/calculator-ejb/ calculator/calculator-...
Date Wed, 16 Jul 2008 17:05:56 GMT
Author: linsun
Date: Wed Jul 16 10:05:53 2008
New Revision: 677340

URL: http://svn.apache.org/viewvc?rev=677340&view=rev
Log:
GERONIMO-4205 - unable to build samples on windows platoform due to Filename too long

Added:
    geronimo/samples/branches/2.1/samples/calculator/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ear/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/
    geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/
    geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/
    geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/
    geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/
    geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/
    geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/
    geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/
    geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html   (with props)
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp   (with props)
    geronimo/samples/branches/2.1/samples/calculator/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/
    geronimo/samples/branches/2.1/samples/customer/customer-ear/
    geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-ear/src/
    geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/
    geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/
    geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/META-INF/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/service/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/service/customer/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/CustomerInfo.java   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/resources/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/resources/META-INF/
    geronimo/samples/branches/2.1/samples/customer/customer-ejb/src/main/resources/META-INF/persistence.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-jetty/
    geronimo/samples/branches/2.1/samples/customer/customer-jetty/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-jetty/src/
    geronimo/samples/branches/2.1/samples/customer/customer-jetty/src/main/
    geronimo/samples/branches/2.1/samples/customer/customer-jetty/src/main/plan/
    geronimo/samples/branches/2.1/samples/customer/customer-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-tomcat/
    geronimo/samples/branches/2.1/samples/customer/customer-tomcat/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-tomcat/src/
    geronimo/samples/branches/2.1/samples/customer/customer-tomcat/src/main/
    geronimo/samples/branches/2.1/samples/customer/customer-tomcat/src/main/plan/
    geronimo/samples/branches/2.1/samples/customer/customer-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/
    geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/java/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/java/com/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/java/com/service/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/java/com/service/customer/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/java/com/service/customer/web/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/WEB-INF/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/customers/
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/customers/index.jsp   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/header.html   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/index.html   (with props)
    geronimo/samples/branches/2.1/samples/customer/customer-war/src/main/webapp/index.jsp   (with props)
    geronimo/samples/branches/2.1/samples/customer/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/src/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/src/main/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/src/main/resources/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/samples/order/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/resources/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/src/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/src/main/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/src/main/plan/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/src/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/src/main/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/src/main/plan/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/org/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/samples/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/samples/order/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/WEB-INF/
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/error.jsp   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/header.html   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/index.html   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/src/main/webapp/order.jsp   (with props)
    geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml   (with props)
Removed:
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/
    geronimo/samples/branches/2.1/samples/customer-service/
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/
Modified:
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/pom.xml

Modified: geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml?rev=677340&r1=677339&r2=677340&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml Wed Jul 16 10:05:53 2008
@@ -54,14 +54,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>calculator-stateless-jetty</artifactId>
+            <artifactId>calculator-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>customer-service-jetty</artifactId>
+            <artifactId>customer-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -89,7 +89,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jms-mdb-sample-jetty</artifactId>
+            <artifactId>jms-mdb-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml?rev=677340&r1=677339&r2=677340&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml Wed Jul 16 10:05:53 2008
@@ -61,14 +61,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>calculator-stateless-tomcat</artifactId>
+            <artifactId>calculator-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>customer-service-tomcat</artifactId>
+            <artifactId>customer-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -96,7 +96,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jms-mdb-sample-tomcat</artifactId>
+            <artifactId>jms-mdb-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,85 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>calculator</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>calculator-ear</artifactId>
+    <name>Geronimo Samples :: Stateless Session :: Calculator EAR</name>
+    <packaging>ear</packaging>
+
+    <description>
+        Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>calculator-ejb</artifactId>
+            <version>${version}</version>
+            <type>ejb</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>calculator-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <displayName>Geronimo Sample EAR for Stateless Session</displayName>
+                    <description>Geronimo Sample EAR for Stateless Session</description>
+                    <version>5</version>
+                    <modules>
+                        <webModule>
+                            <groupId>${pom.groupId}</groupId>
+                            <artifactId>calculator-war</artifactId>
+                            <contextRoot>/calculator</contextRoot>
+                            <bundleFileName>calculator-war-${version}.war</bundleFileName>
+                        </webModule>
+
+                        <ejbModule>
+                            <groupId>${pom.groupId}</groupId>
+                            <artifactId>calculator-ejb</artifactId>
+                            <bundleFileName>calculator-ejb-${version}.jar</bundleFileName>
+                        </ejbModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt Wed Jul 16 10:05:53 2008
@@ -0,0 +1,7 @@
+OpenEJB is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,36 @@
+<?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.
+-->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>calculator</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>calculator-ejb</artifactId>
+    <name>Geronimo Samples :: Stateless Session :: Calculator EJB</name>
+    <packaging>jar</packaging>
+
+    <description>
+        Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
+    </description>
+
+</project>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java Wed Jul 16 10:05:53 2008
@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.slsb.calculator;
+
+import javax.ejb.Stateless;
+
+/**
+ * This is an EJB 3 style pojo stateless session bean
+ * Every stateless session bean implementation must be annotated
+ * using the annotation @Stateless
+ * This EJB has 2 business interfaces: CalculatorRemote, a remote business
+ * interface, and CalculatorLocal, a local business interface
+ */
+@Stateless
+public class Calculator implements CalculatorRemote, CalculatorLocal {
+
+    public int sum(int add1, int add2) {
+        return add1 + add2;
+    }
+
+    public int multiply(int mul1, int mul2) {
+        return mul1 * mul2;
+    }
+
+}

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java Wed Jul 16 10:05:53 2008
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.slsb.calculator;
+
+/**
+ * This is an EJB 3 local business interface
+ * A local business interface may be annotated with the @Local
+ * annotation, but it's optional. A business interface which is
+ * not annotated with @Local or @Remote is assumed to be Local
+ */
+public interface CalculatorLocal {
+
+    public int sum(int add1, int add2);
+
+    public int multiply(int mul1, int mul2);
+}

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java Wed Jul 16 10:05:53 2008
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.slsb.calculator;
+
+import javax.ejb.Remote;
+
+/**
+ * This is an EJB 3 remote business interface
+ * A remote business interface must be annotated with the @Remote
+ * annotation
+ */
+@Remote
+public interface CalculatorRemote {
+
+    public int sum(int add1, int add2);
+
+    public int multiply(int mul1, int mul2);
+
+}

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,161 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>calculator</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>calculator-jetty</artifactId>
+    <name>Geronimo Samples :: calculator Plugin for Jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. calculator Plugin for Jetty</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>calculator-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>calculator-ear</artifactId>
+                        <version>${version}</version>
+                        <type>ear</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                    <instance>
+                        <plugin-artifact>
+                            <!--<prerequisite>-->
+                            <!--<id>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>jetty6</artifactId>-->
+                            <!--</id>-->
+                            <!--<resource-type>Web Container</resource-type>-->
+                            <!--<description>-->
+                            <!--This version of the application works with the Geronimo/Jetty distribution. -->
+                            <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+                            <!--There is a separate version of the application that works with Tomcat. -->
+                            <!--Please install the version appropriate to your Geronimo distribution.-->
+                            <!--</description> -->
+                            <!--</prerequisite>-->
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
+</application>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,161 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>calculator</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>calculator-tomcat</artifactId>
+    <name>Geronimo Samples :: calculator Plugin for Tomcat</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. calculator Plugin for Tomcat</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>calculator-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>calculator-ear</artifactId>
+                        <version>${version}</version>
+                        <type>ear</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Sample</category>
+                    <instance>
+                        <plugin-artifact>
+                            <!--<prerequisite>-->
+                            <!--<id>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>tomcat6</artifactId>-->
+                            <!--</id>-->
+                            <!--<resource-type>Web Container</resource-type>-->
+                            <!--<description>-->
+                            <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+                            <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+                            <!--There is a separate version of the application that works with Jetty. -->
+                            <!--Please install the version appropriate to your Geronimo distribution.-->
+                            <!--</description> -->
+                            <!--</prerequisite>-->
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
+</application>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,69 @@
+<?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.
+-->
+<!-- $Rev$ $Date$ -->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>calculator</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>calculator-war</artifactId>
+    <name>Geronimo Samples :: Stateless Session :: Calculator WAR</name>
+    <packaging>war</packaging>
+
+    <description>
+        Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>calculator-ejb</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <id>copy-parent-site</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Copying site directory from parent</echo>
+                                <copy todir="${project.build.directory}/${artifactId}-${version}" failonerror="false" overwrite="true">
+                                    <fileset dir="${basedir}/../docs"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java Wed Jul 16 10:05:53 2008
@@ -0,0 +1,73 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.calculator;
+
+import java.io.IOException;
+
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.samples.slsb.calculator.CalculatorLocal;
+
+/**
+ * A simple servlet that will reference a bean and perform it's operations.
+ * <p/>
+ * Note that a stateful session bean must be declared at the type level
+ * whereas a stateless session bean may be declared at any level.
+ * The ejb container will route every request to different bean instances.
+ */
+
+// @EJB(name="CalculatorLocal", beanInterface=CalculatorLocal.class)
+
+public class CalculatorServlet extends HttpServlet {
+
+    // the ejb container will route every request to different bean instances. 
+    @EJB
+    private CalculatorLocal calc = null;
+
+    public void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+
+        try {
+            String firstNumber = req.getParameter("firstNumber");
+            String secondNumber = req.getParameter("secondNumber");
+            String operation = req.getParameter("operation");
+
+            int firstInt = (firstNumber == null) ? 0 : Integer.valueOf(firstNumber).intValue();
+            int secondInt = (secondNumber == null) ? 0 : Integer.valueOf(secondNumber).intValue();
+
+            if ("multiply".equals(operation)) {
+                req.setAttribute("result", calc.multiply(firstInt, secondInt));
+            } else if ("add".equals(operation)) {
+                req.setAttribute("result", calc.sum(firstInt, secondInt));
+            }
+
+            System.out.println("Result is " + req.getAttribute("result"));
+
+            getServletContext().getRequestDispatcher("/sample-docu.jsp").forward(req, resp);
+
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            throw new ServletException(e);
+        }
+    }
+
+}

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+    <description>Stateless SessionBean Servlet Sample</description>
+    <servlet>
+        <servlet-name>Calculator</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.calculator.CalculatorServlet</servlet-class>
+        <load-on-startup>0</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Calculator</servlet-name>
+        <url-pattern>/calculator</url-pattern>
+    </servlet-mapping>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html Wed Jul 16 10:05:53 2008
@@ -0,0 +1,57 @@
+<!--
+   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>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
+    <title>Apache Geronimo Sample Applications</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+</head>
+
+<body onload="init()">
+
+<table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tbody>
+        <tr>
+            <td valing="top" align="left">
+                <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+            </td>
+            <td width="100%">
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tbody>
+        <tr class="topBar">
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation" target="_blank">Documentation</a>
+                | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications" target="_blank">Sample Applications</a>
+            </td>
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html Wed Jul 16 10:05:53 2008
@@ -0,0 +1,29 @@
+<!--
+   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 html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<html>
+<head>
+    <title>A Stateless Session Sample - Calculator</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+</head>
+
+<FRAMESET rows="12%,90%" title="" frameborder="no">
+    <FRAME src="./header.html" name="headerFrame" title="Header">
+    <FRAME src="./sample-docu.jsp" name="sampleDocumentFrame" title="Sample Document Description">
+</FRAMESET>
+
+</html>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp (added)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp Wed Jul 16 10:05:53 2008
@@ -0,0 +1,118 @@
+<!--
+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 html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
+<html>
+<head>
+    <title>A Stateless Session Sample - Calculator</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type"/>
+    <style type="text/css">
+        .header {
+            background-color: aqua;
+            text-align: center
+        }
+
+        .cell {
+            text-align: center
+        }
+    </style>
+</head>
+
+<body>
+<font face="Verdana, Helvetica, Arial">
+    <h2>A Stateless Session Sample</h2>
+
+    <h3>Calculator</h3>
+    <font style="font-size:12px">
+        <p>
+            This sample shows an EJB 3.0 Stateless session bean.
+            <%
+                String result = String.valueOf(request.getAttribute("result"));
+                result = ("null".equals(result)) ? "0" : result;
+                request.setAttribute("result", null);
+                request.removeAttribute("result");
+            %>
+
+        </p>
+
+        <form action="calculator" method="get">
+            <table border="3" id="mainTable" cellpadding="0">
+                <thead id="mainTableHead">
+                    <tr>
+                        <td class="header">First Number</td>
+                        <td class="header">Second Number</td>
+                        <td class="header">Operation</td>
+                        <td class="header">Result</td>
+                    </tr>
+                </thead>
+                <tr>
+                    <td class="cell">
+                        <input type="text" name="firstNumber" value="0"/>
+                    </td>
+                    <td class="cell">
+                        <input type="text" name="secondNumber" value="0"/>
+                    </td>
+                    <td class="cell">
+                        <input type="submit" name="operation" value="add"/>
+                        <br/>
+                        <input type="submit" name="operation" value="multiply"/>
+                    </td>
+                    <td class="cell"><%=result%>
+                    </td>
+                </tr>
+            </table>
+        </form>
+        <p>
+            This sample demonstrates the following new features from EJB 3.0
+        <ol>
+            <li>Elimination of the requirement for EJB component interfaces for session beans. The required
+                business interface for a session bean can be a plain Java interface rather than an EJBObject,
+                EJBLocalObject, or java.rmi.Remote interface.
+            <li>Elimination of the requirement for home interfaces for session beans.
+            <li>Encapsulation of environmental dependencies and JNDI access through the use of annotations,
+                dependency injection mechanisms, and simple lookup mechanisms.
+            <li>Introduction of Java metadata annotations to be used as an alternative to deployment descriptors.
+        </ol>
+        <p>
+    </font>
+
+    <h3>A POJO as a business interface</h3>
+    <font style="font-size:12px">
+        Notice that the stateless session bean <a href="./xref/org/apache/geronimo/samples/slsb/calculator/Calculator.html" target="source_window"><code>Calculator.java</code></a> implements
+        just a simple java interface and not an EJB component interface like EJBObject, EJBLocalObject or java.rmi.Remote.
+    </font>
+
+    <h3>Dependency Injection</h3>
+    <font style="font-size:12px">
+        Notice that the servlet <a href="./xref/org/apache/geronimo/samples/calculator/CalculatorServlet.html" target="source_window"><code>CalculatorServlet.java</code></a>
+        declares an instance variable with an @EJB annotation. The variable is that of a session bean and it's type is the same as that of it's business interface.
+        In earlier versions, the servlet would have done a JNDI lookup of the bean's home interface in the component's environment.
+        It then would have had to create the instance using the create method of the home interface.
+        However in Java EE 5.0, the servlet can just declare its dependency on the bean by just annotating the instance variable with the @EJB annotation.
+        When the servlet instance is created during runtime, the container automatically initializes these annotated variables with an instance of an object that implements the business interface.
+        This initialization occurs before any business methods are invoked on the bean instance and after the time the bean’s EJBContext is set.
+    </font>
+
+    <h3>No deployment descriptor</h3>
+    <font style="font-size:12px">
+        Notice the absence of the traditional deployment descriptor, <code>ejb-jar.xml</code>. The bean declarations that used to be done there are now done by the
+        annotations in the code.
+    </font>
+
+</font>
+</body>
+</html>

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/2.1/samples/calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/calculator/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,57 @@
+<?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.
+-->
+<!-- $Rev$ $Date$ -->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>samples</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>calculator</artifactId>
+    <name>Geronimo Samples :: calculator</name>
+    <packaging>pom</packaging>
+
+    <description>
+        Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
+    </description>
+
+    <modules>
+        <module>calculator-ejb</module>
+        <module>calculator-war</module>
+        <module>calculator-ear</module>
+        <module>calculator-jetty</module>
+        <module>calculator-tomcat</module>
+    </modules>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/samples/branches/2.1/samples/calculator/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/calculator/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/calculator/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml Wed Jul 16 10:05:53 2008
@@ -0,0 +1,83 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>customer</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>customer-ear</artifactId>
+    <name>Geronimo Samples :: customer :: EAR</name>
+    <packaging>ear</packaging>
+
+    <description>Geronimo Samples. EAR Module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>customer-war</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>customer-ejb</artifactId>
+            <version>${version}</version>
+            <type>ejb</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <displayName>Geronimo Sample EAR for customer</displayName>
+                    <description>Geronimo Sample EAR for customer</description>
+                    <version>5</version>
+                    <modules>
+                        <ejbModule>
+                            <groupId>org.apache.geronimo.samples</groupId>
+                            <artifactId>customer-ejb</artifactId>
+                            <bundleFileName>customer-ejb-${version}.jar</bundleFileName>
+                        </ejbModule>
+
+                        <webModule>
+                            <groupId>org.apache.geronimo.samples</groupId>
+                            <artifactId>customer-war</artifactId>
+                            <contextRoot>/service</contextRoot>
+                            <bundleFileName>customer-war-${version}.war</bundleFileName>
+                        </webModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql?rev=677340&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql (added)
+++ geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql Wed Jul 16 10:05:53 2008
@@ -0,0 +1,26 @@
+
+--  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.
+
+
+CREATE TABLE customerInfo(
+   customerid VARCHAR(10) PRIMARY KEY,
+   fullname VARCHAR(30),
+   emailaddress VARCHAR(30),
+   interests VARCHAR(100)
+);
+
+INSERT INTO customerInfo VALUES ('A100','John Doe10','Doe10@work.com','Java,Open Source, Computer Graphics');
+INSERT INTO customerInfo VALUES ('b100','Jane Doe20','Doe20@home.net','Budget Travel, New Zealand, Martial Arts');

Propchange: geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/customer/customer-ear/src/main/resources/CustomerService.sql
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message