You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/06/06 22:53:33 UTC
svn commit: r664120 [2/13] - in /geronimo/samples/trunk/samples: ./
app-per-port/ app-per-port/app-per-port-connector-war/
app-per-port/app-per-port-connector-war/src/main/webapp/WEB-INF/
app-per-port/app-per-port-ear/ app-per-port/app-per-port-tomcat/...
Modified: geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml Fri Jun 6 13:53:24 2008
@@ -119,7 +119,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -147,17 +147,17 @@
<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> -->
+ <!--<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>
@@ -170,7 +170,7 @@
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>jetty</it-server>-->
+ <!--<it-server>jetty</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml Fri Jun 6 13:53:24 2008
@@ -24,7 +24,9 @@
<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
<attribute name="testSQL">select * from customer</attribute>
<attribute name="path">BankDB.sql</attribute>
- <reference name="DataSource"><name>SampleTxDatasource</name></reference>
+ <reference name="DataSource">
+ <name>SampleTxDatasource</name>
+ </reference>
</gbean>
</application>
Modified: geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml Fri Jun 6 13:53:24 2008
@@ -119,7 +119,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -147,17 +147,17 @@
<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> -->
+ <!--<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>
@@ -165,12 +165,12 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>tomcat</it-server>-->
+ <!--<it-server>tomcat</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml Fri Jun 6 13:53:24 2008
@@ -24,7 +24,9 @@
<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
<attribute name="testSQL">select * from customer</attribute>
<attribute name="path">BankDB.sql</attribute>
- <reference name="DataSource"><name>SampleTxDatasource</name></reference>
+ <reference name="DataSource">
+ <name>SampleTxDatasource</name>
+ </reference>
</gbean>
</application>
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CommonServiceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CommonServiceServlet.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CommonServiceServlet.java (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CommonServiceServlet.java Fri Jun 6 13:53:24 2008
@@ -30,29 +30,30 @@
import org.apache.geronimo.samples.bank.ejb.ExchangeRate;
public class CommonServiceServlet extends HttpServlet {
- @EJB
- private BankManagerFacadeLocal bm = null;
-
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- viewRates(req, res);
- }
-
- protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- doGet(req,res);
- }
-
- private void viewRates(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException{
- String path = "/error.jsp";;
-
- try {
- List<ExchangeRate> rates = (List<ExchangeRate>)bm.getExchangeRates();
- req.setAttribute("ratesList", rates);
-
- path = "/exchange_rates.jsp";
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- getServletContext().getRequestDispatcher(path).forward(req,res);
- }
+ @EJB
+ private BankManagerFacadeLocal bm = null;
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+ viewRates(req, res);
+ }
+
+ protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+ doGet(req, res);
+ }
+
+ private void viewRates(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+ String path = "/error.jsp";
+ ;
+
+ try {
+ List<ExchangeRate> rates = (List<ExchangeRate>) bm.getExchangeRates();
+ req.setAttribute("ratesList", rates);
+
+ path = "/exchange_rates.jsp";
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ getServletContext().getRequestDispatcher(path).forward(req, res);
+ }
}
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CustomerServiceServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CustomerServiceServlet.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CustomerServiceServlet.java (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/java/org/apache/geronimo/samples/bank/web/CustomerServiceServlet.java Fri Jun 6 13:53:24 2008
@@ -32,39 +32,40 @@
public class CustomerServiceServlet extends HttpServlet {
- @EJB
- private BankManagerFacadeLocal bm = null;
+ @EJB
+ private BankManagerFacadeLocal bm = null;
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- viewCustomerInfo(req, res);
- }
-
- protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- doGet(req,res);
- }
-
- private void viewCustomerInfo(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException{
- String path = "/error.jsp";;
- try {
- String customerCode = req.getParameter("customerCode");
-
- List<Account> accountList = (List<Account>)bm.getAccountInformation(customerCode);
- Customer customer = bm.getCustomer(customerCode);
-
-
- if(accountList != null && customer!= null){
-
- req.setAttribute("accountList",accountList);
- req.setAttribute("customerCode",customerCode);
- req.setAttribute("customerName",customer.getName());
- path = "/customer_info.jsp";
-
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- getServletContext().getRequestDispatcher(path).forward(req,res);
- }
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+ viewCustomerInfo(req, res);
+ }
+
+ protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+ doGet(req, res);
+ }
+
+ private void viewCustomerInfo(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+ String path = "/error.jsp";
+ ;
+ try {
+ String customerCode = req.getParameter("customerCode");
+
+ List<Account> accountList = (List<Account>) bm.getAccountInformation(customerCode);
+ Customer customer = bm.getCustomer(customerCode);
+
+
+ if (accountList != null && customer != null) {
+
+ req.setAttribute("accountList", accountList);
+ req.setAttribute("customerCode", customerCode);
+ req.setAttribute("customerName", customer.getName());
+ path = "/customer_info.jsp";
+
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ getServletContext().getRequestDispatcher(path).forward(req, res);
+ }
}
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/WEB-INF/web.xml Fri Jun 6 13:53:24 2008
@@ -18,33 +18,33 @@
under the License.
-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5">
-
- <welcome-file-list>
- <welcome-file>/index.html</welcome-file>
- </welcome-file-list>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
+ version="2.5">
- <servlet>
- <display-name>CustomerServiceServlet</display-name>
- <servlet-name>CustomerServiceServlet</servlet-name>
- <servlet-class>org.apache.geronimo.samples.bank.web.CustomerServiceServlet</servlet-class>
- </servlet>
-
- <servlet>
- <display-name>CommonServiceServlet</display-name>
- <servlet-name>CommonServiceServlet</servlet-name>
- <servlet-class>org.apache.geronimo.samples.bank.web.CommonServiceServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CustomerServiceServlet</servlet-name>
- <url-pattern>/customer_info</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>CommonServiceServlet</servlet-name>
- <url-pattern>/exchange_rates</url-pattern>
- </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>/index.html</welcome-file>
+ </welcome-file-list>
+
+ <servlet>
+ <display-name>CustomerServiceServlet</display-name>
+ <servlet-name>CustomerServiceServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.samples.bank.web.CustomerServiceServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <display-name>CommonServiceServlet</display-name>
+ <servlet-name>CommonServiceServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.samples.bank.web.CommonServiceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CustomerServiceServlet</servlet-name>
+ <url-pattern>/customer_info</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>CommonServiceServlet</servlet-name>
+ <url-pattern>/exchange_rates</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_info.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_info.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_info.jsp (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_info.jsp Fri Jun 6 13:53:24 2008
@@ -1,62 +1,65 @@
-<%@ page import="org.apache.geronimo.samples.bank.ejb.Account" %>
<%@ page import="java.util.List" %>
+<%@ page import="org.apache.geronimo.samples.bank.ejb.Account" %>
<!--
- 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
+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
+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.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<HTML>
<HEAD><TITLE>Customer Account Information</TITLE></HEAD>
<BODY>
- <DIV align="center">
- <H2>Customer Account Information</H2>
- <%
- String customerId = (String)request.getAttribute("customerCode");
- String customerName = (String)request.getAttribute("customerName");
- List<Account> accountList = (List<Account>)request.getAttribute("accountList");
- %>
- <BR><BR><B>Customer Id: </B><%=customerId%>
- <BR><B>Customer Name: </B><%=customerName%>
- <BR>
- <BR>
- <BR>
- <TABLE bgcolor="cyan">
- <TR>
- <TD><B>Account Number</B></TD>
- <TD><B>Account Type</B></TD>
- <TD><B>Balance</B></TD>
- </TR>
- <%
- for(int i=0; i<accountList.size(); i++) {
- Account account = (Account)accountList.get(i);
- String accNo = account.getAccountNumber();
- String accType = account.getAccountType();
- String balance = "" + account.getBalance();
- %>
- <TR>
- <TD><%=accNo%></TD>
- <TD><%=accType%></TD>
- <TD><%=balance%></TD>
- </TR>
- <%
- }
- %>
- </TABLE>
- <BR><BR>
- <a href="../bank/index.jsp">Home</a>
- </DIV>
+<DIV align="center">
+ <H2>Customer Account Information</H2>
+ <%
+ String customerId = (String) request.getAttribute("customerCode");
+ String customerName = (String) request.getAttribute("customerName");
+ List<Account> accountList = (List<Account>) request.getAttribute("accountList");
+ %>
+ <BR><BR><B>Customer Id: </B><%=customerId%>
+ <BR><B>Customer Name: </B><%=customerName%>
+ <BR>
+ <BR>
+ <BR>
+ <TABLE bgcolor="cyan">
+ <TR>
+ <TD><B>Account Number</B></TD>
+ <TD><B>Account Type</B></TD>
+ <TD><B>Balance</B></TD>
+ </TR>
+ <%
+ for (int i = 0; i < accountList.size(); i++) {
+ Account account = (Account) accountList.get(i);
+ String accNo = account.getAccountNumber();
+ String accType = account.getAccountType();
+ String balance = "" + account.getBalance();
+ %>
+ <TR>
+ <TD><%=accNo%>
+ </TD>
+ <TD><%=accType%>
+ </TD>
+ <TD><%=balance%>
+ </TD>
+ </TR>
+ <%
+ }
+ %>
+ </TABLE>
+ <BR><BR>
+ <a href="../bank/index.jsp">Home</a>
+</DIV>
</BODY>
</HTML>
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_main.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_main.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_main.jsp (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/customer_main.jsp Fri Jun 6 13:53:24 2008
@@ -1,38 +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
+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
+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.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<HTML>
<HEAD><TITLE>View Customer Information</TITLE></HEAD>
<BODY>
<div align="center">
-<H2>View Customer Information</H2>
-<FORM method="POST" action="customer_info">
- <TABLE bgcolor="cyan">
- <TR>
- <TD>Customer Id:</TD>
- <TD><INPUT type="text" name="customerCode"></TD>
- </TR>
- </TABLE>
- <BR>
- <INPUT type="submit" value="View"> <INPUT type="reset" value="Cancel">
- <BR><BR>
- <a href="../bank/index.jsp">Home</a>
-</FORM>
+ <H2>View Customer Information</H2>
+
+ <FORM method="POST" action="customer_info">
+ <TABLE bgcolor="cyan">
+ <TR>
+ <TD>Customer Id:</TD>
+ <TD><INPUT type="text" name="customerCode"></TD>
+ </TR>
+ </TABLE>
+ <BR>
+ <INPUT type="submit" value="View"> <INPUT type="reset" value="Cancel">
+ <BR><BR>
+ <a href="../bank/index.jsp">Home</a>
+ </FORM>
</div>
</BODY>
</HTML>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/error.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/error.jsp (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/error.jsp Fri Jun 6 13:53:24 2008
@@ -1,28 +1,28 @@
<!--
- 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
+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
+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.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<HTML>
<HEAD><TITLE>Error</TITLE></HEAD>
<BODY>
- <div align="center">
- <H2>Error Occured !!!</H2>
- <BR><BR>
- <a href="../bank/index.jsp">Home</a>
- </div>
+<div align="center">
+ <H2>Error Occured !!!</H2>
+ <BR><BR>
+ <a href="../bank/index.jsp">Home</a>
+</div>
</BODY>
</HTML>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/exchange_rates.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/exchange_rates.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/exchange_rates.jsp (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/exchange_rates.jsp Fri Jun 6 13:53:24 2008
@@ -1,57 +1,59 @@
+<%@ page import="java.util.List" %>
<%@ page import="org.apache.geronimo.samples.bank.ejb.ExchangeRate" %>
-<%@ page import="java.util.*" %>
<!--
- 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
+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
+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.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<HTML>
<HEAD><TITLE>Exchange Rates</TITLE></HEAD>
<BODY>
- <DIV align="center">
- <H2>Exchange Rates</H2>
- <BR><BR>
- <TABLE bgcolor="cyan">
- <TR>
- <TD><B>Currency</B></TD>
- <TD><B>Rate</B></TD>
- </TR>
- <%
- if(request.getAttribute("ratesList") != null) {
- List<ExchangeRate> rateList = (List<ExchangeRate>)request.getAttribute("ratesList");
- for(int i=0; i < rateList.size(); i++) {
- ExchangeRate rate = (ExchangeRate)rateList.get(i);
- if(rate == null) {
- out.println("<tr><td>not found</td><td></td></tr>");
- } else {
- String currency = rate.getCurrency();
- Double rateVal = rate.getRate();
- %>
- <TR>
- <TD><%= currency %></TD>
- <TD><%= rateVal.toString() %></TD>
- </TR>
- <%
- }
- }
- }
- %>
- </TABLE>
- <BR><BR>
- <a href="../bank/index.jsp">Home</a>
- </DIV>
+<DIV align="center">
+ <H2>Exchange Rates</H2>
+ <BR><BR>
+ <TABLE bgcolor="cyan">
+ <TR>
+ <TD><B>Currency</B></TD>
+ <TD><B>Rate</B></TD>
+ </TR>
+ <%
+ if (request.getAttribute("ratesList") != null) {
+ List<ExchangeRate> rateList = (List<ExchangeRate>) request.getAttribute("ratesList");
+ for (int i = 0; i < rateList.size(); i++) {
+ ExchangeRate rate = (ExchangeRate) rateList.get(i);
+ if (rate == null) {
+ out.println("<tr><td>not found</td><td></td></tr>");
+ } else {
+ String currency = rate.getCurrency();
+ Double rateVal = rate.getRate();
+ %>
+ <TR>
+ <TD><%= currency %>
+ </TD>
+ <TD><%= rateVal.toString() %>
+ </TD>
+ </TR>
+ <%
+ }
+ }
+ }
+ %>
+ </TABLE>
+ <BR><BR>
+ <a href="../bank/index.jsp">Home</a>
+</DIV>
</BODY>
</HTML>
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/header.html Fri Jun 6 13:53:24 2008
@@ -16,40 +16,42 @@
-->
<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>
+<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>
+<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
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.html Fri Jun 6 13:53:24 2008
@@ -17,13 +17,13 @@
<!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>Apache Geronimo Sample Application</title>
- <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+ <title>Apache Geronimo Sample Application</title>
+ <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
</head>
<FRAMESET rows="86px,*" frameborder="0">
<FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
<FRAME src="./index.jsp" name="Bank" title="Bank" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
</FRAMESET>
-
+
</html>
Modified: geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.jsp (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/src/main/webapp/index.jsp Fri Jun 6 13:53:24 2008
@@ -1,30 +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
+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
+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.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<HTML>
<HEAD><TITLE>Banking Web Application</TITLE></HEAD>
<BODY>
<div align="center">
-<H2>Banking Web Application</H2>
-<BR><BR>
- <a href="customer_main.jsp" name="customers">View Customer Information</a>
-<BR><BR>
- <a href="exchange_rates" name="rates">View Exchange Rates</a>
+ <H2>Banking Web Application</H2>
+ <BR><BR>
+ <a href="customer_main.jsp" name="customers">View Customer Information</a>
+ <BR><BR>
+ <a href="exchange_rates" name="rates">View Exchange Rates</a>
</div>
</BODY>
</HTML>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml Fri Jun 6 13:53:24 2008
@@ -36,7 +36,7 @@
<description>
Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
</description>
-
+
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -44,7 +44,7 @@
<version>${version}</version>
<type>ejb</type>
</dependency>
-
+
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>calculator-stateless-war</artifactId>
@@ -54,7 +54,7 @@
</dependencies>
<build>
-
+
<plugins>
<plugin>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/src/main/resources/META-INF/geronimo-application.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ear/src/main/resources/META-INF/geronimo-application.xml Fri Jun 6 13:53:24 2008
@@ -30,12 +30,12 @@
<type>ear</type>
</moduleId>
</environment>
-
+
<module>
<web>calculator-stateless-war-${version}.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
<context-root>/calculator-stateless</context-root>
</web-app>
</module>
-
+
</application>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml Fri Jun 6 13:53:24 2008
@@ -28,7 +28,7 @@
<artifactId>calculator-stateless-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>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/Calculator.java Fri Jun 6 13:53:24 2008
@@ -24,17 +24,16 @@
* 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 sum(int add1, int add2) {
+ return add1 + add2;
+ }
- public int multiply(int mul1, int mul2) {
- return mul1*mul2;
- }
+ public int multiply(int mul1, int mul2) {
+ return mul1 * mul2;
+ }
}
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorLocal.java Fri Jun 6 13:53:24 2008
@@ -19,12 +19,12 @@
/**
* 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
+ * 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);
+
+ public int sum(int add1, int add2);
+
+ public int multiply(int mul1, int mul2);
}
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-ejb/src/main/java/org/apache/geronimo/samples/slsb/calculator/CalculatorRemote.java Fri Jun 6 13:53:24 2008
@@ -25,9 +25,9 @@
*/
@Remote
public interface CalculatorRemote {
-
- public int sum(int add1, int add2);
-
- public int multiply(int mul1, int mul2);
+
+ public int sum(int add1, int add2);
+
+ public int multiply(int mul1, int mul2);
}
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml Fri Jun 6 13:53:24 2008
@@ -78,30 +78,30 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </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>
+ <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>
@@ -111,7 +111,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -139,17 +139,17 @@
<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> -->
+ <!--<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>
@@ -162,7 +162,7 @@
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>jetty</it-server>-->
+ <!--<it-server>jetty</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml Fri Jun 6 13:53:24 2008
@@ -45,7 +45,7 @@
<type>ear</type>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -78,30 +78,30 @@
<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>
+ <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>
@@ -111,7 +111,7 @@
<filtering>true</filtering>
</resource>
</resources>
-
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -139,17 +139,17 @@
<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> -->
+ <!--<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>
@@ -157,12 +157,12 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>it</id>
<!--<properties>-->
- <!--<it-server>tomcat</it-server>-->
+ <!--<it-server>tomcat</it-server>-->
<!--</properties>-->
<build>
<plugins>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml Fri Jun 6 13:53:24 2008
@@ -28,7 +28,7 @@
<artifactId>calculator-stateless-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>
@@ -40,11 +40,11 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -55,7 +55,7 @@
</goals>
<configuration>
<tasks>
- <echo>Copying site directory from parent</echo>
+ <echo>Copying site directory from parent</echo>
<copy todir="${project.build.directory}/${artifactId}-${version}" failonerror="false" overwrite="true">
<fileset dir="${basedir}/../docs"/>
</copy>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/java/org/apache/geronimo/samples/calculator/CalculatorServlet.java Fri Jun 6 13:53:24 2008
@@ -17,6 +17,7 @@
package org.apache.geronimo.samples.calculator;
import java.io.IOException;
+
import javax.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -27,13 +28,13 @@
/**
* 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)
+// @EJB(name="CalculatorLocal", beanInterface=CalculatorLocal.class)
public class CalculatorServlet extends HttpServlet {
@@ -42,7 +43,7 @@
private CalculatorLocal calc = null;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ throws ServletException, IOException {
try {
String firstNumber = req.getParameter("firstNumber");
@@ -52,10 +53,9 @@
int firstInt = (firstNumber == null) ? 0 : Integer.valueOf(firstNumber).intValue();
int secondInt = (secondNumber == null) ? 0 : Integer.valueOf(secondNumber).intValue();
- if ( "multiply".equals(operation) ) {
+ if ("multiply".equals(operation)) {
req.setAttribute("result", calc.multiply(firstInt, secondInt));
- }
- else if ( "add".equals(operation) ) {
+ } else if ("add".equals(operation)) {
req.setAttribute("result", calc.sum(firstInt, secondInt));
}
@@ -64,7 +64,7 @@
getServletContext().getRequestDispatcher("/sample-docu.jsp").forward(req, resp);
}
- catch ( Exception e ) {
+ catch (Exception e) {
e.printStackTrace();
throw new ServletException(e);
}
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/WEB-INF/web.xml Fri Jun 6 13:53:24 2008
@@ -22,7 +22,7 @@
<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>
+ <description>Stateless SessionBean Servlet Sample</description>
<servlet>
<servlet-name>Calculator</servlet-name>
<servlet-class>org.apache.geronimo.samples.calculator.CalculatorServlet</servlet-class>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/header.html Fri Jun 6 13:53:24 2008
@@ -16,40 +16,42 @@
-->
<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>
+<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>
+<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
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/index.html Fri Jun 6 13:53:24 2008
@@ -17,13 +17,13 @@
<!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">
+ <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>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-war/src/main/webapp/sample-docu.jsp Fri Jun 6 13:53:24 2008
@@ -1,108 +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.
+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"%>
+<%@ 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>
+ <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 beans 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>
+<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 beans 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>
Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator-stateless-pojo/pom.xml Fri Jun 6 13:53:24 2008
@@ -20,7 +20,7 @@
<!-- $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>
@@ -29,11 +29,11 @@
<artifactId>calculator-stateless-pojo</artifactId>
<name>Geronimo Samples :: Stateless Session :: Calculator</name>
<packaging>pom</packaging>
-
+
<description>
Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
</description>
-
+
<modules>
<module>calculator-stateless-ejb</module>
<module>calculator-stateless-war</module>
@@ -49,7 +49,7 @@
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
<configuration>
- <outputDirectory>${project.basedir}/docs</outputDirectory>
+ <outputDirectory>${project.basedir}/docs</outputDirectory>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/customer-service/customer-service-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ear/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ear/pom.xml Fri Jun 6 13:53:24 2008
@@ -61,7 +61,7 @@
<description>Geronimo Sample EAR for customer-service</description>
<version>5</version>
<modules>
- <ejbModule>
+ <ejbModule>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>customer-service-ejb</artifactId>
<bundleFileName>customer-service-ejb-${version}.jar</bundleFileName>
Modified: geronimo/samples/trunk/samples/customer-service/customer-service-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ear/src/main/resources/META-INF/geronimo-application.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ear/src/main/resources/META-INF/geronimo-application.xml Fri Jun 6 13:53:24 2008
@@ -16,16 +16,16 @@
-->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>ear</dep:type>
- </dep:moduleId>
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:moduleId>
+ <dep:groupId>${pom.groupId}</dep:groupId>
+ <dep:artifactId>${pom.artifactId}</dep:artifactId>
+ <dep:version>${version}</dep:version>
+ <dep:type>ear</dep:type>
+ </dep:moduleId>
- <dep:dependencies/>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
+ <dep:dependencies/>
+ <dep:hidden-classes/>
+ <dep:non-overridable-classes/>
+ </dep:environment>
</application>
Modified: geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/Customer.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/Customer.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/Customer.java (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/Customer.java Fri Jun 6 13:53:24 2008
@@ -18,6 +18,7 @@
package com.service.customer.ejb;
import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
Modified: geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java Fri Jun 6 13:53:24 2008
@@ -17,19 +17,12 @@
package com.service.customer.ejb;
-import java.rmi.RemoteException;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
-import javax.persistence.PersistenceUnit;
-import javax.ejb.EJBException;
import javax.ejb.Stateless;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnit;
@Stateless
public class ProcessCustomerSessionBean implements ProcessCustomerSessionLocal {
@@ -37,25 +30,25 @@
protected EntityManagerFactory emf;
public ProcessCustomerSessionBean() {
-
+
}
public List<Customer> findAllCustomers() {
EntityManager em = emf.createEntityManager();
String query = "SELECT * FROM customer";
List<Customer> customerList =
- (List<Customer>)em.createNativeQuery(query, Customer.class).getResultList();
+ (List<Customer>) em.createNativeQuery(query, Customer.class).getResultList();
em.close();
return customerList;
}
public Customer findCustomer(String key) {
EntityManager em = emf.createEntityManager();
- String query = "SELECT * FROM customer WHERE id='"+key+"'";
+ String query = "SELECT * FROM customer WHERE id='" + key + "'";
List<Customer> customerList =
- (List<Customer>)em.createNativeQuery(query, Customer.class).getResultList();
- if(customerList.size() == 1) {
- return (Customer)customerList.get(0);
+ (List<Customer>) em.createNativeQuery(query, Customer.class).getResultList();
+ if (customerList.size() == 1) {
+ return (Customer) customerList.get(0);
} else {
return null;
}
Modified: geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java Fri Jun 6 13:53:24 2008
@@ -17,8 +17,6 @@
package com.service.customer.ejb;
-import com.service.customer.ejb.Customer;
-
public interface ProcessCustomerSessionLocal {
public java.util.List<Customer> findAllCustomers();