geronimo-scm mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	lin...@apache.org
Subject	svn commit: r677701 [1/3] - in /geronimo/samples/trunk: ./ buildutil/ buildutil/src/ buildutil/src/main/ buildutil/src/main/java/ buildutil/src/main/java/org/ buildutil/src/main/java/org/apache/ buildutil/src/main/java/org/apache/geronimo/ buildutil/sr...
Date	Thu, 17 Jul 2008 19:48:27 GMT
Author: linsun Date: Thu Jul 17 12:48:20 2008 New Revision: 677701 URL: http://svn.apache.org/viewvc?rev=677701&view=rev Log: pull in GERONIMO-4205 + GERONIMO-4194 from branch 2.1 Added: geronimo/samples/trunk/buildutil/ geronimo/samples/trunk/buildutil/README.txt (with props) geronimo/samples/trunk/buildutil/pom.xml (with props) geronimo/samples/trunk/buildutil/src/ geronimo/samples/trunk/buildutil/src/main/ geronimo/samples/trunk/buildutil/src/main/java/ geronimo/samples/trunk/buildutil/src/main/java/org/ geronimo/samples/trunk/buildutil/src/main/java/org/apache/ geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/ geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/ geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/ geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java (with props) geronimo/samples/trunk/samples/calculator/ geronimo/samples/trunk/samples/calculator/calculator-ear/ geronimo/samples/trunk/samples/calculator/calculator-ear/pom.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-ejb/ geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt (with props) geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-ejb/src/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java (with props) geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java (with props) geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java (with props) geronimo/samples/trunk/samples/calculator/calculator-jetty/ geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-jetty/src/ geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/ geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/ geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-tomcat/ geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/ geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/ geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/ geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-war/ geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-war/src/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java (with props) geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml (with props) geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html (with props) geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html (with props) geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/sample-docu.jsp (with props) geronimo/samples/trunk/samples/calculator/pom.xml (with props) geronimo/samples/trunk/samples/customer/ geronimo/samples/trunk/samples/customer/customer-ear/ geronimo/samples/trunk/samples/customer/customer-ear/pom.xml (with props) geronimo/samples/trunk/samples/customer/customer-ear/src/ geronimo/samples/trunk/samples/customer/customer-ear/src/main/ geronimo/samples/trunk/samples/customer/customer-ear/src/main/resources/ geronimo/samples/trunk/samples/customer/customer-ear/src/main/resources/CustomerService.sql (with props) geronimo/samples/trunk/samples/customer/customer-ear/src/main/resources/META-INF/ geronimo/samples/trunk/samples/customer/customer-ejb/ geronimo/samples/trunk/samples/customer/customer-ejb/pom.xml (with props) geronimo/samples/trunk/samples/customer/customer-ejb/src/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/service/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/service/customer/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/CustomerInfo.java (with props) geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java (with props) geronimo/samples/trunk/samples/customer/customer-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java (with props) geronimo/samples/trunk/samples/customer/customer-ejb/src/main/resources/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/resources/META-INF/ geronimo/samples/trunk/samples/customer/customer-ejb/src/main/resources/META-INF/persistence.xml (with props) geronimo/samples/trunk/samples/customer/customer-jetty/ geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml (with props) geronimo/samples/trunk/samples/customer/customer-jetty/src/ geronimo/samples/trunk/samples/customer/customer-jetty/src/main/ geronimo/samples/trunk/samples/customer/customer-jetty/src/main/plan/ geronimo/samples/trunk/samples/customer/customer-jetty/src/main/plan/plan.xml (with props) geronimo/samples/trunk/samples/customer/customer-tomcat/ geronimo/samples/trunk/samples/customer/customer-tomcat/pom.xml (with props) geronimo/samples/trunk/samples/customer/customer-tomcat/src/ geronimo/samples/trunk/samples/customer/customer-tomcat/src/main/ geronimo/samples/trunk/samples/customer/customer-tomcat/src/main/plan/ geronimo/samples/trunk/samples/customer/customer-tomcat/src/main/plan/plan.xml (with props) geronimo/samples/trunk/samples/customer/customer-war/ geronimo/samples/trunk/samples/customer/customer-war/pom.xml (with props) geronimo/samples/trunk/samples/customer/customer-war/src/ geronimo/samples/trunk/samples/customer/customer-war/src/main/ geronimo/samples/trunk/samples/customer/customer-war/src/main/java/ geronimo/samples/trunk/samples/customer/customer-war/src/main/java/com/ geronimo/samples/trunk/samples/customer/customer-war/src/main/java/com/service/ geronimo/samples/trunk/samples/customer/customer-war/src/main/java/com/service/customer/ geronimo/samples/trunk/samples/customer/customer-war/src/main/java/com/service/customer/web/ geronimo/samples/trunk/samples/customer/customer-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java (with props) geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/ geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/WEB-INF/ geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/WEB-INF/web.xml (with props) geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/customers/ geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/customers/index.jsp (with props) geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/header.html (with props) geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/index.html (with props) geronimo/samples/trunk/samples/customer/customer-war/src/main/webapp/index.jsp (with props) geronimo/samples/trunk/samples/customer/pom.xml (with props) geronimo/samples/trunk/samples/jms-mdb/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ear/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ear/pom.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ear/src/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ear/src/main/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ear/src/main/resources/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/pom.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/samples/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/samples/order/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/resources/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/src/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/src/main/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/src/main/plan/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/pom.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/src/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/src/main/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/src/main/plan/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/pom.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/org/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/samples/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/samples/order/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/WEB-INF/ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/WEB-INF/web.xml (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/error.jsp (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/header.html (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/index.html (with props) geronimo/samples/trunk/samples/jms-mdb/jms-mdb-war/src/main/webapp/order.jsp (with props) geronimo/samples/trunk/samples/jms-mdb/pom.xml (with props) Removed: geronimo/samples/trunk/samples/calculator-stateless-pojo/ geronimo/samples/trunk/samples/customer-service/ geronimo/samples/trunk/samples/jms-mdb-sample/ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/Entries.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/Entry.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/JspCalendar.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/TableBean.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal1.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal2.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/checkresult.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/colors/colrs.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/dates/date.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/error/err.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/error/errorpge.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/forward/forward.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/forward/one.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/include/foo.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/include/include.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/Functions.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/basic-arithmetic.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/basic-comparisons.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/functions.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/implicit-objects.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/FooBean.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/HelloWorldSimpleTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/ShuffleSimpleTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/TileSimpleTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.jspx.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jspx.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/EchoAttributesTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/coda.jspf.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/prelude.jspf.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/BookBean.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/FindBookSimpleTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/Functions.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/HelloWorldSimpleTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/RepeatSimpleTag.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/displayProducts.tag.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/helloWorld.tag.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.tag.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/xhtmlbasic.tag.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/hello.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jsptoservlet.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/servletToJsp.java.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/error.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/index.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/login.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/source.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.jsp.html geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.jsp.html Modified: geronimo/samples/trunk/pom.xml geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/pom.xml geronimo/samples/trunk/samples/pom.xml Added: geronimo/samples/trunk/buildutil/README.txt URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/buildutil/README.txt?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/buildutil/README.txt (added) +++ geronimo/samples/trunk/buildutil/README.txt Thu Jul 17 12:48:20 2008 @@ -0,0 +1,10 @@ +This is not a sample, it is a built until used by the sample. + +Tomcat has an Ant based util called txt2html +(see http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_17/java/org/apache/tomcat/buildutil/Txt2Html.java). +This util is only used in tomcat build time and don't seem to be available in a standalone tomcat jar. + +This module borrows the Txt2Html.java from tomcat and enables the jsp and servlet samples +in geronimo to generate html files for source files. + + \ No newline at end of file Propchange: geronimo/samples/trunk/buildutil/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/buildutil/README.txt ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/buildutil/README.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/samples/trunk/buildutil/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/buildutil/pom.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/buildutil/pom.xml (added) +++ geronimo/samples/trunk/buildutil/pom.xml Thu Jul 17 12:48:20 2008 @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + 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. +--> + +<!-- @version $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-parent</artifactId> + <version>2.2-SNAPSHOT</version> + </parent> + + <artifactId>buildutil</artifactId> + <name>Geronimo Samples :: Buildutil</name> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> + +</project> + Propchange: geronimo/samples/trunk/buildutil/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/buildutil/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/buildutil/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java (added) +++ geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java Thu Jul 17 12:48:20 2008 @@ -0,0 +1,164 @@ +/* +* 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.buildutil; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.FileSet; + +/* + * Ant task to convert a given set of files from Text to HTML. + * Inserts an HTML header including pre tags and replaces special characters + * with their HTML escaped equivalents. + * + * <p>This task is currently used by the ant script to build our examples</p> + * + * @author Mark Roth + / +public class Txt2Html + extends Task +{ + + /* The directory to contain the resulting files / + private File todir; + + /* The file to be converted into HTML / + private List<FileSet> filesets = new LinkedList<FileSet>(); + + /* + * Sets the directory to contain the resulting files + * + * @param todir The directory + / + public void setTodir( File todir ) { + this.todir = todir; + } + + /* + * Sets the files to be converted into HTML + * + * @param fileset The fileset to be converted. + / + public void addFileset( FileSet fs ) { + filesets.add( fs ); + } + + /* + * Perform the conversion + * + * @param BuildException Thrown if an error occurs during execution of + * this task. + / + public void execute() + throws BuildException + { + int count = 0; + + // Step through each file and convert. + Iterator iter = filesets.iterator(); + while( iter.hasNext() ) { + FileSet fs = (FileSet)iter.next(); + DirectoryScanner ds = fs.getDirectoryScanner( project ); + File basedir = ds.getBasedir(); + String[] files = ds.getIncludedFiles(); + for( int i = 0; i < files.length; i++ ) { + File from = new File( basedir, files[i] ); + File to = new File( todir, files[i] + ".html" ); + if( !to.exists() \|\| + (from.lastModified() > to.lastModified()) ) + { + log( "Converting file '" + from.getAbsolutePath() + + "' to '" + to.getAbsolutePath(), Project.MSG_VERBOSE ); + try { + convert( from, to ); + } + catch( IOException e ) { + throw new BuildException( "Could not convert '" + + from.getAbsolutePath() + "' to '" + + to.getAbsolutePath() + "'", e ); + } + count++; + } + } + if( count > 0 ) { + log( "Converted " + count + " file" + (count > 1 ? "s" : "") + + " to " + todir.getAbsolutePath() ); + } + } + } + + /* + * Perform the actual copy and conversion + * + * @param from The input file + * @param to The output file + * @throws IOException Thrown if an error occurs during the conversion + / + private void convert( File from, File to ) + throws IOException + { + // Open files: + BufferedReader in = new BufferedReader( new FileReader( from ) ); + PrintWriter out = new PrintWriter( new FileWriter( to ) ); + + // Output header: + out.println( "<html><body><pre>" ); + + // Convert, line-by-line: + String line; + while( (line = in.readLine()) != null ) { + StringBuffer result = new StringBuffer(); + int len = line.length(); + for( int i = 0; i < len; i++ ) { + char c = line.charAt( i ); + switch( c ) { + case '&': + result.append( "&" ); + break; + case '<': + result.append( "<" ); + break; + default: + result.append( c ); + } + } + out.println( result.toString() ); + } + + // Output footer: + out.println( "</pre></body></html>" ); + + // Close streams: + out.close(); + in.close(); + } + +} + + Propchange: geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/buildutil/src/main/java/org/apache/geronimo/samples/buildutil/Txt2Html.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/samples/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=677701&r1=677700&r2=677701&view=diff ============================================================================== --- geronimo/samples/trunk/pom.xml (original) +++ geronimo/samples/trunk/pom.xml Thu Jul 17 12:48:20 2008 @@ -60,6 +60,7 @@ </distributionManagement> <modules> + <module>buildutil</module> <module>geronimo-samples-archetype</module> <module>samples</module> </modules> Modified: geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml?rev=677701&r1=677700&r2=677701&view=diff ============================================================================== --- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original) +++ geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml Thu Jul 17 12:48:20 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/trunk/samples/all-samples/all-samples-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml?rev=677701&r1=677700&r2=677701&view=diff ============================================================================== --- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original) +++ geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-ear/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-ear/pom.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-ear/pom.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-ear/pom.xml Thu Jul 17 12:48:20 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.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/trunk/samples/calculator/calculator-ear/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-ear/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-ear/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt (added) +++ geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/DISCLAIMER.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml Thu Jul 17 12:48:20 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.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/trunk/samples/calculator/calculator-ejb/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java (added) +++ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java (added) +++ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java (added) +++ geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml Thu Jul 17 12:48:20 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.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/trunk/samples/calculator/calculator-jetty/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-jetty/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml Thu Jul 17 12:48:20 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.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/trunk/samples/calculator/calculator-tomcat/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-tomcat/src/main/plan/plan.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml Thu Jul 17 12:48:20 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.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/trunk/samples/calculator/calculator-war/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java (added) +++ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml (added) +++ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html (added) +++ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html Thu Jul 17 12:48:20 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%"> +   + </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%"> +  <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>   + </td> + </tr> + </tbody> +</table> + +</body> +</html> \ No newline at end of file Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/header.html ------------------------------------------------------------------------------ svn:mime-type = text/html Added: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html?rev=677701&view=auto ============================================================================== --- geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html (added) +++ geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html Thu Jul 17 12:48:20 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/trunk/samples/calculator/calculator-war/src/main/webapp/index.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/samples/trunk/samples/calculator/calculator-war/src/main/webapp/index.html ------------------------------------------------------------------------------ svn:mime-type = text/html
Mime	Unnamed text/plain (inline, 7-Bit, 89763 bytes)
	View raw message