[jboss-cvs] JBossAS SVN: r103515 - in trunk: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 5 01:46:49 EDT 2010
Author: jaikiran
Date: 2010-04-05 01:46:48 -0400 (Mon, 05 Apr 2010)
New Revision: 103515
Added:
trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/
trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManager.java
trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManagerBean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/Calculator.java
trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/unit/
trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/unit/SingletonUnitTestCase.java
trunk/testsuite/src/resources/ejb3/singleton/
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/ejb3/pom.xml
trunk/testsuite/imports/sections/ejb3.xml
Log:
JBAS-7890 Upgraded to ejb3 0.1.1 bom
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-05 05:17:51 UTC (rev 103514)
+++ trunk/build/build.xml 2010-04-05 05:46:48 UTC (rev 103515)
@@ -698,6 +698,9 @@
<include name="ejb3-timerservice-jboss-beans.xml"/>
<include name="ejb3-connectors-jboss-beans.xml"/>
</fileset>
+ <fileset dir="${ejb3.module.output}/resources/META-INF">
+ <include name="singleton-container-aop.xml"/>
+ </fileset>
</copy>
<!-- Copy across client jars -->
@@ -713,6 +716,7 @@
<include name="ejb3-deployers-jboss-beans.xml"/>
<include name="ejb3-nointerface-jboss-beans.xml"/>
<include name="ejb3-metadata-deployers-jboss-beans.xml"/>
+ <include name="jboss-ejb3-singleton-deployer-jboss-beans.xml"/>
</fileset>
</copy>
@@ -1967,6 +1971,9 @@
<fileset refid="jboss:jboss-serialization:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-cache:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-common:jar"/>
+ <fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-aop:jar"/>
+ <fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-impl:jar"/>
+ <fileset refid="org.jboss.ejb3.container:jboss-ejb3-container-spi:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-naming:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
@@ -1981,6 +1988,11 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-mc-int:jar"/>
<fileset refid="org.jboss.ejb3.nointerface:jboss-ejb3-nointerface-impl:jar"/>
<fileset refid="org.jboss.ejb3.nointerface:jboss-ejb3-nointerface-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-aop-impl:jar"/>
+ <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-deployer:jar"/>
+ <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-impl:jar"/>
+ <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
+ <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar"/>
@@ -1990,6 +2002,7 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3_1:jar"/>
<fileset refid="org.jboss.ejb3.proxy:proxy-spi:jar"/>
<fileset refid="org.jboss.ejb3.proxy:proxy-javassist:jar"/>
+ <fileset refid="org.jboss.ejb3.proxy:proxy-reflect:jar"/>
<fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:jar"/>
<fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-3.1:jar"/>
<fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:jar"/>
@@ -2227,6 +2240,7 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar:client"/>
+ <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
<fileset refid="log4j:log4j:jar"/>
<fileset refid="gnu-getopt:getopt:jar"/>
<fileset refid="oswego-concurrent:concurrent:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-05 05:17:51 UTC (rev 103514)
+++ trunk/component-matrix/pom.xml 2010-04-05 05:46:48 UTC (rev 103515)
@@ -98,7 +98,7 @@
<version.org.jboss.cluster.server.api>1.1.1.GA</version.org.jboss.cluster.server.api>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
- <version.org.jboss.ejb3.bom>0.1.0</version.org.jboss.ejb3.bom>
+ <version.org.jboss.ejb3.bom>0.1.1</version.org.jboss.ejb3.bom>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta5</version.org.jboss.jbossxb>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-04-05 05:17:51 UTC (rev 103514)
+++ trunk/ejb3/pom.xml 2010-04-05 05:46:48 UTC (rev 103515)
@@ -100,7 +100,18 @@
<include name="META-INF/ejb3-metadata-deployers-jboss-beans.xml" />
</patternset>
</unjar>
+ <unjar src="${maven.dependency.org.jboss.ejb3.singleton.jboss-ejb3-singleton-deployer.jar.path}" dest="target/resources">
+ <patternset>
+ <include name="META-INF/jboss-ejb3-singleton-deployer-jboss-beans.xml" />
+ </patternset>
+ </unjar>
+ <unjar src="${maven.dependency.org.jboss.ejb3.singleton.jboss-ejb3-singleton-aop-impl.jar.path}" dest="target/resources">
+ <patternset>
+ <include name="META-INF/singleton-container-aop.xml" />
+ </patternset>
+ </unjar>
+
<mkdir dir="target/ejb3.deployer"/>
<copy todir="target/ejb3.deployer">
<fileset dir="target">
@@ -129,6 +140,7 @@
<fileset dir="target/resources/META-INF">
<include name="ejb3-nointerface-jboss-beans.xml" />
<include name="ejb3-metadata-deployers-jboss-beans.xml" />
+ <include name="jboss-ejb3-singleton-deployer-jboss-beans.xml" />
</fileset>
<fileset dir="target/resources/deployers/META-INF">
<include name="ejb3-deployers-jboss-beans.xml" />
Modified: trunk/testsuite/imports/sections/ejb3.xml
===================================================================
--- trunk/testsuite/imports/sections/ejb3.xml 2010-04-05 05:17:51 UTC (rev 103514)
+++ trunk/testsuite/imports/sections/ejb3.xml 2010-04-05 05:46:48 UTC (rev 103515)
@@ -183,11 +183,22 @@
</jar>
</target>
+ <target name="ejb31singleton" depends="compile">
+ <mkdir dir="${build.lib}" />
+
+ <jar destfile="${build.lib}/ejb31singleton.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ejb3/singleton/**" />
+ </fileset>
+ <fileset dir="${build.resources}/ejb3/singleton" includes="**"/>
+ </jar>
+ </target>
+
<target name="_jars-ejb3" depends="ejb3-servlet,jbas6161,jbas6239,
jbas7526,
jbas7556,
- ejbthree1597,ejbthree7376, jboss51xsd, ejb31nointerface, ejb3war, jbpapp3026">
+ ejbthree1597,ejbthree7376, jboss51xsd, ejb31nointerface, ejb3war, jbpapp3026, ejb31singleton">
<mkdir dir="${build.lib}" />
<!-- A jar with a simple ejb3 session -->
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManager.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManager.java 2010-04-05 05:46:48 UTC (rev 103515)
@@ -0,0 +1,30 @@
+/**
+ *
+ */
+package org.jboss.test.ejb3.singleton;
+
+/**
+ * AccountManager
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface AccountManager
+{
+
+ /**
+ * Credits the amount to the account
+ * @param amount Amount to be credited
+ * @return
+ */
+ void credit(int amount);
+
+ /**
+ * Debits the amount from the account
+ * @param amount Amount to be debited
+ * @return
+ */
+ void debit(int amount);
+
+ int balance();
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManagerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManagerBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/AccountManagerBean.java 2010-04-05 05:46:48 UTC (rev 103515)
@@ -0,0 +1,61 @@
+/**
+ *
+ */
+package org.jboss.test.ejb3.singleton;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Singleton;
+
+import org.jboss.ejb3.annotation.RemoteBinding;
+
+
+
+/**
+ * AccountManagerBean
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+ at Singleton
+ at Remote (AccountManager.class)
+ at RemoteBinding (jndiBinding = AccountManagerBean.JNDI_NAME)
+public class AccountManagerBean implements AccountManager
+{
+
+ /**
+ * JNDI name
+ */
+ public static final String JNDI_NAME = "singleton-account-manager";
+
+ /**
+ * Inject the no-interface view of the Calculator
+ */
+ @EJB
+ private Calculator simpleCalculator;
+
+ private int balance;
+
+ /**
+ * @see org.jboss.ejb3.nointerface.integration.test.common.AccountManager#credit(int)
+ */
+ public void credit(int amount)
+ {
+ this.balance = this.simpleCalculator.add(this.balance, amount);
+
+ }
+
+ /**
+ * @see org.jboss.ejb3.nointerface.integration.test.common.AccountManager#debit(int)
+ */
+ public void debit(int amount)
+ {
+ this.balance = this.simpleCalculator.subtract(this.balance, amount);
+ }
+
+ public int balance()
+ {
+ return this.balance;
+ }
+
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/Calculator.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/Calculator.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/Calculator.java 2010-04-05 05:46:48 UTC (rev 103515)
@@ -0,0 +1,29 @@
+/**
+ *
+ */
+package org.jboss.test.ejb3.singleton;
+
+import javax.ejb.Singleton;
+
+
+
+
+/**
+ * Calculator
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+ at Singleton
+public class Calculator
+{
+ public int subtract(int a, int b)
+ {
+ return a - b;
+ }
+
+ public int add(int a, int b)
+ {
+ return a + b;
+ }
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/unit/SingletonUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/unit/SingletonUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/singleton/unit/SingletonUnitTestCase.java 2010-04-05 05:46:48 UTC (rev 103515)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.jboss.test.ejb3.singleton.unit;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.ejb3.singleton.AccountManager;
+import org.jboss.test.ejb3.singleton.AccountManagerBean;
+
+/**
+ * SingletonUnitTestCase
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class SingletonUnitTestCase extends JBossTestCase
+{
+
+ public SingletonUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(SingletonUnitTestCase.class, "ejb31singleton.jar");
+ }
+
+ public void testSingletonBeanAccess() throws Exception
+ {
+ AccountManager accountManager = (AccountManager) this.getInitialContext().lookup(AccountManagerBean.JNDI_NAME);
+
+ int initialBalance = accountManager.balance();
+ assertEquals("Unexpected initial balance", 0, initialBalance);
+
+ // credit
+ accountManager.credit(100);
+
+ AccountManager anotherAccountManagerInstance = (AccountManager) this.getInitialContext().lookup(
+ AccountManagerBean.JNDI_NAME);
+ int balanceAfterCredit = anotherAccountManagerInstance.balance();
+ assertEquals("Unexpected balance after credit", 100, balanceAfterCredit);
+
+ // debit
+ anotherAccountManagerInstance.debit(50);
+
+ int balanceAfterDebit = accountManager.balance();
+ assertEquals("Unexpected balance after debit", 50, balanceAfterDebit);
+
+ }
+}
More information about the jboss-cvs-commits
mailing list