You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/08/19 14:45:37 UTC
svn commit: r987152 - in
/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb:
backbeans/ sessionBeans/
Author: xiaming
Date: Thu Aug 19 12:45:36 2010
New Revision: 987152
URL: http://svn.apache.org/viewvc?rev=987152&view=rev
Log:
GERONIMO-5493 correct an EJB name, provided by LiWenQin
Added:
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java (with props)
Modified:
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java?rev=987152&r1=987151&r2=987152&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/AddCalculatorBackBean.java Thu Aug 19 12:45:36 2010
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.geronimo.samples.javaee6.SingletonEJB.backbeans;
+package org.apache.geronimo.samples.javaee6.singletonejb.backbeans;
-import org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans.StatefulCalculator;
+import org.apache.geronimo.samples.javaee6.singletonejb.sessionBeans.SingletonCalculator;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
@@ -29,7 +29,7 @@ import javax.faces.bean.RequestScoped;
public class AddCalculatorBackBean {
@EJB
- private StatefulCalculator calculatorfacade;
+ private SingletonCalculator calculatorfacade;
private String currentInput = "0.0";
private String output;
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java?rev=987152&r1=987151&r2=987152&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/backbeans/SubtractCalculatorBackBean.java Thu Aug 19 12:45:36 2010
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.geronimo.samples.javaee6.SingletonEJB.backbeans;
+package org.apache.geronimo.samples.javaee6.singletonejb.backbeans;
-import org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans.StatefulCalculator;
+import org.apache.geronimo.samples.javaee6.singletonejb.sessionBeans.SingletonCalculator;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
@@ -29,7 +29,7 @@ import javax.faces.bean.RequestScoped;
public class SubtractCalculatorBackBean {
@EJB
- private StatefulCalculator calculatorfacade;
+ private SingletonCalculator calculatorfacade;
private String currentInput = "0.0";
private String output;
Added: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java?rev=987152&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java (added)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java Thu Aug 19 12:45:36 2010
@@ -0,0 +1,49 @@
+/*
+ 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.javaee6.singletonejb.sessionBeans;
+
+import javax.ejb.Singleton;
+
+
+@Singleton
+public class SingletonCalculator {
+
+ // Add business logic below. (Right-click in editor and choose
+ // "Insert Code > Add Business Method")
+ String output = "Start the calculator process:<br/>";
+ double result = 0;
+
+ public double add(double d) {
+ double tmp = result + d;
+ this.output += result + " + " + d + " equals " + tmp + "<br/>";
+ result = tmp;
+ return result;
+ }
+
+ public String getOutput() {
+ return this.output;
+ }
+
+ public double sub(double d) {
+ double tmp = result - d;
+ this.output += result + " - " + d + " equals " + tmp + "<br/>";
+ result = tmp;
+ return result;
+ }
+}
Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/SingletonCalculator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java?rev=987152&r1=987151&r2=987152&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java (original)
+++ geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/singletonejb/sessionBeans/StatefulCalculator.java Thu Aug 19 12:45:36 2010
@@ -1,49 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-package org.apache.geronimo.samples.javaee6.SingletonEJB.sessionBeans;
-
-import javax.ejb.Singleton;
-
-
-@Singleton
-public class StatefulCalculator {
-
- // Add business logic below. (Right-click in editor and choose
- // "Insert Code > Add Business Method")
- String output = "Start the calculator process:<br/>";
- double result = 0;
-
- public double add(double d) {
- double tmp = result + d;
- this.output += result + " + " + d + " equals " + tmp + "<br/>";
- result = tmp;
- return result;
- }
-
- public String getOutput() {
- return this.output;
- }
-
- public double sub(double d) {
- double tmp = result - d;
- this.output += result + " - " + d + " equals " + tmp + "<br/>";
- result = tmp;
- return result;
- }
-}